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

bors · bors · commit 8c7114841c61 · 2022-07-06T18:07:57.000Z
rustup
diff --git a/rust-version b/rust-version
@@ -1 +1 @@
-f342bea9d19f14616c6559312552e6d0ee529cfd
+049308cf8b48e9d67e54d6d0b01c10c79d1efc3a
diff --git a/src/machine.rs b/src/machine.rs
@@ -542,7 +542,7 @@ impl<'mir, 'tcx> Machine<'mir, 'tcx> for Evaluator<'mir, 'tcx> {
     }
 
     #[inline(always)]
-    fn check_binop_checks_overflow(ecx: &MiriEvalContext<'mir, 'tcx>) -> bool {
+    fn checked_binop_checks_overflow(ecx: &MiriEvalContext<'mir, 'tcx>) -> bool {
         ecx.tcx.sess.overflow_checks()
     }
 

Original file line number	Diff line number	Diff line change
`@@ -542,7 +542,7 @@ impl<'mir, 'tcx> Machine<'mir, 'tcx> for Evaluator<'mir, 'tcx> {`
`542`	`542`	`}`
`543`	`543`
`544`	`544`	`#[inline(always)]`
`545`		`- fn check_binop_checks_overflow(ecx: &MiriEvalContext<'mir, 'tcx>) -> bool {`
	`545`	`+ fn checked_binop_checks_overflow(ecx: &MiriEvalContext<'mir, 'tcx>) -> bool {`
`546`	`546`	`ecx.tcx.sess.overflow_checks()`
`547`	`547`	`}`
`548`	`548`