Adjust for upstream changes

rust-lang · Oct 1, 2020 · d4e2bd7 · d4e2bd7
1 parent db6a9e0
commit d4e2bd7
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/rls-rustc/src/lib.rs b/rls-rustc/src/lib.rs
@@ -75,9 +75,11 @@ pub fn run() -> Result<(), ()> {
     };
 
     rustc_driver::install_ice_hook();
-    rustc_driver::catch_fatal_errors(|| run_compiler(&args, &mut shim_calls, file_loader, None))
-        .map(|_| ())
-        .map_err(|_| ())
+    rustc_driver::catch_fatal_errors(|| {
+        run_compiler(&args, &mut shim_calls, file_loader, None, None)
+    })
+    .map(|_| ())
+    .map_err(|_| ())
 }
 
 #[derive(Default)]

diff --git a/rls/src/build/rustc.rs b/rls/src/build/rustc.rs
@@ -191,6 +191,7 @@ fn run_in_process(
                     &mut callbacks,
                     Some(Box::new(ReplacedFileLoader::new(changed))),
                     Some(Box::new(BufWriter(stderr))),
+                    None,
                 )
             })
         }
-Original file line number
+Diff line change
@@ Expand Up / @@ -191,6 +191,7 @@ fn run_in_process( @@
                         &mut callbacks,
                         Some(Box::new(ReplacedFileLoader::new(changed))),
                         Some(Box::new(BufWriter(stderr))),
+                        None,
                     )
                 })
             }
@@ Expand Down @@