Auto merge of #1451 - RalfJung:rustup, r=RalfJung

rustup

rust-version

@@ -1 +1 @@
-4fb54ed484e2239a3e9eff3be17df00d2a162be3
+ff4a2533a0720f9cdd86e02eafa3725f07aa7752

src/eval.rs

@@ -63,11 +63,11 @@ pub fn create_ecx<'mir, 'tcx: 'mir>(
     main_id: DefId,
     config: MiriConfig,
 ) -> InterpResult<'tcx, (InterpCx<'mir, 'tcx, Evaluator<'mir, 'tcx>>, MPlaceTy<'tcx, Tag>)> {
-    let tcx_at = tcx.at(rustc_span::source_map::DUMMY_SP);
     let param_env = ty::ParamEnv::reveal_all();
     let layout_cx = LayoutCx { tcx, param_env };
     let mut ecx = InterpCx::new(
-        tcx_at,
+        tcx,
+        rustc_span::source_map::DUMMY_SP,
         param_env,
         Evaluator::new(config.communicate, config.validate, layout_cx),
         MemoryExtra::new(