Auto merge of #2823 - oli-obk:rustup, r=oli-obk

bors · bors · commit 1dca4f56c3fc · 2023-03-23T07:37:09.000Z
Rustup
diff --git a/rust-version b/rust-version
@@ -1 +1 @@
-439292bc7913399e406d9bb7e8da0f70c6317c6e
+cf811810fe8dc92b3ff25e7dd29fb3178c91d409
diff --git a/src/machine.rs b/src/machine.rs
@@ -812,7 +812,7 @@ impl<'mir, 'tcx> Machine<'mir, 'tcx> for MiriMachine<'mir, 'tcx> {
     }
 
     #[inline(always)]
-    fn enforce_validity(ecx: &MiriInterpCx<'mir, 'tcx>) -> bool {
+    fn enforce_validity(ecx: &MiriInterpCx<'mir, 'tcx>, _layout: TyAndLayout<'tcx>) -> bool {
         ecx.machine.validate
     }
 

Original file line number	Diff line number	Diff line change
`@@ -812,7 +812,7 @@ impl<'mir, 'tcx> Machine<'mir, 'tcx> for MiriMachine<'mir, 'tcx> {`
`812`	`812`	`}`
`813`	`813`
`814`	`814`	`#[inline(always)]`
`815`		`- fn enforce_validity(ecx: &MiriInterpCx<'mir, 'tcx>) -> bool {`
	`815`	`+ fn enforce_validity(ecx: &MiriInterpCx<'mir, 'tcx>, _layout: TyAndLayout<'tcx>) -> bool {`
`816`	`816`	`ecx.machine.validate`
`817`	`817`	`}`
`818`	`818`