added review on if let guard

Kivooeo · Kivooeo · commit 7cf9991080f3 · 2025-05-11T16:10:27.000+05:00
diff --git a/compiler/rustc_hir_analysis/src/check/region.rs b/compiler/rustc_hir_analysis/src/check/region.rs
@@ -412,11 +412,7 @@ fn resolve_expr<'tcx>(
 
         hir::ExprKind::If(cond, then, Some(otherwise)) => {
             let expr_cx = visitor.cx;
-            let data = if expr.span.at_least_rust_2024() {
-                ScopeData::IfThenRescope
-            } else {
-                ScopeData::IfThen
-            };
+            let data = ScopeData::IfThenRescope;
             visitor.enter_scope(Scope { local_id: then.hir_id.local_id, data });
             visitor.cx.var_parent = visitor.cx.parent;
             visitor.visit_expr(cond);
@@ -427,11 +423,7 @@ fn resolve_expr<'tcx>(
 
         hir::ExprKind::If(cond, then, None) => {
             let expr_cx = visitor.cx;
-            let data = if expr.span.at_least_rust_2024() {
-                ScopeData::IfThenRescope
-            } else {
-                ScopeData::IfThen
-            };
+            let data = ScopeData::IfThen;
             visitor.enter_scope(Scope { local_id: then.hir_id.local_id, data });
             visitor.cx.var_parent = visitor.cx.parent;
             visitor.visit_expr(cond);
diff --git a/compiler/rustc_lint/src/if_let_rescope.rs b/compiler/rustc_lint/src/if_let_rescope.rs
@@ -11,7 +11,7 @@ use rustc_middle::ty::significant_drop_order::{
     extract_component_with_significant_dtor, ty_dtor_span,
 };
 use rustc_middle::ty::{self, Ty, TyCtxt};
-use rustc_session::lint::{FutureIncompatibilityReason, LintId};
+use rustc_session::lint::FutureIncompatibilityReason;
 use rustc_session::{declare_lint, impl_lint_pass};
 use rustc_span::edition::Edition;
 use rustc_span::{DUMMY_SP, Span};
@@ -270,12 +270,6 @@ 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.lints_that_dont_need_to_run(()).contains(&LintId::of(IF_LET_RESCOPE))
-        {
-            return;
-        }
-
         if let hir::ExprKind::Loop(block, _label, hir::LoopSource::While, _span) = expr.kind
             && let Some(value) = block.expr
             && let hir::ExprKind::If(cond, _conseq, _alt) = value.kind
diff --git a/compiler/rustc_mir_build/src/thir/cx/expr.rs b/compiler/rustc_mir_build/src/thir/cx/expr.rs
@@ -819,13 +819,7 @@ impl<'tcx> ThirBuildCx<'tcx> {
             hir::ExprKind::If(cond, then, else_opt) => ExprKind::If {
                 if_then_scope: region::Scope {
                     local_id: then.hir_id.local_id,
-                    data: {
-                        if expr.span.at_least_rust_2024() {
-                            region::ScopeData::IfThenRescope
-                        } else {
-                            region::ScopeData::IfThen
-                        }
-                    },
+                    data: region::ScopeData::IfThenRescope,
                 },
                 cond: self.mirror_expr(cond),
                 then: self.mirror_expr(then),
diff --git a/src/doc/if-let-guard-review.md b/src/doc/if-let-guard-review.md
diff --git a/tests/ui/rfcs/rfc-2294-if-let-guard/drop-order.rs b/tests/ui/rfcs/rfc-2294-if-let-guard/drop-order.rs
@@ -2,7 +2,9 @@
 // For normal guards all temporaries are dropped before the body of the arm.
 // For let guards temporaries live until the end of the arm.
 
-//@ run-pass
+//@ revisions: edition2021 edition2024
+//@ [edition2024] run-pass
+//@ [edition2021] run-pass
 
 #![feature(if_let_guard)]
 #![allow(irrefutable_let_patterns)]
@@ -49,11 +51,7 @@ fn main() {
     if_guard(2);
     if_let_guard(1);
     if_let_guard(2);
-    let expected =  [
-        1, 2, !2, 3, !3, !1,
-        1, 2, !2, 3, !3, !1,
-        1, 2, 3, !3, !2, !1,
-        1, 2, 3, !3, !2, !1,
-    ];
+    let expected =
+        [1, 2, !2, 3, !3, !1, 1, 2, !2, 3, !3, !1, 1, 2, 3, !3, !2, !1, 1, 2, 3, !3, !2, !1];
     assert_eq!(*A.lock().unwrap(), expected);
 }
diff --git a/tests/ui/rfcs/rfc-2294-if-let-guard/drop-scope.rs b/tests/ui/rfcs/rfc-2294-if-let-guard/drop-scope.rs
@@ -1,7 +1,9 @@
 // Ensure that temporaries in if-let guards live for the arm
 // regression test for #118593
 
-//@ check-pass
+//@ revisions: edition2021 edition2024
+//@ [edition2024] check-pass
+//@ [edition2021] check-pass
 
 #![feature(if_let_guard)]
 #![feature(let_chains)]
diff --git a/tests/ui/rfcs/rfc-2294-if-let-guard/guard-lifetime-2.rs b/tests/ui/rfcs/rfc-2294-if-let-guard/guard-lifetime-2.rs
@@ -1,6 +1,8 @@
 // References to by-mutable-ref bindings in an if-let guard *can* be used after the guard.
 
-//@ check-pass
+//@ revisions: edition2021 edition2024
+//@ [edition2024] check-pass
+//@ [edition2021] check-pass
 
 #![feature(if_let_guard)]
 
diff --git a/tests/ui/rfcs/rfc-2294-if-let-guard/loop-mutability.rs b/tests/ui/rfcs/rfc-2294-if-let-guard/loop-mutability.rs
@@ -1,4 +1,6 @@
-//@ check-pass
+//@ revisions: edition2021 edition2024
+//@ [edition2024] check-pass
+//@ [edition2021] check-pass
 
 #![feature(if_let_guard)]
 
diff --git a/tests/ui/rfcs/rfc-2294-if-let-guard/move-guard-if-let-chain.rs b/tests/ui/rfcs/rfc-2294-if-let-guard/move-guard-if-let-chain.rs
@@ -1,4 +1,5 @@
 //@ edition: 2024
+//@ edition: 2018
 #![feature(if_let_guard)]
 #![allow(irrefutable_let_patterns)]
 
@@ -8,7 +9,12 @@ fn same_pattern(c: bool) {
     let v = (1, 2);
 
     match v {
-        (1, 2) if let y = x && c => (),
+        (1, 2)
+            if let y = x
+                && c =>
+        {
+            ()
+        }
         (1, 2) if let z = x => (), //~ ERROR use of moved value: `x`
         _ => (),
     }
@@ -32,7 +38,12 @@ fn different_patterns(c: bool) {
     let v = (1, 2);
 
     match v {
-        (1, _) if let y = x && c => (),
+        (1, _)
+            if let y = x
+                && c =>
+        {
+            ()
+        }
         (_, 2) if let z = x => (), //~ ERROR use of moved value: `x`
         _ => (),
     }
@@ -56,7 +67,12 @@ fn or_pattern(c: bool) {
     let v = (1, 2);
 
     match v {
-        (1, _) | (_, 2) if let y = x && c => (), //~ ERROR use of moved value: `x`
+        (1, _) | (_, 2)
+            if let y = x
+                && c =>
+        {
+            ()
+        } //~ ERROR use of moved value: `x`
         _ => (),
     }
 }
@@ -78,8 +94,13 @@ fn use_in_arm(c: bool) {
     let v = (1, 2);
 
     match v {
-        (1, 2) if let y = x && c => false,
-        _ => { *x == 1 }, //~ ERROR use of moved value: `x`
+        (1, 2)
+            if let y = x
+                && c =>
+        {
+            false
+        }
+        _ => *x == 1, //~ ERROR use of moved value: `x`
     };
 }
 
@@ -90,7 +111,7 @@ fn use_in_arm_ok(c: bool) {
 
     match v {
         (1, 2) if c && let y = x => false,
-        _ => { *x == 1 },
+        _ => *x == 1,
     };
 }
 
@@ -100,7 +121,13 @@ fn use_in_same_chain(c: bool) {
     let v = (1, 2);
 
     match v {
-        (1, 2) if let y = x && c && let z = x => false, //~ ERROR use of moved value: `x`
+        (1, 2)
+            if let y = x
+                && c
+                && let z = x =>
+        {
+            false
+        } //~ ERROR use of moved value: `x`
         _ => true,
     };
 }
diff --git a/tests/ui/rfcs/rfc-2294-if-let-guard/move-guard-if-let-chain.stderr b/tests/ui/rfcs/rfc-2294-if-let-guard/move-guard-if-let-chain.stderr
@@ -1,81 +1,2 @@
-error[E0382]: use of moved value: `x`
-  --> $DIR/move-guard-if-let-chain.rs:12:23
-   |
-LL |     let x: Box<_> = Box::new(1);
-   |         - move occurs because `x` has type `Box<i32>`, which does not implement the `Copy` trait
-...
-LL |         (1, 2) if let y = x && c => (),
-   |                       - value moved here
-LL |         (1, 2) if let z = x => (),
-   |                       ^ value used here after move
-   |
-help: borrow this binding in the pattern to avoid moving the value
-   |
-LL |         (1, 2) if let ref y = x && c => (),
-   |                       +++
+error: Option 'edition' given more than once
 
-error[E0382]: use of moved value: `x`
-  --> $DIR/move-guard-if-let-chain.rs:36:23
-   |
-LL |     let x: Box<_> = Box::new(1);
-   |         - move occurs because `x` has type `Box<i32>`, which does not implement the `Copy` trait
-...
-LL |         (1, _) if let y = x && c => (),
-   |                       - value moved here
-LL |         (_, 2) if let z = x => (),
-   |                       ^ value used here after move
-   |
-help: borrow this binding in the pattern to avoid moving the value
-   |
-LL |         (1, _) if let ref y = x && c => (),
-   |                       +++
-
-error[E0382]: use of moved value: `x`
-  --> $DIR/move-guard-if-let-chain.rs:59:32
-   |
-LL |     let x: Box<_> = Box::new(1);
-   |         - move occurs because `x` has type `Box<i32>`, which does not implement the `Copy` trait
-...
-LL |         (1, _) | (_, 2) if let y = x && c => (),
-   |                                ^ value used here after move
-   |
-help: borrow this binding in the pattern to avoid moving the value
-   |
-LL |         (1, _) | (_, 2) if let ref y = x && c => (),
-   |                                +++
-
-error[E0382]: use of moved value: `x`
-  --> $DIR/move-guard-if-let-chain.rs:82:16
-   |
-LL |     let x: Box<_> = Box::new(1);
-   |         - move occurs because `x` has type `Box<i32>`, which does not implement the `Copy` trait
-...
-LL |         (1, 2) if let y = x && c => false,
-   |                       - value moved here
-LL |         _ => { *x == 1 },
-   |                ^^ value used here after move
-   |
-help: borrow this binding in the pattern to avoid moving the value
-   |
-LL |         (1, 2) if let ref y = x && c => false,
-   |                       +++
-
-error[E0382]: use of moved value: `x`
-  --> $DIR/move-guard-if-let-chain.rs:103:41
-   |
-LL |     let x: Box<_> = Box::new(1);
-   |         - move occurs because `x` has type `Box<i32>`, which does not implement the `Copy` trait
-...
-LL |         (1, 2) if let y = x && c && let z = x => false,
-   |                       -                 ^ value used here after move
-   |                       |
-   |                       value moved here
-   |
-help: borrow this binding in the pattern to avoid moving the value
-   |
-LL |         (1, 2) if let ref y = x && c && let z = x => false,
-   |                       +++
-
-error: aborting due to 5 previous errors
-
-For more information about this error, try `rustc --explain E0382`.
diff --git a/tests/ui/rfcs/rfc-2294-if-let-guard/move-guard-if-let.rs b/tests/ui/rfcs/rfc-2294-if-let-guard/move-guard-if-let.rs
@@ -1,7 +1,9 @@
 // Check that borrowck knows that moves in the pattern for if-let guards
 // only happen when the pattern is matched.
 
-//@ build-pass
+//@ revisions: edition2021 edition2024
+//@ [edition2024] build-pass
+//@ [edition2021] build-pass
 
 #![feature(if_let_guard)]
 #![allow(irrefutable_let_patterns)]
@@ -36,6 +38,6 @@ fn main() {
 
     match v {
         (1, 2) if let y = x => false,
-        _ => { *x == 1 },
+        _ => *x == 1,
     };
 }
diff --git a/tests/ui/rfcs/rfc-2294-if-let-guard/parens.rs b/tests/ui/rfcs/rfc-2294-if-let-guard/parens.rs
@@ -1,4 +1,5 @@
 //@ edition: 2024
+//@ edition: 2021
 // Parenthesised let "expressions" are not allowed in guards
 
 #![feature(if_let_guard)]
diff --git a/tests/ui/rfcs/rfc-2294-if-let-guard/parens.stderr b/tests/ui/rfcs/rfc-2294-if-let-guard/parens.stderr
@@ -1,54 +1,2 @@
-error: expected expression, found `let` statement
-  --> $DIR/parens.rs:10:16
-   |
-LL |         () if (let 0 = 1) => {}
-   |                ^^^^^^^^^
-   |
-   = note: only supported directly in conditions of `if` and `while` expressions
-note: `let`s wrapped in parentheses are not supported in a context with let chains
-  --> $DIR/parens.rs:10:16
-   |
-LL |         () if (let 0 = 1) => {}
-   |                ^^^^^^^^^
-
-error: expected expression, found `let` statement
-  --> $DIR/parens.rs:12:18
-   |
-LL |         () if (((let 0 = 1))) => {}
-   |                  ^^^^^^^^^
-   |
-   = note: only supported directly in conditions of `if` and `while` expressions
-note: `let`s wrapped in parentheses are not supported in a context with let chains
-  --> $DIR/parens.rs:12:18
-   |
-LL |         () if (((let 0 = 1))) => {}
-   |                  ^^^^^^^^^
-
-error: expected expression, found `let` statement
-  --> $DIR/parens.rs:20:16
-   |
-LL |         () if (let 0 = 1) => {}
-   |                ^^^^^^^^^
-   |
-   = note: only supported directly in conditions of `if` and `while` expressions
-note: `let`s wrapped in parentheses are not supported in a context with let chains
-  --> $DIR/parens.rs:20:16
-   |
-LL |         () if (let 0 = 1) => {}
-   |                ^^^^^^^^^
-
-error: expected expression, found `let` statement
-  --> $DIR/parens.rs:22:18
-   |
-LL |         () if (((let 0 = 1))) => {}
-   |                  ^^^^^^^^^
-   |
-   = note: only supported directly in conditions of `if` and `while` expressions
-note: `let`s wrapped in parentheses are not supported in a context with let chains
-  --> $DIR/parens.rs:22:18
-   |
-LL |         () if (((let 0 = 1))) => {}
-   |                  ^^^^^^^^^
-
-error: aborting due to 4 previous errors
+error: Option 'edition' given more than once
 
diff --git a/tests/ui/rfcs/rfc-2294-if-let-guard/scope.rs b/tests/ui/rfcs/rfc-2294-if-let-guard/scope.rs
diff --git a/tests/ui/rfcs/rfc-2294-if-let-guard/scoping-consistency-async.rs b/tests/ui/rfcs/rfc-2294-if-let-guard/scoping-consistency-async.rs
diff --git a/tests/ui/rfcs/rfc-2294-if-let-guard/scoping-consistency.rs b/tests/ui/rfcs/rfc-2294-if-let-guard/scoping-consistency.rs
diff --git a/tests/ui/rfcs/rfc-2294-if-let-guard/shadowing.rs b/tests/ui/rfcs/rfc-2294-if-let-guard/shadowing.rs
diff --git a/tests/ui/rfcs/rfc-2294-if-let-guard/type-inference.rs b/tests/ui/rfcs/rfc-2294-if-let-guard/type-inference.rs
