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

bors · bors · commit cac6759451bd · 2021-12-19T18:49:41.000Z
rustup
diff --git a/rust-version b/rust-version
@@ -1 +1 @@
-c5ecc157043ba413568b09292001a4a74b541a4e
+41c3017c82bbc16842cc3bc1afa904e6910e293c
diff --git a/src/shims/intrinsics.rs b/src/shims/intrinsics.rs
@@ -32,7 +32,8 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx
         }
 
         // All supported intrinsics have a return place.
-        let intrinsic_name = &*this.tcx.item_name(instance.def_id()).as_str();
+        let intrinsic_name = this.tcx.item_name(instance.def_id());
+        let intrinsic_name = intrinsic_name.as_str();
         let (dest, ret) = match ret {
             None => throw_unsup_format!("unimplemented (diverging) intrinsic: {}", intrinsic_name),
             Some(p) => p,

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,8 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`// All supported intrinsics have a return place.`
`35`		`- let intrinsic_name = &*this.tcx.item_name(instance.def_id()).as_str();`
	`35`	`+ let intrinsic_name = this.tcx.item_name(instance.def_id());`
	`36`	`+ let intrinsic_name = intrinsic_name.as_str();`
`36`	`37`	`let (dest, ret) = match ret {`
`37`	`38`	`None => throw_unsup_format!("unimplemented (diverging) intrinsic: {}", intrinsic_name),`
`38`	`39`	`Some(p) => p,`