From a49464e2a69359293461e5fbc07610e6351fb424 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Kr=C3=BCger?= Date: Fri, 19 Jul 2019 21:19:32 +0200 Subject: [PATCH 1/2] rustup https://github.com/rust-lang/rust/pull/62679/ --- rls/src/build/rustc.rs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/rls/src/build/rustc.rs b/rls/src/build/rustc.rs index ecb9c90090f..0df68abe176 100644 --- a/rls/src/build/rustc.rs +++ b/rls/src/build/rustc.rs @@ -155,7 +155,7 @@ impl rustc_driver::Callbacks for RlsRustcCalls { config.opts.debugging_opts.save_analysis = true; } - fn after_parsing(&mut self, _compiler: &interface::Compiler) -> bool { + fn after_parsing(&mut self, _compiler: &interface::Compiler) -> rustc_driver::Compilation { #[cfg(feature = "clippy")] { if self.clippy_preference != ClippyPreference::Off { @@ -163,10 +163,10 @@ impl rustc_driver::Callbacks for RlsRustcCalls { } } // Continue execution - true + rustc_driver::Compilation::Continue } - fn after_analysis(&mut self, compiler: &interface::Compiler) -> bool { + fn after_analysis(&mut self, compiler: &interface::Compiler) -> rustc_driver::Compilation { let sess = compiler.session(); let input = compiler.input(); let crate_name = compiler.crate_name().unwrap().peek().clone(); @@ -228,7 +228,7 @@ impl rustc_driver::Callbacks for RlsRustcCalls { ); }); - true + rustc_driver::Compilation::Continue } } From 9e014b9555573c7bbabf4c4f0c80fdc0e51ad073 Mon Sep 17 00:00:00 2001 From: Igor Matuszewski Date: Sun, 21 Jul 2019 23:20:36 +0200 Subject: [PATCH 2/2] Use rustc_drive::Compilation directly --- rls/src/build/rustc.rs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/rls/src/build/rustc.rs b/rls/src/build/rustc.rs index 0df68abe176..43c33daf990 100644 --- a/rls/src/build/rustc.rs +++ b/rls/src/build/rustc.rs @@ -37,7 +37,7 @@ use rls_vfs::Vfs; use self::rustc::session::config::Input; use self::rustc::session::Session; -use self::rustc_driver::run_compiler; +use self::rustc_driver::{run_compiler, Compilation}; use self::rustc_interface::interface; use self::rustc_save_analysis as save; use self::rustc_save_analysis::CallbackHandler; @@ -155,18 +155,18 @@ impl rustc_driver::Callbacks for RlsRustcCalls { config.opts.debugging_opts.save_analysis = true; } - fn after_parsing(&mut self, _compiler: &interface::Compiler) -> rustc_driver::Compilation { + fn after_parsing(&mut self, _compiler: &interface::Compiler) -> Compilation { #[cfg(feature = "clippy")] { if self.clippy_preference != ClippyPreference::Off { clippy_after_parse_callback(_compiler); } } - // Continue execution - rustc_driver::Compilation::Continue + + Compilation::Continue } - fn after_analysis(&mut self, compiler: &interface::Compiler) -> rustc_driver::Compilation { + fn after_analysis(&mut self, compiler: &interface::Compiler) -> Compilation { let sess = compiler.session(); let input = compiler.input(); let crate_name = compiler.crate_name().unwrap().peek().clone(); @@ -228,7 +228,7 @@ impl rustc_driver::Callbacks for RlsRustcCalls { ); }); - rustc_driver::Compilation::Continue + Compilation::Continue } }