Rename feature gate

Jules-Bertholet · Jules-Bertholet · commit e13911e6e8d0 · 2024-04-15T23:27:21.000-04:00
diff --git a/compiler/rustc_feature/src/unstable.rs b/compiler/rustc_feature/src/unstable.rs
@@ -534,7 +534,7 @@ declare_features! (
     /// Allows the `#[must_not_suspend]` attribute.
     (unstable, must_not_suspend, "1.57.0", Some(83310)),
     /// Make `mut` not reset the binding mode on edition >= 2024.
-    (unstable, mut_dont_reset_binding_mode_2024, "CURRENT_RUSTC_VERSION", Some(123076)),
+    (unstable, mut_preserve_binding_mode_2024, "CURRENT_RUSTC_VERSION", Some(123076)),
     /// Allows `mut ref` and `mut ref mut` identifier patterns.
     (incomplete, mut_ref, "CURRENT_RUSTC_VERSION", Some(123076)),
     /// Allows using `#[naked]` on functions.
diff --git a/compiler/rustc_hir_typeck/src/pat.rs b/compiler/rustc_hir_typeck/src/pat.rs
@@ -636,7 +636,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
         let bm = match ba {
             BindingAnnotation(ByRef::No, Mutability::Mut)
                 if !(pat.span.at_least_rust_2024()
-                    && self.tcx.features().mut_dont_reset_binding_mode_2024)
+                    && self.tcx.features().mut_preserve_binding_mode_2024)
                     && matches!(def_br, ByRef::Yes(_)) =>
             {
                 // `mut x` resets the binding mode in edition <= 2021.
diff --git a/compiler/rustc_lint_defs/src/builtin.rs b/compiler/rustc_lint_defs/src/builtin.rs
@@ -1656,7 +1656,7 @@ declare_lint! {
     pub DEREFERENCING_MUT_BINDING,
     Allow,
     "detects `mut x` bindings that change the type of `x`",
-    @feature_gate = sym::mut_dont_reset_binding_mode_2024;
+    @feature_gate = sym::mut_preserve_binding_mode_2024;
     // FIXME uncomment below upon stabilization
     /*@future_incompatible = FutureIncompatibleInfo {
         reason: FutureIncompatibilityReason::EditionSemanticsChange(Edition::Edition2024),
diff --git a/compiler/rustc_span/src/symbol.rs b/compiler/rustc_span/src/symbol.rs
@@ -1194,7 +1194,7 @@ symbols! {
         multiple_supertrait_upcastable,
         must_not_suspend,
         must_use,
-        mut_dont_reset_binding_mode_2024,
+        mut_preserve_binding_mode_2024,
         mut_ref,
         naked,
         naked_functions,
diff --git a/tests/ui/pattern/feature-gate-mut_preserve_binding_mode_2024.rs b/tests/ui/pattern/feature-gate-mut_preserve_binding_mode_2024.rs
diff --git a/tests/ui/pattern/feature-gate-mut_preserve_binding_mode_2024.stderr b/tests/ui/pattern/feature-gate-mut_preserve_binding_mode_2024.stderr
@@ -1,5 +1,5 @@
 error[E0308]: mismatched types
-  --> $DIR/feature-gate-mut_dont_reset_binding_mode_2024.rs:8:9
+  --> $DIR/feature-gate-mut_preserve_binding_mode_2024.rs:8:9
    |
 LL |     let Foo(mut a) = &Foo(0);
    |             ----- expected due to the type of this binding
@@ -13,7 +13,7 @@ LL +     a = 42;
    |
 
 error[E0308]: mismatched types
-  --> $DIR/feature-gate-mut_dont_reset_binding_mode_2024.rs:12:9
+  --> $DIR/feature-gate-mut_preserve_binding_mode_2024.rs:12:9
    |
 LL |     let Foo(mut a) = &mut Foo(0);
    |             ----- expected due to the type of this binding
diff --git a/tests/ui/pattern/mut_preserve_binding_mode_2021.rs b/tests/ui/pattern/mut_preserve_binding_mode_2021.rs
@@ -1,6 +1,6 @@
 //@ edition: 2021
 //@ compile-flags: -Zunstable-options
-#![feature(mut_dont_reset_binding_mode_2024)]
+#![feature(mut_preserve_binding_mode_2024)]
 
 struct Foo(u8);
 
diff --git a/tests/ui/pattern/mut_preserve_binding_mode_2021.stderr b/tests/ui/pattern/mut_preserve_binding_mode_2021.stderr
@@ -1,5 +1,5 @@
 error[E0308]: mismatched types
-  --> $DIR/mut_dont_reset_binding_mode_2021.rs:9:9
+  --> $DIR/mut_preserve_binding_mode_2021.rs:9:9
    |
 LL |     let Foo(mut a) = &Foo(0);
    |             ----- expected due to the type of this binding
@@ -13,7 +13,7 @@ LL +     a = 42;
    |
 
 error[E0308]: mismatched types
-  --> $DIR/mut_dont_reset_binding_mode_2021.rs:13:9
+  --> $DIR/mut_preserve_binding_mode_2021.rs:13:9
    |
 LL |     let Foo(mut a) = &mut Foo(0);
    |             ----- expected due to the type of this binding
diff --git a/tests/ui/pattern/mut_preserve_binding_mode_2024.rs b/tests/ui/pattern/mut_preserve_binding_mode_2024.rs
@@ -1,7 +1,7 @@
 //@ run-pass
 //@ edition: 2024
 //@ compile-flags: -Zunstable-options
-#![feature(mut_dont_reset_binding_mode_2024)]
+#![feature(mut_preserve_binding_mode_2024)]
 #![allow(unused)]
 
 struct Foo(u8);
diff --git a/tests/ui/pattern/mut_preserve_binding_mode_2024_lint.rs b/tests/ui/pattern/mut_preserve_binding_mode_2024_lint.rs
@@ -1,5 +1,5 @@
 //@ edition: 2021
-#![feature(mut_dont_reset_binding_mode_2024)]
+#![feature(mut_preserve_binding_mode_2024)]
 #![allow(unused)]
 #![forbid(dereferencing_mut_binding)]
 
diff --git a/tests/ui/pattern/mut_preserve_binding_mode_2024_lint.stderr b/tests/ui/pattern/mut_preserve_binding_mode_2024_lint.stderr
@@ -1,28 +1,28 @@
 error: dereferencing `mut` binding
-  --> $DIR/mut_dont_reset_binding_mode_2024_lint.rs:9:13
+  --> $DIR/mut_preserve_binding_mode_2024_lint.rs:9:13
    |
 LL |     let Foo(mut a) = &Foo(0);
    |             ^^^^^ `mut` dereferences the type of this binding
    |
 help: this will change in edition 2024
-  --> $DIR/mut_dont_reset_binding_mode_2024_lint.rs:9:13
+  --> $DIR/mut_preserve_binding_mode_2024_lint.rs:9:13
    |
 LL |     let Foo(mut a) = &Foo(0);
    |             ^^^^^
 note: the lint level is defined here
-  --> $DIR/mut_dont_reset_binding_mode_2024_lint.rs:4:11
+  --> $DIR/mut_preserve_binding_mode_2024_lint.rs:4:11
    |
 LL | #![forbid(dereferencing_mut_binding)]
    |           ^^^^^^^^^^^^^^^^^^^^^^^^^
 
 error: dereferencing `mut` binding
-  --> $DIR/mut_dont_reset_binding_mode_2024_lint.rs:13:13
+  --> $DIR/mut_preserve_binding_mode_2024_lint.rs:13:13
    |
 LL |     let Foo(mut a) = &mut Foo(0);
    |             ^^^^^ `mut` dereferences the type of this binding
    |
 help: this will change in edition 2024
-  --> $DIR/mut_dont_reset_binding_mode_2024_lint.rs:13:13
+  --> $DIR/mut_preserve_binding_mode_2024_lint.rs:13:13
    |
 LL |     let Foo(mut a) = &mut Foo(0);
    |             ^^^^^

Original file line number	Diff line number	Diff line change
`@@ -636,7 +636,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {`
`636`	`636`	`let bm = match ba {`
`637`	`637`	`BindingAnnotation(ByRef::No, Mutability::Mut)`
`638`	`638`	`if !(pat.span.at_least_rust_2024()`
`639`		`- && self.tcx.features().mut_dont_reset_binding_mode_2024)`
	`639`	`+ && self.tcx.features().mut_preserve_binding_mode_2024)`
`640`	`640`	`&& matches!(def_br, ByRef::Yes(_)) =>`
`641`	`641`	`{`
`642`	`642`	// `mut x` resets the binding mode in edition <= 2021.
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`error[E0308]: mismatched types`
`2`		`- --> $DIR/feature-gate-mut_dont_reset_binding_mode_2024.rs:8:9`
	`2`	`+ --> $DIR/feature-gate-mut_preserve_binding_mode_2024.rs:8:9`
`3`	`3`	`\|`
`4`	`4`	`LL \| let Foo(mut a) = &Foo(0);`
`5`	`5`	`\| ----- expected due to the type of this binding`
`@@ -13,7 +13,7 @@ LL + a = 42;`
`13`	`13`	`\|`
`14`	`14`
`15`	`15`	`error[E0308]: mismatched types`
`16`		`- --> $DIR/feature-gate-mut_dont_reset_binding_mode_2024.rs:12:9`
	`16`	`+ --> $DIR/feature-gate-mut_preserve_binding_mode_2024.rs:12:9`
`17`	`17`	`\|`
`18`	`18`	`LL \| let Foo(mut a) = &mut Foo(0);`
`19`	`19`	`\| ----- expected due to the type of this binding`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`error[E0308]: mismatched types`
`2`		`- --> $DIR/mut_dont_reset_binding_mode_2021.rs:9:9`
	`2`	`+ --> $DIR/mut_preserve_binding_mode_2021.rs:9:9`
`3`	`3`	`\|`
`4`	`4`	`LL \| let Foo(mut a) = &Foo(0);`
`5`	`5`	`\| ----- expected due to the type of this binding`
`@@ -13,7 +13,7 @@ LL + a = 42;`
`13`	`13`	`\|`
`14`	`14`
`15`	`15`	`error[E0308]: mismatched types`
`16`		`- --> $DIR/mut_dont_reset_binding_mode_2021.rs:13:9`
	`16`	`+ --> $DIR/mut_preserve_binding_mode_2021.rs:13:9`
`17`	`17`	`\|`
`18`	`18`	`LL \| let Foo(mut a) = &mut Foo(0);`
`19`	`19`	`\| ----- expected due to the type of this binding`
Original file line number	Diff line number	Diff line change
`@@ -1,28 +1,28 @@`
`1`	`1`	error: dereferencing `mut` binding
`2`		`- --> $DIR/mut_dont_reset_binding_mode_2024_lint.rs:9:13`
	`2`	`+ --> $DIR/mut_preserve_binding_mode_2024_lint.rs:9:13`
`3`	`3`	`\|`
`4`	`4`	`LL \| let Foo(mut a) = &Foo(0);`
`5`	`5`	\| ^^^^^ `mut` dereferences the type of this binding
`6`	`6`	`\|`
`7`	`7`	`help: this will change in edition 2024`
`8`		`- --> $DIR/mut_dont_reset_binding_mode_2024_lint.rs:9:13`
	`8`	`+ --> $DIR/mut_preserve_binding_mode_2024_lint.rs:9:13`
`9`	`9`	`\|`
`10`	`10`	`LL \| let Foo(mut a) = &Foo(0);`
`11`	`11`	`\| ^^^^^`
`12`	`12`	`note: the lint level is defined here`
`13`		`- --> $DIR/mut_dont_reset_binding_mode_2024_lint.rs:4:11`
	`13`	`+ --> $DIR/mut_preserve_binding_mode_2024_lint.rs:4:11`
`14`	`14`	`\|`
`15`	`15`	`LL \| #![forbid(dereferencing_mut_binding)]`
`16`	`16`	`\| ^^^^^^^^^^^^^^^^^^^^^^^^^`
`17`	`17`
`18`	`18`	error: dereferencing `mut` binding
`19`		`- --> $DIR/mut_dont_reset_binding_mode_2024_lint.rs:13:13`
	`19`	`+ --> $DIR/mut_preserve_binding_mode_2024_lint.rs:13:13`
`20`	`20`	`\|`
`21`	`21`	`LL \| let Foo(mut a) = &mut Foo(0);`
`22`	`22`	\| ^^^^^ `mut` dereferences the type of this binding
`23`	`23`	`\|`
`24`	`24`	`help: this will change in edition 2024`
`25`		`- --> $DIR/mut_dont_reset_binding_mode_2024_lint.rs:13:13`
	`25`	`+ --> $DIR/mut_preserve_binding_mode_2024_lint.rs:13:13`
`26`	`26`	`\|`
`27`	`27`	`LL \| let Foo(mut a) = &mut Foo(0);`
`28`	`28`	`\| ^^^^^`