Skip to content

Commit 652d338

Browse files
committed
Auto merge of #125331 - matthiaskrgr:rollup-4kfrh4n, r=matthiaskrgr
Rollup of 7 pull requests Successful merges: - #124682 (Suggest setting lifetime in borrowck error involving types with elided lifetimes) - #124917 (Check whether the next_node is else-less if in get_return_block) - #125106 (coverage: Memoize and simplify counter expressions) - #125173 (Remove `Rvalue::CheckedBinaryOp`) - #125305 (add some codegen tests for issue 120493) - #125314 ( Add an experimental feature gate for global registration) - #125318 (Migrate `run-make/rustdoc-scrape-examples-whitespace` to `rmake.rs`) r? `@ghost` `@rustbot` modify labels: rollup
2 parents e5b12c2 + d28b39c commit 652d338

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

clippy_utils/src/mir/possible_borrower.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ impl TypeVisitor<TyCtxt<'_>> for ContainsRegion {
149149
}
150150

151151
fn rvalue_locals(rvalue: &mir::Rvalue<'_>, mut visit: impl FnMut(mir::Local)) {
152-
use rustc_middle::mir::Rvalue::{Aggregate, BinaryOp, Cast, CheckedBinaryOp, Repeat, UnaryOp, Use};
152+
use rustc_middle::mir::Rvalue::{Aggregate, BinaryOp, Cast, Repeat, UnaryOp, Use};
153153

154154
let mut visit_op = |op: &mir::Operand<'_>| match op {
155155
mir::Operand::Copy(p) | mir::Operand::Move(p) => visit(p.local),
@@ -159,7 +159,7 @@ fn rvalue_locals(rvalue: &mir::Rvalue<'_>, mut visit: impl FnMut(mir::Local)) {
159159
match rvalue {
160160
Use(op) | Repeat(op, _) | Cast(_, op, _) | UnaryOp(_, op) => visit_op(op),
161161
Aggregate(_, ops) => ops.iter().for_each(visit_op),
162-
BinaryOp(_, box (lhs, rhs)) | CheckedBinaryOp(_, box (lhs, rhs)) => {
162+
BinaryOp(_, box (lhs, rhs)) => {
163163
visit_op(lhs);
164164
visit_op(rhs);
165165
},

clippy_utils/src/qualify_min_const_fn.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ fn check_rvalue<'tcx>(
161161
"transmute can attempt to turn pointers into integers, so is unstable in const fn".into(),
162162
)),
163163
// binops are fine on integers
164-
Rvalue::BinaryOp(_, box (lhs, rhs)) | Rvalue::CheckedBinaryOp(_, box (lhs, rhs)) => {
164+
Rvalue::BinaryOp(_, box (lhs, rhs)) => {
165165
check_operand(tcx, lhs, span, body)?;
166166
check_operand(tcx, rhs, span, body)?;
167167
let ty = lhs.ty(body, tcx);

0 commit comments

Comments
 (0)