Rustup to rustc 1.44.0-nightly (3360cc3a0 2020-04-24)

rust-toolchain

@@ -1 +1 @@
-nightly-2020-04-22
+nightly-2020-04-25

src/abi/mod.rs

@@ -446,8 +446,9 @@ pub(crate) fn codegen_terminator_call<'tcx>(
 
     // Handle special calls like instrinsics and empty drop glue.
     let instance = if let ty::FnDef(def_id, substs) = fn_ty.kind {
-        let instance =
-            ty::Instance::resolve(fx.tcx, ty::ParamEnv::reveal_all(), def_id, substs).unwrap();
+        let instance = ty::Instance::resolve(fx.tcx, ty::ParamEnv::reveal_all(), def_id, substs)
+            .unwrap()
+            .unwrap();
 
         if fx.tcx.symbol_name(instance).name.as_str().starts_with("llvm.") {
             crate::intrinsics::codegen_llvm_intrinsic_call(
@@ -659,7 +660,9 @@ pub(crate) fn codegen_drop<'tcx>(
             _ => {
                 let instance = match drop_fn_ty.kind {
                     ty::FnDef(def_id, substs) => {
-                        Instance::resolve(fx.tcx, ParamEnv::reveal_all(), def_id, substs).unwrap()
+                        Instance::resolve(fx.tcx, ParamEnv::reveal_all(), def_id, substs)
+                            .unwrap()
+                            .unwrap()
                     }
                     _ => unreachable!("{:?}", drop_fn_ty),
                 };

src/base.rs

@@ -10,7 +10,7 @@ pub(crate) fn trans_fn<'clif, 'tcx, B: Backend + 'static>(
 ) {
     let tcx = cx.tcx;
 
-    let mir = *tcx.instance_mir(instance.def);
+    let mir = tcx.instance_mir(instance.def);
 
     // Declare function
     let (name, sig) = get_function_name_and_sig(tcx, cx.module.isa().triple(), instance, false);

src/debuginfo/mod.rs

@@ -257,7 +257,7 @@ impl<'a, 'tcx> FunctionDebugContext<'a, 'tcx> {
         func_id: FuncId,
         name: &str,
     ) -> Self {
-        let mir = *debug_context.tcx.instance_mir(instance.def);
+        let mir = debug_context.tcx.instance_mir(instance.def);
 
         let (symbol, _) = debug_context.symbols.insert_full(func_id, name.to_string());
 

src/main_shim.rs

@@ -84,6 +84,7 @@ pub(crate) fn maybe_create_entry_wrapper(tcx: TyCtxt<'_>, module: &mut Module<im
                     start_def_id,
                     tcx.intern_substs(&[main_ret_ty.into()]),
                 )
+                .unwrap()
                 .unwrap();
                 let start_func_id = import_function(tcx, m, start_instance);