rustup rust-lang/rust#62679

matthiaskrgr · matthiaskrgr · commit 50454db07369 · 2019-07-19T21:19:32.000+02:00
diff --git a/rls/src/build/rustc.rs b/rls/src/build/rustc.rs
@@ -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) -> bool {
+    fn after_parsing(&mut self, _compiler: &interface::Compiler) -> rustc_driver::Compilation {
         #[cfg(feature = "clippy")]
         {
             if self.clippy_preference != ClippyPreference::Off {
                 clippy_after_parse_callback(_compiler);
             }
         }
         // 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
     }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -155,18 +155,18 @@ impl rustc_driver::Callbacks for RlsRustcCalls {`
`155`	`155`	`config.opts.debugging_opts.save_analysis = true;`
`156`	`156`	`}`
`157`	`157`
`158`		`- fn after_parsing(&mut self, _compiler: &interface::Compiler) -> bool {`
	`158`	`+ fn after_parsing(&mut self, _compiler: &interface::Compiler) -> rustc_driver::Compilation {`
`159`	`159`	`#[cfg(feature = "clippy")]`
`160`	`160`	`{`
`161`	`161`	`if self.clippy_preference != ClippyPreference::Off {`
`162`	`162`	`clippy_after_parse_callback(_compiler);`
`163`	`163`	`}`
`164`	`164`	`}`
`165`	`165`	`// Continue execution`
`166`		`- true`
	`166`	`+ rustc_driver::Compilation::Continue`
`167`	`167`	`}`
`168`	`168`
`169`		`- fn after_analysis(&mut self, compiler: &interface::Compiler) -> bool {`
	`169`	`+ fn after_analysis(&mut self, compiler: &interface::Compiler) -> rustc_driver::Compilation {`
`170`	`170`	`let sess = compiler.session();`
`171`	`171`	`let input = compiler.input();`
`172`	`172`	`let crate_name = compiler.crate_name().unwrap().peek().clone();`
`@@ -228,7 +228,7 @@ impl rustc_driver::Callbacks for RlsRustcCalls {`
`228`	`228`	`);`
`229`	`229`	`});`
`230`	`230`
`231`		`- true`
	`231`	`+ rustc_driver::Compilation::Continue`
`232`	`232`	`}`
`233`	`233`	`}`
`234`	`234`