Skip to content

Commit 56667b5

Browse files
authored
Rollup merge of rust-lang#98964 - RalfJung:typo, r=Dylan-DPC
fix typo in function name I don't know what I was doing when I named that function... follow-up to rust-lang#98888 r? `@oli-obk`
2 parents df1f415 + 4687afa commit 56667b5

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

compiler/rustc_const_eval/src/interpret/machine.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ pub trait Machine<'mir, 'tcx>: Sized {
145145
}
146146

147147
/// Whether CheckedBinOp MIR statements should actually check for overflow.
148-
fn check_binop_checks_overflow(_ecx: &InterpCx<'mir, 'tcx, Self>) -> bool;
148+
fn checked_binop_checks_overflow(_ecx: &InterpCx<'mir, 'tcx, Self>) -> bool;
149149

150150
/// Entry point for obtaining the MIR of anything that should get evaluated.
151151
/// So not just functions and shims, but also const/static initializers, anonymous
@@ -472,7 +472,7 @@ pub macro compile_time_machine(<$mir: lifetime, $tcx: lifetime>) {
472472
}
473473

474474
#[inline(always)]
475-
fn check_binop_checks_overflow(_ecx: &InterpCx<$mir, $tcx, Self>) -> bool {
475+
fn checked_binop_checks_overflow(_ecx: &InterpCx<$mir, $tcx, Self>) -> bool {
476476
true
477477
}
478478

compiler/rustc_const_eval/src/interpret/operator.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ impl<'mir, 'tcx: 'mir, M: Machine<'mir, 'tcx>> InterpCx<'mir, 'tcx, M> {
3333
// As per https://github.com/rust-lang/rust/pull/98738, we always return `false` in the 2nd
3434
// component when overflow checking is disabled.
3535
let overflowed =
36-
overflowed && (force_overflow_checks || M::check_binop_checks_overflow(self));
36+
overflowed && (force_overflow_checks || M::checked_binop_checks_overflow(self));
3737
// Write the result to `dest`.
3838
if let Abi::ScalarPair(..) = dest.layout.abi {
3939
// We can use the optimized path and avoid `place_field` (which might do

0 commit comments

Comments
 (0)