Auto merge of #2818 - saethlin:rustup, r=saethlin

bors · bors · commit 032d117ab844 · 2023-03-19T17:39:54.000Z
rustup
diff --git a/rust-version b/rust-version
@@ -1 +1 @@
-511364e7874dba9649a264100407e4bffe7b5425
+ab9bb3ea368b2412531a3e8c07ba73d1dd690134
diff --git a/src/machine.rs b/src/machine.rs
@@ -822,7 +822,7 @@ impl<'mir, 'tcx> Machine<'mir, 'tcx> for MiriMachine<'mir, 'tcx> {
     }
 
     #[inline(always)]
-    fn ignore_checkable_overflow_assertions(ecx: &MiriInterpCx<'mir, 'tcx>) -> bool {
+    fn ignore_optional_overflow_checks(ecx: &MiriInterpCx<'mir, 'tcx>) -> bool {
         !ecx.tcx.sess.overflow_checks()
     }
 

Original file line number	Diff line number	Diff line change
`@@ -822,7 +822,7 @@ impl<'mir, 'tcx> Machine<'mir, 'tcx> for MiriMachine<'mir, 'tcx> {`
`822`	`822`	`}`
`823`	`823`
`824`	`824`	`#[inline(always)]`
`825`		`- fn ignore_checkable_overflow_assertions(ecx: &MiriInterpCx<'mir, 'tcx>) -> bool {`
	`825`	`+ fn ignore_optional_overflow_checks(ecx: &MiriInterpCx<'mir, 'tcx>) -> bool {`
`826`	`826`	`!ecx.tcx.sess.overflow_checks()`
`827`	`827`	`}`
`828`	`828`