Change leak check lint message to behavior is likely to change in the future

spastorino · spastorino · commit cc1a618aaa58 · 2024-02-15T10:55:30.000-03:00
diff --git a/compiler/rustc_lint_defs/src/builtin.rs b/compiler/rustc_lint_defs/src/builtin.rs
@@ -1503,7 +1503,7 @@ declare_lint! {
     Warn,
     "distinct impls distinguished only by the leak-check code",
     @future_incompatible = FutureIncompatibleInfo {
-        reason: FutureIncompatibilityReason::FutureReleaseErrorDontReportInDeps,
+        reason: FutureIncompatibilityReason::Custom("the behavior may change in a future release"),
         reference: "issue #56105 <https://github.com/rust-lang/rust/issues/56105>",
     };
 }
diff --git a/tests/ui/coherence/coherence-fn-implied-bounds.rs b/tests/ui/coherence/coherence-fn-implied-bounds.rs
@@ -20,7 +20,7 @@ impl Trait for for<'a, 'b> fn(&'a &'b u32, &'b &'a u32) -> &'b u32 {}
 
 impl Trait for for<'c> fn(&'c &'c u32, &'c &'c u32) -> &'c u32 {
     //~^ ERROR conflicting implementations
-    //~| WARNING this was previously accepted by the compiler
+    //~| WARN the behavior may change in a future release
 }
 
 fn main() {}
diff --git a/tests/ui/coherence/coherence-fn-implied-bounds.stderr b/tests/ui/coherence/coherence-fn-implied-bounds.stderr
@@ -7,7 +7,7 @@ LL |
 LL | impl Trait for for<'c> fn(&'c &'c u32, &'c &'c u32) -> &'c u32 {
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ conflicting implementation for `for<'a, 'b> fn(&'a &'b u32, &'b &'a u32) -> &'b u32`
    |
-   = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
+   = warning: the behavior may change in a future release
    = note: for more information, see issue #56105 <https://github.com/rust-lang/rust/issues/56105>
    = note: this behavior recently changed as a result of a bug fix; see rust-lang/rust#56105 for details
 note: the lint level is defined here
diff --git a/tests/ui/coherence/coherence-free-vs-bound-region.rs b/tests/ui/coherence/coherence-free-vs-bound-region.rs
@@ -15,7 +15,7 @@ impl<'a> TheTrait for fn(&'a u8) {}
 
 impl TheTrait for fn(&u8) {
     //~^ ERROR conflicting implementations of trait
-    //~| WARNING this was previously accepted by the compiler
+    //~| WARN the behavior may change in a future release
 }
 
 fn main() {}
diff --git a/tests/ui/coherence/coherence-free-vs-bound-region.stderr b/tests/ui/coherence/coherence-free-vs-bound-region.stderr
@@ -7,7 +7,7 @@ LL |
 LL | impl TheTrait for fn(&u8) {
    | ^^^^^^^^^^^^^^^^^^^^^^^^^ conflicting implementation for `fn(&u8)`
    |
-   = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
+   = warning: the behavior may change in a future release
    = note: for more information, see issue #56105 <https://github.com/rust-lang/rust/issues/56105>
    = note: this behavior recently changed as a result of a bug fix; see rust-lang/rust#56105 for details
 note: the lint level is defined here
diff --git a/tests/ui/coherence/coherence-subtyping.rs b/tests/ui/coherence/coherence-subtyping.rs
@@ -13,8 +13,8 @@ trait TheTrait {
 impl TheTrait for for<'a, 'b> fn(&'a u8, &'b u8) -> &'a u8 {}
 
 impl TheTrait for for<'a> fn(&'a u8, &'a u8) -> &'a u8 {
-    //~^ WARNING conflicting implementation
-    //~^^ WARNING this was previously accepted by the compiler but is being phased out
+    //~^ WARN conflicting implementation
+    //~| WARN the behavior may change in a future release
 }
 
 fn main() {}
diff --git a/tests/ui/coherence/coherence-subtyping.stderr b/tests/ui/coherence/coherence-subtyping.stderr
@@ -7,7 +7,7 @@ LL |
 LL | impl TheTrait for for<'a> fn(&'a u8, &'a u8) -> &'a u8 {
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ conflicting implementation for `for<'a, 'b> fn(&'a u8, &'b u8) -> &'a u8`
    |
-   = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
+   = warning: the behavior may change in a future release
    = note: for more information, see issue #56105 <https://github.com/rust-lang/rust/issues/56105>
    = note: this behavior recently changed as a result of a bug fix; see rust-lang/rust#56105 for details
    = note: `#[warn(coherence_leak_check)]` on by default
diff --git a/tests/ui/coherence/coherence-wasm-bindgen.rs b/tests/ui/coherence/coherence-wasm-bindgen.rs
@@ -31,7 +31,7 @@ where
     R: ReturnWasmAbi,
 {
     //~^^^^^ ERROR conflicting implementation
-    //~| WARNING this was previously accepted
+    //~| WARN the behavior may change in a future release
 }
 
 fn main() {}
diff --git a/tests/ui/coherence/coherence-wasm-bindgen.stderr b/tests/ui/coherence/coherence-wasm-bindgen.stderr
@@ -13,7 +13,7 @@ LL | |     A: RefFromWasmAbi,
 LL | |     R: ReturnWasmAbi,
    | |_____________________^ conflicting implementation for `&dyn Fn(&_) -> _`
    |
-   = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
+   = warning: the behavior may change in a future release
    = note: for more information, see issue #56105 <https://github.com/rust-lang/rust/issues/56105>
    = note: downstream crates may implement trait `FromWasmAbi` for type `&_`
    = note: this behavior recently changed as a result of a bug fix; see rust-lang/rust#56105 for details
diff --git a/tests/ui/coherence/negative-coherence-placeholder-region-constraints-on-unification.explicit.stderr b/tests/ui/coherence/negative-coherence-placeholder-region-constraints-on-unification.explicit.stderr
@@ -6,7 +6,7 @@ LL | impl<T: ?Sized + Marker> FnMarker for fn(T) {}
 LL | impl<T: ?Sized> FnMarker for fn(&T) {}
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ conflicting implementation for `fn(&_)`
    |
-   = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
+   = warning: the behavior may change in a future release
    = note: for more information, see issue #56105 <https://github.com/rust-lang/rust/issues/56105>
    = note: this behavior recently changed as a result of a bug fix; see rust-lang/rust#56105 for details
 note: the lint level is defined here
diff --git a/tests/ui/coherence/negative-coherence-placeholder-region-constraints-on-unification.rs b/tests/ui/coherence/negative-coherence-placeholder-region-constraints-on-unification.rs
@@ -20,6 +20,6 @@ trait FnMarker {}
 impl<T: ?Sized + Marker> FnMarker for fn(T) {}
 impl<T: ?Sized> FnMarker for fn(&T) {}
 //[explicit]~^ ERROR conflicting implementations of trait `FnMarker` for type `fn(&_)`
-//[explicit]~| WARN this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
+//[explicit]~| WARN the behavior may change in a future release
 
 fn main() {}
diff --git a/tests/ui/const-generics/invariant.rs b/tests/ui/const-generics/invariant.rs
@@ -12,18 +12,16 @@ impl SadBee for for<'a> fn(&'a ()) {
     const ASSOC: usize = 0;
 }
 impl SadBee for fn(&'static ()) {
-    //~^ WARNING conflicting implementations of trait
-    //~| WARNING this was previously accepted
+    //~^ WARN conflicting implementations of trait
+    //~| WARN the behavior may change in a future release
     const ASSOC: usize = 100;
 }
 
 struct Foo<T: SadBee>([u8; <T as SadBee>::ASSOC], PhantomData<T>)
 where
-    [(); <T as SadBee>::ASSOC]: ;
+    [(); <T as SadBee>::ASSOC]:;
 
-fn covariant(
-    v: &'static Foo<for<'a> fn(&'a ())>
-) -> &'static Foo<fn(&'static ())> {
+fn covariant(v: &'static Foo<for<'a> fn(&'a ())>) -> &'static Foo<fn(&'static ())> {
     v
     //~^ ERROR mismatched types
 }
diff --git a/tests/ui/const-generics/invariant.stderr b/tests/ui/const-generics/invariant.stderr
@@ -7,13 +7,13 @@ LL | impl SadBee for for<'a> fn(&'a ()) {
 LL | impl SadBee for fn(&'static ()) {
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ conflicting implementation for `for<'a> fn(&'a ())`
    |
-   = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
+   = warning: the behavior may change in a future release
    = note: for more information, see issue #56105 <https://github.com/rust-lang/rust/issues/56105>
    = note: this behavior recently changed as a result of a bug fix; see rust-lang/rust#56105 for details
    = note: `#[warn(coherence_leak_check)]` on by default
 
 error[E0308]: mismatched types
-  --> $DIR/invariant.rs:27:5
+  --> $DIR/invariant.rs:25:5
    |
 LL |     v
    |     ^ one type is more general than the other

Original file line number	Diff line number	Diff line change
`@@ -1503,7 +1503,7 @@ declare_lint! {`
`1503`	`1503`	`Warn,`
`1504`	`1504`	`"distinct impls distinguished only by the leak-check code",`
`1505`	`1505`	`@future_incompatible = FutureIncompatibleInfo {`
`1506`		`- reason: FutureIncompatibilityReason::FutureReleaseErrorDontReportInDeps,`
	`1506`	`+ reason: FutureIncompatibilityReason::Custom("the behavior may change in a future release"),`
`1507`	`1507`	`reference: "issue #56105 <https://github.com/rust-lang/rust/issues/56105>",`
`1508`	`1508`	`};`
`1509`	`1509`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ impl Trait for for<'a, 'b> fn(&'a &'b u32, &'b &'a u32) -> &'b u32 {}`
`20`	`20`
`21`	`21`	`impl Trait for for<'c> fn(&'c &'c u32, &'c &'c u32) -> &'c u32 {`
`22`	`22`	`//~^ ERROR conflicting implementations`
`23`		`- //~\| WARNING this was previously accepted by the compiler`
	`23`	`+ //~\| WARN the behavior may change in a future release`
`24`	`24`	`}`
`25`	`25`
`26`	`26`	`fn main() {}`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ LL \|`
`7`	`7`	`LL \| impl Trait for for<'c> fn(&'c &'c u32, &'c &'c u32) -> &'c u32 {`
`8`	`8`	\| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ conflicting implementation for `for<'a, 'b> fn(&'a &'b u32, &'b &'a u32) -> &'b u32`
`9`	`9`	`\|`
`10`		`- = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!`
	`10`	`+ = warning: the behavior may change in a future release`
`11`	`11`	`= note: for more information, see issue #56105 <https://github.com/rust-lang/rust/issues/56105>`
`12`	`12`	`= note: this behavior recently changed as a result of a bug fix; see rust-lang/rust#56105 for details`
`13`	`13`	`note: the lint level is defined here`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ impl<'a> TheTrait for fn(&'a u8) {}`
`15`	`15`
`16`	`16`	`impl TheTrait for fn(&u8) {`
`17`	`17`	`//~^ ERROR conflicting implementations of trait`
`18`		`- //~\| WARNING this was previously accepted by the compiler`
	`18`	`+ //~\| WARN the behavior may change in a future release`
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`fn main() {}`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ LL \|`
`7`	`7`	`LL \| impl TheTrait for fn(&u8) {`
`8`	`8`	\| ^^^^^^^^^^^^^^^^^^^^^^^^^ conflicting implementation for `fn(&u8)`
`9`	`9`	`\|`
`10`		`- = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!`
	`10`	`+ = warning: the behavior may change in a future release`
`11`	`11`	`= note: for more information, see issue #56105 <https://github.com/rust-lang/rust/issues/56105>`
`12`	`12`	`= note: this behavior recently changed as a result of a bug fix; see rust-lang/rust#56105 for details`
`13`	`13`	`note: the lint level is defined here`
Original file line number	Diff line number	Diff line change
`@@ -13,8 +13,8 @@ trait TheTrait {`
`13`	`13`	`impl TheTrait for for<'a, 'b> fn(&'a u8, &'b u8) -> &'a u8 {}`
`14`	`14`
`15`	`15`	`impl TheTrait for for<'a> fn(&'a u8, &'a u8) -> &'a u8 {`
`16`		`- //~^ WARNING conflicting implementation`
`17`		`- //~^^ WARNING this was previously accepted by the compiler but is being phased out`
	`16`	`+ //~^ WARN conflicting implementation`
	`17`	`+ //~\| WARN the behavior may change in a future release`
`18`	`18`	`}`
`19`	`19`
`20`	`20`	`fn main() {}`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ LL \|`
`7`	`7`	`LL \| impl TheTrait for for<'a> fn(&'a u8, &'a u8) -> &'a u8 {`
`8`	`8`	\| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ conflicting implementation for `for<'a, 'b> fn(&'a u8, &'b u8) -> &'a u8`
`9`	`9`	`\|`
`10`		`- = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!`
	`10`	`+ = warning: the behavior may change in a future release`
`11`	`11`	`= note: for more information, see issue #56105 <https://github.com/rust-lang/rust/issues/56105>`
`12`	`12`	`= note: this behavior recently changed as a result of a bug fix; see rust-lang/rust#56105 for details`
`13`	`13`	= note: `#[warn(coherence_leak_check)]` on by default
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ where`
`31`	`31`	`R: ReturnWasmAbi,`
`32`	`32`	`{`
`33`	`33`	`//~^^^^^ ERROR conflicting implementation`
`34`		`- //~\| WARNING this was previously accepted`
	`34`	`+ //~\| WARN the behavior may change in a future release`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`fn main() {}`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ LL \| \| A: RefFromWasmAbi,`
`13`	`13`	`LL \| \| R: ReturnWasmAbi,`
`14`	`14`	\| \|_____________________^ conflicting implementation for `&dyn Fn(&_) -> _`
`15`	`15`	`\|`
`16`		`- = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!`
	`16`	`+ = warning: the behavior may change in a future release`
`17`	`17`	`= note: for more information, see issue #56105 <https://github.com/rust-lang/rust/issues/56105>`
`18`	`18`	= note: downstream crates may implement trait `FromWasmAbi` for type `&_`
`19`	`19`	`= note: this behavior recently changed as a result of a bug fix; see rust-lang/rust#56105 for details`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ LL \| impl<T: ?Sized + Marker> FnMarker for fn(T) {}`
`6`	`6`	`LL \| impl<T: ?Sized> FnMarker for fn(&T) {}`
`7`	`7`	\| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ conflicting implementation for `fn(&_)`
`8`	`8`	`\|`
`9`		`- = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!`
	`9`	`+ = warning: the behavior may change in a future release`
`10`	`10`	`= note: for more information, see issue #56105 <https://github.com/rust-lang/rust/issues/56105>`
`11`	`11`	`= note: this behavior recently changed as a result of a bug fix; see rust-lang/rust#56105 for details`
`12`	`12`	`note: the lint level is defined here`