Auto merge of #3684 - rust-lang:rustup-2024-06-18, r=RalfJung

bors · bors · commit 606e14311708 · 2024-06-18T06:07:39.000Z
Automatic Rustup
diff --git a/rust-version b/rust-version
@@ -1 +1 @@
-e794b0f8557c187b5909d889aa35071f81e0a4cc
+c2932aaf9d20acbc9259c762f1a06f8767c6f13f
diff --git a/src/intrinsics/mod.rs b/src/intrinsics/mod.rs
@@ -57,7 +57,7 @@ pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
                     );
                 }
                 Ok(Some(ty::Instance {
-                    def: ty::InstanceDef::Item(instance.def_id()),
+                    def: ty::InstanceKind::Item(instance.def_id()),
                     args: instance.args,
                 }))
             }

Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {`
`57`	`57`	`);`
`58`	`58`	`}`
`59`	`59`	`Ok(Some(ty::Instance {`
`60`		`- def: ty::InstanceDef::Item(instance.def_id()),`
	`60`	`+ def: ty::InstanceKind::Item(instance.def_id()),`
`61`	`61`	`args: instance.args,`
`62`	`62`	`}))`
`63`	`63`	`}`