OpenE2K/rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Prepare for upcoming breakage

Browse Source
This commit is contained in:
Mateusz Mikuła 2018-06-07 19:16:41 +02:00
parent 2a2e602f2a
commit 52deb3b086
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/driver.rs
View File

@ -21,14 +21,14 @@ use std::process::Command;
use syntax::ast;
struct ClippyCompilerCalls {
default: RustcDefaultCalls,
default: Box<RustcDefaultCalls>,
run_lints: bool,
}
impl ClippyCompilerCalls {
fn new(run_lints: bool) -> Self {
Self {
default: RustcDefaultCalls,
default: Box::new(RustcDefaultCalls),
run_lints,
}
}
@ -69,8 +69,8 @@ impl<'a> CompilerCalls<'a> for ClippyCompilerCalls {
self.default
.late_callback(trans_crate, matches, sess, crate_stores, input, odir, ofile)
}
fn build_controller(&mut self, sess: &Session, matches: &getopts::Matches) -> driver::CompileController<'a> {
let mut control = self.default.build_controller(sess, matches);
fn build_controller(self: Box<Self>, sess: &Session, matches: &getopts::Matches) -> driver::CompileController<'a> {
let mut control = self.default.clone().build_controller(sess, matches);
if self.run_lints {
let old = std::mem::replace(&mut control.after_parse.callback, box |_| {});
@ -198,6 +198,6 @@ pub fn main() {
}
}
let mut ccc = ClippyCompilerCalls::new(clippy_enabled);
rustc_driver::run(move || rustc_driver::run_compiler(&args, &mut ccc, None, None));
let ccc = ClippyCompilerCalls::new(clippy_enabled);
rustc_driver::run(move || rustc_driver::run_compiler(&args, Box::new(ccc), None, None));
}