Merge pull request #1553 from Xanewok/unbreak-nightly

Unbreak latest nightly

Author: Xanewok

rls-rustc/src/clippy.rs

@@ -49,7 +49,7 @@ pub fn adjust_args(args: Vec<String>, preference: ClippyPreference) -> Vec<Strin
 
 #[cfg(feature = "clippy")]
 pub fn after_parse_callback(compiler: &rustc_interface::interface::Compiler) {
-    use rustc_plugin::registry::Registry;
+    use self::rustc_driver::plugin::registry::Registry;
 
     let sess = compiler.session();
     let mut registry = Registry::new(

rls-rustc/src/lib.rs

@@ -4,7 +4,6 @@ extern crate env_logger;
 extern crate rustc;
 extern crate rustc_driver;
 extern crate rustc_interface;
-extern crate rustc_plugin;
 extern crate rustc_save_analysis;
 extern crate syntax;
 
@@ -73,11 +72,10 @@ pub fn run() -> Result<(), ()> {
         None => args,
     };
 
-    rustc_driver::report_ices_to_stderr_if_any(|| {
-        run_compiler(&args, &mut shim_calls, file_loader, None)
-    })
-    .map(|_| ())
-    .map_err(|_| ())
+    rustc_driver::install_ice_hook();
+    rustc_driver::catch_fatal_errors(|| run_compiler(&args, &mut shim_calls, file_loader, None))
+        .map(|_| ())
+        .map_err(|_| ())
 }
 
 #[derive(Default)]

rls/src/build/rustc.rs

@@ -198,7 +198,7 @@ fn run_in_process(
     let result = std::panic::catch_unwind({
         let stderr = Arc::clone(&stderr);
         || {
-            rustc_driver::report_ices_to_stderr_if_any(move || {
+            rustc_driver::catch_fatal_errors(move || {
                 // Replace stderr so we catch most errors.
                 run_compiler(
                     &args,

tests/client.rs

@@ -2160,9 +2160,11 @@ fn client_init_impl(convert_case: fn(&str) -> String) {
         .file(
             "src/main.rs",
             r#"
+                #![allow(dead_code)]
                 struct NonCfg;
                 #[cfg(test)]
                 struct CfgTest { inner: PathBuf }
+                fn main() {}
             "#,
         )
         .build();