diff options
| author | bors <bors@rust-lang.org> | 2023-03-09 08:21:17 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-03-09 08:21:17 +0000 |
| commit | eceedd9c8b2d42695cf45d1c94e85819feba64bc (patch) | |
| tree | cc777f20f1e9064b5ad4ac70035f5c54d30b5069 | |
| parent | aff9b72375b65898c8402f0f2fdf769fcd0f9285 (diff) | |
| parent | d9fdac52b2a47133d642be006ac2e68a90b47751 (diff) | |
| download | rust-eceedd9c8b2d42695cf45d1c94e85819feba64bc.tar.gz rust-eceedd9c8b2d42695cf45d1c94e85819feba64bc.zip | |
Auto merge of #108920 - matthiaskrgr:rollup-qrr9a0u, r=matthiaskrgr
Rollup of 8 pull requests Successful merges: - #108754 (Retry `pred_known_to_hold_modulo_regions` with fulfillment if ambiguous) - #108759 (1.41.1 supported 32-bit Apple targets) - #108839 (Canonicalize root var when making response from new solver) - #108856 (Remove DropAndReplace terminator) - #108882 (Tweak E0740) - #108898 (Set `LIBC_CHECK_CFG=1` when building Rust code in bootstrap) - #108911 (Improve rustdoc-gui/tester.js code a bit) - #108916 (Remove an unused return value in `rustc_hir_typeck`) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
| -rw-r--r-- | clippy_utils/src/qualify_min_const_fn.rs | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/clippy_utils/src/qualify_min_const_fn.rs b/clippy_utils/src/qualify_min_const_fn.rs index 1a35fe05067..c00800291db 100644 --- a/clippy_utils/src/qualify_min_const_fn.rs +++ b/clippy_utils/src/qualify_min_const_fn.rs @@ -299,10 +299,6 @@ fn check_terminator<'tcx>( | TerminatorKind::Unreachable => Ok(()), TerminatorKind::Drop { place, .. } => check_place(tcx, *place, span, body), - TerminatorKind::DropAndReplace { place, value, .. } => { - check_place(tcx, *place, span, body)?; - check_operand(tcx, value, span, body) - }, TerminatorKind::SwitchInt { discr, targets: _ } => check_operand(tcx, discr, span, body), |