Merge pull request #1700 from Mark-Simulacrum/fix-76474

Adjust for upstream changes

Author: Xanewok

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)]

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,
                 )
             })
         }

tests/fixtures/hover/save_data/test_tooltip_mod_use_external.rs.0004_012.json

@@ -5,11 +5,6 @@
     "col": 12
   },
   "data": {
-    "Ok": [{
-        "language": "rust",
-        "value": "std/src/sync/mod.rs"
-      },
-      "Useful synchronization primitives.\n\n## The need for synchronization\n\nConceptually, a Rust program is a series of operations which will\nbe executed on a computer. The timeline of events happening in the\nprogram is consistent with the order of the operations in the code.\n\nConsider the following code, operating on some global static variables:\n\n```rust\nstatic mut A: u32 = 0;"
-    ]
+    "Ok": []
   }
 }

tests/fixtures/hover/save_data/test_tooltip_mod_use_external.rs.0005_012.json

@@ -5,11 +5,6 @@
     "col": 12
   },
   "data": {
-    "Ok": [{
-        "language": "rust",
-        "value": "std/src/sync/mod.rs"
-      },
-      "Useful synchronization primitives.\n\n## The need for synchronization\n\nConceptually, a Rust program is a series of operations which will\nbe executed on a computer. The timeline of events happening in the\nprogram is consistent with the order of the operations in the code.\n\nConsider the following code, operating on some global static variables:\n\n```rust\nstatic mut A: u32 = 0;"
-    ]
+    "Ok": []
   }
 }