Rustup to rustc 1.42.0-nightly (bc1571cc3 2020-01-05)

src/common.rs

@@ -358,7 +358,7 @@ impl<'tcx, B: Backend + 'static> FunctionCx<'_, 'tcx, B> {
         let topmost = span.ctxt().outer_expn().expansion_cause().unwrap_or(span);
         let caller = self.tcx.sess.source_map().lookup_char_pos(topmost.lo());
         let const_loc = self.tcx.const_caller_location((
-            syntax::symbol::Symbol::intern(&caller.file.name.to_string()),
+            rustc_span::symbol::Symbol::intern(&caller.file.name.to_string()),
             caller.line as u32,
             caller.col_display as u32 + 1,
         ));

src/constant.rs

@@ -1,6 +1,6 @@
 use std::borrow::Cow;
 
-use syntax::source_map::DUMMY_SP;
+use rustc_span::DUMMY_SP;
 
 use rustc::mir::interpret::{
     read_target_uint, AllocId, Allocation, ConstValue, GlobalAlloc, InterpResult, Scalar,
@@ -391,6 +391,7 @@ impl<'mir, 'tcx> Machine<'mir, 'tcx> for TransPlaceInterpreter {
 
     fn find_mir_or_eval_fn(
         _: &mut InterpCx<'mir, 'tcx, Self>,
+        _: Span,
         _: Instance<'tcx>,
         _: &[OpTy<'tcx>],
         _: Option<(PlaceTy<'tcx>, BasicBlock)>,

src/debuginfo/line_info.rs

@@ -3,7 +3,7 @@ use std::path::{Component, Path};
 
 use crate::prelude::*;
 
-use syntax::source_map::FileName;
+use rustc_span::FileName;
 
 use cranelift_codegen::binemit::CodeOffset;
 

src/driver.rs

@@ -207,7 +207,7 @@ fn run_aot(
 
     let metadata_module = if need_metadata_module {
         let _timer = tcx.prof.generic_activity("codegen crate metadata");
-        let (metadata_cgu_name, tmp_file) = rustc::util::common::time(tcx.sess, "write compressed metadata", || {
+        let (metadata_cgu_name, tmp_file) = tcx.sess.time("write compressed metadata", || {
             use rustc::mir::mono::CodegenUnitNameBuilder;
 
             let cgu_name_builder = &mut CodegenUnitNameBuilder::new(tcx);

src/lib.rs

@@ -13,6 +13,7 @@ extern crate rustc_incremental;
 extern crate rustc_index;
 extern crate rustc_mir;
 extern crate rustc_session;
+extern crate rustc_span;
 extern crate rustc_target;
 extern crate syntax;
 
@@ -64,7 +65,7 @@ mod prelude {
     pub use std::convert::{TryFrom, TryInto};
 
     pub use syntax::ast::{FloatTy, IntTy, UintTy};
-    pub use syntax::source_map::{Pos, Span};
+    pub use rustc_span::{Pos, Span};
 
     pub use rustc::bug;
     pub use rustc::hir::def_id::{CrateNum, DefId, LOCAL_CRATE};
@@ -219,7 +220,7 @@ impl CodegenBackend for CraneliftCodegenBackend {
 
         let _timer = sess.prof.generic_activity("link_crate");
 
-        rustc::util::common::time(sess, "linking", || {
+        sess.time("linking", || {
             let target_cpu = crate::target_triple(sess).to_string();
             link_binary::<crate::archive::ArArchiveBuilder<'_>>(
                 sess,

src/target_features_whitelist.rs

@@ -1,4 +1,4 @@
-use syntax::symbol::{sym, Symbol};
+use rustc_span::symbol::{sym, Symbol};
 
 use rustc::session::Session;