Merge pull request #872 from alexcrichton/fix

Update to rustc master

Author: nrc

Cargo.lock

@@ -25,7 +25,7 @@ rayon = "1"
 rls-analysis = "0.13"
 rls-blacklist = "0.1.2"
 rls-data = { version = "0.16", features = ["serialize-serde"] }
-rls-rustc = "0.2.1"
+rls-rustc = "0.3.0"
 rls-span = { version = "0.4", features = ["serialize-serde"] }
 rls-vfs = { version = "0.4.5", features = ["racer-impls"] }
 rustfmt-nightly = "0.7"

Cargo.toml

@@ -15,7 +15,7 @@ extern crate rustc_plugin;
 extern crate rustc_errors as errors;
 extern crate rustc_resolve;
 extern crate rustc_save_analysis;
-extern crate rustc_trans_utils;
+extern crate rustc_codegen_utils;
 #[cfg(feature = "clippy")]
 extern crate clippy_lints;
 extern crate syntax;
@@ -27,7 +27,7 @@ use self::rustc_driver::{run, run_compiler, Compilation, CompilerCalls, RustcDef
 use self::rustc_driver::driver::{CompileController};
 use self::rustc_save_analysis as save;
 use self::rustc_save_analysis::CallbackHandler;
-use self::rustc_trans_utils::trans_crate::TransCrate;
+use self::rustc_codegen_utils::codegen_backend::CodegenBackend;
 use self::syntax::ast;
 use self::syntax::codemap::{FileLoader, RealFileLoader};
 
@@ -215,7 +215,7 @@ impl<'a> CompilerCalls<'a> for RlsRustcCalls {
 
     fn late_callback(
         &mut self,
-        trans_crate: &TransCrate,
+        codegen_backend: &CodegenBackend,
         matches: &getopts::Matches,
         sess: &Session,
         cstore: &CrateStore,
@@ -224,7 +224,7 @@ impl<'a> CompilerCalls<'a> for RlsRustcCalls {
         ofile: &Option<PathBuf>,
     ) -> Compilation {
         self.default_calls
-            .late_callback(trans_crate, matches, sess, cstore, input, odir, ofile)
+            .late_callback(codegen_backend, matches, sess, cstore, input, odir, ofile)
     }
 
     fn build_controller(