Skip to content

Commit eceedd9

Browse files
committed
Auto merge of rust-lang#108920 - matthiaskrgr:rollup-qrr9a0u, r=matthiaskrgr
Rollup of 8 pull requests Successful merges: - rust-lang#108754 (Retry `pred_known_to_hold_modulo_regions` with fulfillment if ambiguous) - rust-lang#108759 (1.41.1 supported 32-bit Apple targets) - rust-lang#108839 (Canonicalize root var when making response from new solver) - rust-lang#108856 (Remove DropAndReplace terminator) - rust-lang#108882 (Tweak E0740) - rust-lang#108898 (Set `LIBC_CHECK_CFG=1` when building Rust code in bootstrap) - rust-lang#108911 (Improve rustdoc-gui/tester.js code a bit) - rust-lang#108916 (Remove an unused return value in `rustc_hir_typeck`) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
2 parents aff9b72 + d9fdac5 commit eceedd9

File tree

1 file changed

+0
-4
lines changed

1 file changed

+0
-4
lines changed

clippy_utils/src/qualify_min_const_fn.rs

-4
Original file line numberDiff line numberDiff line change
@@ -299,10 +299,6 @@ fn check_terminator<'tcx>(
299299
| TerminatorKind::Unreachable => Ok(()),
300300

301301
TerminatorKind::Drop { place, .. } => check_place(tcx, *place, span, body),
302-
TerminatorKind::DropAndReplace { place, value, .. } => {
303-
check_place(tcx, *place, span, body)?;
304-
check_operand(tcx, value, span, body)
305-
},
306302

307303
TerminatorKind::SwitchInt { discr, targets: _ } => check_operand(tcx, discr, span, body),
308304

0 commit comments

Comments
 (0)