crater run

Author: dingxiangfei2009

Diff for: compiler/rustc_lint/src/if_let_rescope.rs

@@ -19,7 +19,6 @@ declare_lint! {
     /// ### Example
     ///
     /// ```rust,edition2021
-    /// #![feature(if_let_rescope)]
     /// #![warn(if_let_rescope)]
     /// #![allow(unused_variables)]
     ///
@@ -91,7 +90,7 @@ declare_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_2021() || !cx.tcx.features().if_let_rescope {
+        if !expr.span.edition().at_least_rust_2021() {
             return;
         }
         let hir::ExprKind::If(cond, conseq, alt) = expr.kind else { return };

Diff for: tests/ui/drop/if-let-rescope-suggestions.fixed

@@ -0,0 +1,26 @@
+//@ edition:2024
+//@ compile-flags: -Z validate-mir -Zunstable-options
+//@ run-rustfix
+
+#![deny(if_let_rescope)]
+#![feature(if_let_rescope)]
+
+struct Droppy;
+impl Drop for Droppy {
+    fn drop(&mut self) {
+        println!("dropped");
+    }
+}
+impl Droppy {
+    fn get_ref(&self) -> Option<&u8> {
+        None
+    }
+}
+
+fn do_something<T>(_: &T) {}
+
+fn main() {
+    let binding = Droppy;
+    do_something(match binding.get_ref()  { Some(value) => { value } _ => { &0 }});
+    //~^ ERROR: temporary value dropped while borrowed
+}

Diff for: tests/ui/drop/if-let-rescope-suggestions.rs

@@ -0,0 +1,25 @@
+//@ edition:2024
+//@ compile-flags: -Z validate-mir -Zunstable-options
+//@ run-rustfix
+
+#![deny(if_let_rescope)]
+#![feature(if_let_rescope)]
+
+struct Droppy;
+impl Drop for Droppy {
+    fn drop(&mut self) {
+        println!("dropped");
+    }
+}
+impl Droppy {
+    fn get_ref(&self) -> Option<&u8> {
+        None
+    }
+}
+
+fn do_something<T>(_: &T) {}
+
+fn main() {
+    do_something(if let Some(value) = Droppy.get_ref() { value } else { &0 });
+    //~^ ERROR: temporary value dropped while borrowed
+}

Diff for: tests/ui/drop/if-let-rescope-suggestions.stderr

@@ -0,0 +1,26 @@
+error[E0716]: temporary value dropped while borrowed
+  --> $DIR/if-let-rescope-suggestions.rs:23:39
+   |
+LL |     do_something(if let Some(value) = Droppy.get_ref() { value } else { &0 });
+   |                                       ^^^^^^                   - temporary value is freed at the end of this statement
+   |                                       |
+   |                                       creates a temporary value which is freed while still in use
+   |
+note: lifetime for temporaries generated in `if let`s have been shorted in Edition 2024
+  --> $DIR/if-let-rescope-suggestions.rs:23:65
+   |
+LL |     do_something(if let Some(value) = Droppy.get_ref() { value } else { &0 });
+   |                                                                 ^
+help: consider using a `let` binding to create a longer lived value
+   |
+LL ~     let binding = Droppy;
+LL ~     do_something(if let Some(value) = binding.get_ref() { value } else { &0 });
+   |
+help: consider rewriting the `if` into `match` which preserves the extended lifetime
+   |
+LL |     do_something(match Droppy.get_ref()  { Some(value) => { value } _ => { &0 }});
+   |                  ~~~~~                   ++++++++++++++++           ~~~~       +
+
+error: aborting due to 1 previous error
+
+For more information about this error, try `rustc --explain E0716`.