squiid/rust
1
0
Fork 0
Code Issues Pull requests Projects Activity

make clippy compile again with the latest nightly after rust-lang/rust@65eb024542

Browse source
This commit is contained in:
Sascha Hanse 2016-08-17 00:21:58 +02:00
parent 909efec275
commit 9aa7701262
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/main.rs
View file

@ -15,6 +15,7 @@ use rustc::session::{config, Session};
use rustc::session::config::{Input, ErrorOutputType}; use rustc::session::config::{Input, ErrorOutputType};
use std::path::PathBuf; use std::path::PathBuf;
use std::process::Command; use std::process::Command;
use syntax::{ast};
use clippy_lints::utils::cargo; use clippy_lints::utils::cargo;
@ -36,28 +37,31 @@ impl<'a> CompilerCalls<'a> for ClippyCompilerCalls {
fn early_callback(&mut self, fn early_callback(&mut self,
matches: &getopts::Matches, matches: &getopts::Matches,
sopts: &config::Options, sopts: &config::Options,
cfg: &ast::CrateConfig,
descriptions: &rustc_errors::registry::Registry, descriptions: &rustc_errors::registry::Registry,
output: ErrorOutputType) output: ErrorOutputType)
-> Compilation { -> Compilation {
self.default.early_callback(matches, sopts, descriptions, output) self.default.early_callback(matches, sopts, cfg, descriptions, output)
} }
fn no_input(&mut self, fn no_input(&mut self,
matches: &getopts::Matches, matches: &getopts::Matches,
sopts: &config::Options, sopts: &config::Options,
cfg: &ast::CrateConfig,
odir: &Option<PathBuf>, odir: &Option<PathBuf>,
ofile: &Option<PathBuf>, ofile: &Option<PathBuf>,
descriptions: &rustc_errors::registry::Registry) descriptions: &rustc_errors::registry::Registry)
-> Option<(Input, Option<PathBuf>)> { -> Option<(Input, Option<PathBuf>)> {
self.default.no_input(matches, sopts, odir, ofile, descriptions) self.default.no_input(matches, sopts, cfg, odir, ofile, descriptions)
} }
fn late_callback(&mut self, fn late_callback(&mut self,
matches: &getopts::Matches, matches: &getopts::Matches,
sess: &Session, sess: &Session,
cfg: &ast::CrateConfig,
input: &Input, input: &Input,
odir: &Option<PathBuf>, odir: &Option<PathBuf>,
ofile: &Option<PathBuf>) ofile: &Option<PathBuf>)
-> Compilation { -> Compilation {
self.default.late_callback(matches, sess, input, odir, ofile) self.default.late_callback(matches, sess, cfg, input, odir, ofile)
} }
fn build_controller(&mut self, sess: &Session, matches: &getopts::Matches) -> driver::CompileController<'a> { fn build_controller(&mut self, sess: &Session, matches: &getopts::Matches) -> driver::CompileController<'a> {
let mut control = self.default.build_controller(sess, matches); let mut control = self.default.build_controller(sess, matches);