diff options
| author | bors <bors@rust-lang.org> | 2024-10-29 19:25:03 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-10-29 19:25:03 +0000 |
| commit | 1e4f10ba6476e48a42a79b9f846a2d9366525b9e (patch) | |
| tree | 66c68bd54e4c3891de7c37e48c563a9b79177192 /compiler/rustc_lint/src | |
| parent | e473783d90e2289b8a97575fa60d6315f0a318eb (diff) | |
| parent | 07afe8d12f1c72bdc46f052088922943ca91bcdd (diff) | |
| download | rust-1e4f10ba6476e48a42a79b9f846a2d9366525b9e.tar.gz rust-1e4f10ba6476e48a42a79b9f846a2d9366525b9e.zip | |
Auto merge of #132326 - matthiaskrgr:rollup-ngyw18g, r=matthiaskrgr
Rollup of 6 pull requests Successful merges: - #131984 (Stabilize if_let_rescope) - #132151 (Ensure that resume arg outlives region bound for coroutines) - #132157 (Remove detail from label/note that is already available in other note) - #132274 (Cleanup op lookup in HIR typeck) - #132319 (cg_llvm: Clean up FFI calls for setting module flags) - #132321 (xous: sync: remove `rustc_const_stable` attribute on Condvar and Mutex new()) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_lint/src')
| -rw-r--r-- | compiler/rustc_lint/src/if_let_rescope.rs | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/compiler/rustc_lint/src/if_let_rescope.rs b/compiler/rustc_lint/src/if_let_rescope.rs index bdfcc2c0a10..afcfbebc14b 100644 --- a/compiler/rustc_lint/src/if_let_rescope.rs +++ b/compiler/rustc_lint/src/if_let_rescope.rs @@ -24,7 +24,6 @@ declare_lint! { /// ### Example /// /// ```rust,edition2021 - /// #![feature(if_let_rescope)] /// #![warn(if_let_rescope)] /// #![allow(unused_variables)] /// @@ -243,7 +242,7 @@ impl_lint_pass!( impl<'tcx> LateLintPass<'tcx> for IfLetRescope { fn check_expr(&mut self, cx: &LateContext<'tcx>, expr: &'tcx hir::Expr<'tcx>) { - if expr.span.edition().at_least_rust_2024() || !cx.tcx.features().if_let_rescope() { + if expr.span.edition().at_least_rust_2024() { return; } if let (Level::Allow, _) = cx.tcx.lint_level_at_node(IF_LET_RESCOPE, expr.hir_id) { |