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

Merge pull request #2390 from topecongiro/rustup

Browse Source 
Rustup to rustc 1.25.0-nightly (97520ccb1 2018-01-21)
This commit is contained in:
Manish Goregaokar 2018-01-22 10:31:44 +05:30 committed by GitHub
commit f5f0aa01be
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/driver.rs
View File

@ -9,9 +9,11 @@ extern crate rustc;
extern crate rustc_driver; extern crate rustc_driver;
extern crate rustc_errors; extern crate rustc_errors;
extern crate rustc_plugin; extern crate rustc_plugin;
extern crate rustc_trans_utils;
extern crate syntax; extern crate syntax;
use rustc_driver::{driver, Compilation, CompilerCalls, RustcDefaultCalls}; use rustc_driver::{driver, Compilation, CompilerCalls, RustcDefaultCalls};
use rustc_trans_utils::trans_crate::TransCrate;
use rustc::session::{config, Session}; use rustc::session::{config, Session};
use rustc::session::config::{ErrorOutputType, Input}; use rustc::session::config::{ErrorOutputType, Input};
use std::path::PathBuf; use std::path::PathBuf;
@ -58,6 +60,7 @@ impl<'a> CompilerCalls<'a> for ClippyCompilerCalls {
} }
fn late_callback( fn late_callback(
&mut self, &mut self,
trans_crate: &TransCrate,
matches: &getopts::Matches, matches: &getopts::Matches,
sess: &Session, sess: &Session,
crate_stores: &rustc::middle::cstore::CrateStore, crate_stores: &rustc::middle::cstore::CrateStore,
@ -66,7 +69,7 @@ impl<'a> CompilerCalls<'a> for ClippyCompilerCalls {
ofile: &Option<PathBuf>, ofile: &Option<PathBuf>,
) -> Compilation { ) -> Compilation {
self.default self.default
.late_callback(matches, sess, crate_stores, input, odir, ofile) .late_callback(trans_crate, matches, sess, crate_stores, 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);