Skip to content
This repository was archived by the owner on Dec 29, 2022. It is now read-only.

Rustup #1519

Merged
merged 2 commits into from
Jul 21, 2019
Merged

Rustup #1519

Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions rls/src/build/rustc.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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) -> Compilation {
#[cfg(feature = "clippy")]
{
if self.clippy_preference != ClippyPreference::Off {
clippy_after_parse_callback(_compiler);
}
}
// Continue execution
true

Compilation::Continue
}

fn after_analysis(&mut self, compiler: &interface::Compiler) -> bool {
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();
Expand Down Expand Up @@ -228,7 +228,7 @@ impl rustc_driver::Callbacks for RlsRustcCalls {
);
});

true
Compilation::Continue
}
}

Expand Down