fixed all reviews

Author: Kivooeo

library/core/src/lib.rs

@@ -95,7 +95,6 @@
 //
 // Library features:
 // tidy-alphabetical-start
-#![cfg_attr(bootstrap, feature(if_let_guard))]
 #![feature(array_ptr_get)]
 #![feature(asm_experimental_arch)]
 #![feature(bigint_helper_methods)]

library/std/src/lib.rs

@@ -268,7 +268,6 @@
     all(target_vendor = "fortanix", target_env = "sgx"),
     feature(slice_index_methods, coerce_unsized, sgx_platform)
 )]
-#![cfg_attr(bootstrap, feature(if_let_guard))]
 #![cfg_attr(any(windows, target_os = "uefi"), feature(round_char_boundary))]
 #![cfg_attr(target_family = "wasm", feature(stdarch_wasm_atomic_wait))]
 #![cfg_attr(target_arch = "wasm64", feature(simd_wasm64))]

src/tools/clippy/clippy_utils/src/lib.rs

@@ -1,4 +1,3 @@
-#![cfg_attr(bootstrap, feature(if_let_guard))]
 #![feature(box_patterns)]
 #![feature(macro_metavar_expr)]
 #![feature(never_type)]

src/tools/tidy/src/issues.txt

@@ -3659,7 +3659,6 @@ ui/rfcs/rfc-2396-target_feature-11/issue-99876.rs
 ui/rfcs/rfc-2497-if-let-chains/issue-88498.rs
 ui/rfcs/rfc-2497-if-let-chains/issue-90722.rs
 ui/rfcs/rfc-2497-if-let-chains/issue-92145.rs
-ui/rfcs/rfc-2497-if-let-chains/issue-93150.rs
 ui/rfcs/rfc-2497-if-let-chains/issue-99938.rs
 ui/rfcs/rfc-2528-type-changing-struct-update/issue-92010-trait-bound-not-satisfied.rs
 ui/rfcs/rfc-2528-type-changing-struct-update/issue-96878.rs

tests/ui/binding/match-beginning-vert.rs

@@ -1,6 +1,5 @@
 //@ run-pass
 
-
 enum Foo {
     A,
     B,

tests/ui/issues/issue-29723.rs

@@ -1,6 +1,5 @@
 // test for https://github.com/rust-lang/rust/issues/29723
 
-
 fn main() {
     let s = String::new();
     let _s = match 0 {

tests/ui/issues/issue-29723.stderr

@@ -1,5 +1,5 @@
 error[E0382]: use of moved value: `s`
-  --> $DIR/issue-29723.rs:11:13
+  --> $DIR/issue-29723.rs:10:13
    |
 LL |     let s = String::new();
    |         - move occurs because `s` has type `String`, which does not implement the `Copy` trait
@@ -16,7 +16,7 @@ LL |         0 if { drop(s.clone()); false } => String::from("oops"),
    |                      ++++++++
 
 error[E0382]: use of moved value: `s`
-  --> $DIR/issue-29723.rs:19:14
+  --> $DIR/issue-29723.rs:18:14
    |
 LL |     let s = String::new();
    |         - move occurs because `s` has type `String`, which does not implement the `Copy` trait

tests/ui/nll/issue-24535-allow-mutable-borrow-in-match-guard.rs

@@ -5,7 +5,6 @@
 // See further discussion on rust-lang/rust#24535,
 // rust-lang/rfcs#1006, and rust-lang/rfcs#107
 
-
 fn main() {
     rust_issue_24535();
     rfcs_issue_1006_1();

tests/ui/nll/issue-27282-move-match-input-into-guard.rs

@@ -7,7 +7,6 @@
 // reaches the panic code when executed, despite the compiler warning
 // about that match arm being unreachable.
 
-
 fn main() {
     let b = &mut true;
     match b {

tests/ui/nll/issue-27282-move-match-input-into-guard.stderr

@@ -1,5 +1,5 @@
 error[E0382]: use of moved value: `b`
-  --> $DIR/issue-27282-move-match-input-into-guard.rs:13:5
+  --> $DIR/issue-27282-move-match-input-into-guard.rs:12:5
    |
 LL |     let b = &mut true;
    |         - move occurs because `b` has type `&mut bool`, which does not implement the `Copy` trait
@@ -12,7 +12,7 @@ LL |         _ if { (|| { let bar = b; *bar = false; })();
    |                 value moved into closure here
 
 error[E0382]: use of moved value: `b`
-  --> $DIR/issue-27282-move-match-input-into-guard.rs:23:5
+  --> $DIR/issue-27282-move-match-input-into-guard.rs:22:5
    |
 LL |     let b = &mut true;
    |         - move occurs because `b` has type `&mut bool`, which does not implement the `Copy` trait

tests/ui/nll/issue-27282-move-ref-mut-into-guard.rs

@@ -2,7 +2,6 @@
 // mutable borrows in match guards by hiding the mutable borrow in a
 // guard behind a move (of the ref mut pattern id) within a closure.
 
-
 fn main() {
     match Some(&4) {
         None => {},

tests/ui/nll/issue-27282-move-ref-mut-into-guard.stderr

@@ -1,5 +1,5 @@
 error[E0507]: cannot move out of `foo` in pattern guard
-  --> $DIR/issue-27282-move-ref-mut-into-guard.rs:10:19
+  --> $DIR/issue-27282-move-ref-mut-into-guard.rs:9:19
    |
 LL |             if { (|| { let mut bar = foo; bar.take() })(); false } => {},
    |                   ^^                 --- move occurs because `foo` has type `&mut Option<&i32>`, which does not implement the `Copy` trait
@@ -9,7 +9,7 @@ LL |             if { (|| { let mut bar = foo; bar.take() })(); false } => {},
    = note: variables bound in patterns cannot be moved from until after the end of the pattern guard
 
 error[E0507]: cannot move out of `foo` in pattern guard
-  --> $DIR/issue-27282-move-ref-mut-into-guard.rs:18:34
+  --> $DIR/issue-27282-move-ref-mut-into-guard.rs:17:34
    |
 LL |             if let Some(()) = { (|| { let mut bar = foo; bar.take() })(); None } => {},
    |                                  ^^                 --- move occurs because `foo` has type `&mut Option<&i32>`, which does not implement the `Copy` trait

tests/ui/nll/issue-27282-reborrow-ref-mut-in-guard.rs

@@ -5,7 +5,6 @@
 // reject it. But I want to make sure that we continue to reject it
 // (under NLL) even when that conservative check goes away.
 
-
 fn main() {
     let mut b = &mut true;
     match b {

tests/ui/nll/issue-27282-reborrow-ref-mut-in-guard.stderr

@@ -1,5 +1,5 @@
 error[E0596]: cannot borrow `r` as mutable, as it is immutable for the pattern guard
-  --> $DIR/issue-27282-reborrow-ref-mut-in-guard.rs:13:25
+  --> $DIR/issue-27282-reborrow-ref-mut-in-guard.rs:12:25
    |
 LL |         ref mut r if { (|| { let bar = &mut *r; **bar = false; })();
    |                         ^^                  -- mutable borrow occurs due to use of `r` in closure
@@ -9,7 +9,7 @@ LL |         ref mut r if { (|| { let bar = &mut *r; **bar = false; })();
    = note: variables bound in patterns are immutable until the end of the pattern guard
 
 error[E0596]: cannot borrow `r` as mutable, as it is immutable for the pattern guard
-  --> $DIR/issue-27282-reborrow-ref-mut-in-guard.rs:23:40
+  --> $DIR/issue-27282-reborrow-ref-mut-in-guard.rs:22:40
    |
 LL |         ref mut r if let Some(()) = { (|| { let bar = &mut *r; **bar = false; })();
    |                                        ^^                  -- mutable borrow occurs due to use of `r` in closure

tests/ui/nll/match-cfg-fake-edges.rs

@@ -1,7 +1,6 @@
 // Test that we have enough false edges to avoid exposing the exact matching
 // algorithm in borrow checking.
 
-
 #[rustfmt::skip]
 fn all_patterns_are_tested() {
     // Even though `x` is never actually moved out of, we don't want borrowck results to be based on

tests/ui/nll/match-cfg-fake-edges.stderr

@@ -1,5 +1,5 @@
 warning: irrefutable `if let` pattern
-  --> $DIR/match-cfg-fake-edges.rs:18:8
+  --> $DIR/match-cfg-fake-edges.rs:17:8
    |
 LL |     if let _ = true {
    |        ^^^^^^^^^^^^
@@ -9,7 +9,7 @@ LL |     if let _ = true {
    = note: `#[warn(irrefutable_let_patterns)]` on by default
 
 error[E0382]: use of moved value: `x`
-  --> $DIR/match-cfg-fake-edges.rs:15:10
+  --> $DIR/match-cfg-fake-edges.rs:14:10
    |
 LL |     let x = String::new();
    |         - move occurs because `x` has type `String`, which does not implement the `Copy` trait
@@ -26,7 +26,7 @@ LL |         _ => drop(x.clone()),
    |                    ++++++++
 
 error[E0382]: use of moved value: `x`
-  --> $DIR/match-cfg-fake-edges.rs:23:10
+  --> $DIR/match-cfg-fake-edges.rs:22:10
    |
 LL |     let x = String::new();
    |         - move occurs because `x` has type `String`, which does not implement the `Copy` trait
@@ -43,7 +43,7 @@ LL |         drop(x.clone())
    |               ++++++++
 
 error[E0382]: borrow of moved value: `x.0`
-  --> $DIR/match-cfg-fake-edges.rs:29:5
+  --> $DIR/match-cfg-fake-edges.rs:28:5
    |
 LL |         (y, _) | (_, y) => (),
    |          - value moved here
@@ -58,7 +58,7 @@ LL |         (ref y, _) | (_, y) => (),
    |          +++
 
 error[E0382]: borrow of moved value: `x.1`
-  --> $DIR/match-cfg-fake-edges.rs:31:5
+  --> $DIR/match-cfg-fake-edges.rs:30:5
    |
 LL |         (y, _) | (_, y) => (),
    |                      - value moved here
@@ -73,7 +73,7 @@ LL |         (y, _) | (_, ref y) => (),
    |                      +++
 
 error[E0382]: borrow of moved value: `x.0`
-  --> $DIR/match-cfg-fake-edges.rs:35:5
+  --> $DIR/match-cfg-fake-edges.rs:34:5
    |
 LL |     let ((y, _) | (_, y)) = x;
    |           - value moved here
@@ -87,7 +87,7 @@ LL |     let ((ref y, _) | (_, y)) = x;
    |           +++
 
 error[E0382]: borrow of moved value: `x.1`
-  --> $DIR/match-cfg-fake-edges.rs:37:5
+  --> $DIR/match-cfg-fake-edges.rs:36:5
    |
 LL |     let ((y, _) | (_, y)) = x;
    |                       - value moved here
@@ -102,7 +102,7 @@ LL |     let ((y, _) | (_, ref y)) = x;
    |                       +++
 
 error[E0381]: used binding `x` is possibly-uninitialized
-  --> $DIR/match-cfg-fake-edges.rs:71:19
+  --> $DIR/match-cfg-fake-edges.rs:70:19
    |
 LL |     let x;
    |         - binding declared here but left uninitialized
@@ -113,7 +113,7 @@ LL |         _ => drop(x),
    |         if this pattern is matched, `x` is not initialized
 
 error[E0381]: used binding `x` isn't initialized
-  --> $DIR/match-cfg-fake-edges.rs:78:16
+  --> $DIR/match-cfg-fake-edges.rs:77:16
    |
 LL |     let x;
    |         - binding declared here but left uninitialized
@@ -130,7 +130,7 @@ LL |     let x = 42;
    |           ++++
 
 error[E0381]: used binding `x` isn't initialized
-  --> $DIR/match-cfg-fake-edges.rs:85:31
+  --> $DIR/match-cfg-fake-edges.rs:84:31
    |
 LL |     let x;
    |         - binding declared here but left uninitialized
@@ -146,7 +146,7 @@ LL |     let x = 42;
    |           ++++
 
 error[E0382]: use of moved value: `x`
-  --> $DIR/match-cfg-fake-edges.rs:98:22
+  --> $DIR/match-cfg-fake-edges.rs:97:22
    |
 LL |     let x = String::new();
    |         - move occurs because `x` has type `String`, which does not implement the `Copy` trait
@@ -163,7 +163,7 @@ LL |         false if { drop(x.clone()); true } => {},
    |                          ++++++++
 
 error[E0382]: use of moved value: `x`
-  --> $DIR/match-cfg-fake-edges.rs:113:22
+  --> $DIR/match-cfg-fake-edges.rs:112:22
    |
 LL |     let x = String::new();
    |         - move occurs because `x` has type `String`, which does not implement the `Copy` trait

tests/ui/parser/struct-literal-in-match-guard.rs

@@ -3,7 +3,6 @@
 // Unlike `if` condition, `match` guards accept struct literals.
 // This is detected in <https://github.com/rust-lang/rust/pull/74566#issuecomment-663613705>.
 
-
 #[derive(PartialEq)]
 struct Foo {
     x: isize,

tests/ui/rfcs/rfc-2294-if-let-guard/drop-order.rs

@@ -51,7 +51,11 @@ 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);
 }

tests/ui/rfcs/rfc-2294-if-let-guard/exhaustive.edition2024.stderr

@@ -1,9 +1,5 @@
 #![allow(irrefutable_let_patterns)]
 
-//@revisions: edition2021 edition2024
-//@[edition2021] edition:2021
-//@[edition2024] edition:2024
-
 fn match_option(x: Option<u32>) {
     match x {
         //~^ ERROR non-exhaustive patterns: `None` not covered

tests/ui/rfcs/rfc-2294-if-let-guard/exhaustive.rs

@@ -1,5 +1,5 @@
 error[E0004]: non-exhaustive patterns: `None` not covered
-  --> $DIR/exhaustive.rs:8:11
+  --> $DIR/exhaustive.rs:4:11
    |
 LL |     match x {
    |           ^ pattern `None` not covered
@@ -17,7 +17,7 @@ LL +         None => todo!()
    |
 
 error[E0004]: non-exhaustive patterns: `()` not covered
-  --> $DIR/exhaustive.rs:17:11
+  --> $DIR/exhaustive.rs:13:11
    |
 LL |     match x {
    |           ^ pattern `()` not covered

tests/ui/rfcs/rfc-2294-if-let-guard/exhaustive.edition2021.stderr renamed to tests/ui/rfcs/rfc-2294-if-let-guard/exhaustive.stderr

@@ -1,9 +1,5 @@
 // References to by-move bindings in an if-let guard *cannot* be used after the guard.
 
-//@revisions: edition2021 edition2024
-//@[edition2021] edition:2021
-//@[edition2024] edition:2024
-
 fn main() {
     let x: Option<Option<String>> = Some(Some(String::new()));
     match x {

tests/ui/rfcs/rfc-2294-if-let-guard/guard-lifetime-1.edition2024.stderr

@@ -1,5 +1,5 @@
 error[E0505]: cannot move out of `x.0` because it is borrowed
-  --> $DIR/guard-lifetime-1.rs:10:14
+  --> $DIR/guard-lifetime-1.rs:6:14
    |
 LL |         Some(mut y) if let Some(ref z) = y => {
    |              ^^^^^

tests/ui/rfcs/rfc-2294-if-let-guard/guard-lifetime-1.rs

@@ -1,9 +1,6 @@
 // References to by-mutable-ref bindings in an if-let guard *can* be used after the guard.
 
 //@ check-pass
-//@revisions: edition2021 edition2024
-//@[edition2021] edition:2021
-//@[edition2024] edition:2024
 
 fn main() {
     let mut x: Option<Option<String>> = Some(Some(String::new()));