rebless after rebase

RalfJung · RalfJung · commit 04bc624ea0af · 2024-02-10T16:13:48.000+01:00
diff --git a/tests/ui/asm/x86_64/type-check-4.stderr b/tests/ui/asm/x86_64/type-check-4.stderr
@@ -6,6 +6,7 @@ LL | global_asm!("{}", const S);
    |
    = note: see issue #119618 <https://github.com/rust-lang/rust/issues/119618> for more information
    = help: add `#![feature(const_refs_to_static)]` to the crate attributes to enable
+   = note: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date
    = note: `static` and `const` variables can refer to other `const` variables. A `const` variable, however, cannot refer to a `static` variable.
    = help: to fix this, the value can be extracted to a `const` and then used.
 
@@ -17,6 +18,7 @@ LL | global_asm!("{}", const const_foo(S));
    |
    = note: see issue #119618 <https://github.com/rust-lang/rust/issues/119618> for more information
    = help: add `#![feature(const_refs_to_static)]` to the crate attributes to enable
+   = note: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date
    = note: `static` and `const` variables can refer to other `const` variables. A `const` variable, however, cannot refer to a `static` variable.
    = help: to fix this, the value can be extracted to a `const` and then used.
 
@@ -28,6 +30,7 @@ LL | global_asm!("{}", const const_bar(S));
    |
    = note: see issue #119618 <https://github.com/rust-lang/rust/issues/119618> for more information
    = help: add `#![feature(const_refs_to_static)]` to the crate attributes to enable
+   = note: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date
    = note: `static` and `const` variables can refer to other `const` variables. A `const` variable, however, cannot refer to a `static` variable.
    = help: to fix this, the value can be extracted to a `const` and then used.
 
diff --git a/tests/ui/consts/const-fn-not-safe-for-const.stderr b/tests/ui/consts/const-fn-not-safe-for-const.stderr
@@ -14,6 +14,7 @@ LL |     Y
    |
    = note: see issue #119618 <https://github.com/rust-lang/rust/issues/119618> for more information
    = help: add `#![feature(const_refs_to_static)]` to the crate attributes to enable
+   = note: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date
    = note: `static` and `const` variables can refer to other `const` variables. A `const` variable, however, cannot refer to a `static` variable.
    = help: to fix this, the value can be extracted to a `const` and then used.
 
@@ -25,6 +26,7 @@ LL |     &Y
    |
    = note: see issue #119618 <https://github.com/rust-lang/rust/issues/119618> for more information
    = help: add `#![feature(const_refs_to_static)]` to the crate attributes to enable
+   = note: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date
    = note: `static` and `const` variables can refer to other `const` variables. A `const` variable, however, cannot refer to a `static` variable.
    = help: to fix this, the value can be extracted to a `const` and then used.
 
diff --git a/tests/ui/consts/const_refs_to_static_fail_invalid.rs b/tests/ui/consts/const_refs_to_static_fail_invalid.rs
@@ -38,6 +38,7 @@ fn mutable() {
     const C: &i32 = unsafe { &S_MUT };
     //~^ERROR: undefined behavior
     //~| encountered reference to mutable memory
+    //~| WARN shared reference of mutable static is discouraged
 
     // This *must not build*, the constant we are matching against
     // could change its value!
diff --git a/tests/ui/consts/const_refs_to_static_fail_invalid.stderr b/tests/ui/consts/const_refs_to_static_fail_invalid.stderr
@@ -1,3 +1,18 @@
+warning: shared reference of mutable static is discouraged
+  --> $DIR/const_refs_to_static_fail_invalid.rs:38:30
+   |
+LL |     const C: &i32 = unsafe { &S_MUT };
+   |                              ^^^^^^ shared reference of mutable static
+   |
+   = note: for more information, see issue #114447 <https://github.com/rust-lang/rust/issues/114447>
+   = note: reference of mutable static is a hard error from 2024 edition
+   = note: mutable statics can be written to by multiple threads: aliasing violations or data races will cause undefined behavior
+   = note: `#[warn(static_mut_ref)]` on by default
+help: shared references are dangerous since if there's any kind of mutation of that static while the reference lives, that's UB; use `addr_of!` instead to create a raw pointer
+   |
+LL |     const C: &i32 = unsafe { addr_of!(S_MUT) };
+   |                              ~~~~~~~~~~~~~~~
+
 error[E0080]: it is undefined behavior to use this value
   --> $DIR/const_refs_to_static_fail_invalid.rs:8:5
    |
@@ -44,11 +59,11 @@ LL |     const C: &i32 = unsafe { &S_MUT };
            }
 
 error: could not evaluate constant pattern
-  --> $DIR/const_refs_to_static_fail_invalid.rs:45:9
+  --> $DIR/const_refs_to_static_fail_invalid.rs:46:9
    |
 LL |         C => {},
    |         ^
 
-error: aborting due to 6 previous errors
+error: aborting due to 6 previous errors; 1 warning emitted
 
 For more information about this error, try `rustc --explain E0080`.
diff --git a/tests/ui/consts/issue-17718-const-bad-values.stderr b/tests/ui/consts/issue-17718-const-bad-values.stderr
@@ -27,6 +27,7 @@ LL | const C2: &'static mut usize = unsafe { &mut S };
    |
    = note: see issue #119618 <https://github.com/rust-lang/rust/issues/119618> for more information
    = help: add `#![feature(const_refs_to_static)]` to the crate attributes to enable
+   = note: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date
    = note: `static` and `const` variables can refer to other `const` variables. A `const` variable, however, cannot refer to a `static` variable.
    = help: to fix this, the value can be extracted to a `const` and then used.
 
@@ -38,6 +39,7 @@ LL | const C2: &'static mut usize = unsafe { &mut S };
    |
    = note: see issue #119618 <https://github.com/rust-lang/rust/issues/119618> for more information
    = help: add `#![feature(const_refs_to_static)]` to the crate attributes to enable
+   = note: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date
    = note: `static` and `const` variables can refer to other `const` variables. A `const` variable, however, cannot refer to a `static` variable.
    = help: to fix this, the value can be extracted to a `const` and then used.
    = note: duplicate diagnostic emitted due to `-Z deduplicate-diagnostics=no`
diff --git a/tests/ui/consts/issue-17718-references.stderr b/tests/ui/consts/issue-17718-references.stderr
@@ -6,6 +6,7 @@ LL | const T2: &'static usize = &S;
    |
    = note: see issue #119618 <https://github.com/rust-lang/rust/issues/119618> for more information
    = help: add `#![feature(const_refs_to_static)]` to the crate attributes to enable
+   = note: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date
    = note: `static` and `const` variables can refer to other `const` variables. A `const` variable, however, cannot refer to a `static` variable.
    = help: to fix this, the value can be extracted to a `const` and then used.
 
@@ -17,6 +18,7 @@ LL | const T6: usize = S;
    |
    = note: see issue #119618 <https://github.com/rust-lang/rust/issues/119618> for more information
    = help: add `#![feature(const_refs_to_static)]` to the crate attributes to enable
+   = note: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date
    = note: `static` and `const` variables can refer to other `const` variables. A `const` variable, however, cannot refer to a `static` variable.
    = help: to fix this, the value can be extracted to a `const` and then used.
 
@@ -28,6 +30,7 @@ LL | const T10: Struct = Struct { a: S };
    |
    = note: see issue #119618 <https://github.com/rust-lang/rust/issues/119618> for more information
    = help: add `#![feature(const_refs_to_static)]` to the crate attributes to enable
+   = note: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date
    = note: `static` and `const` variables can refer to other `const` variables. A `const` variable, however, cannot refer to a `static` variable.
    = help: to fix this, the value can be extracted to a `const` and then used.
 
diff --git a/tests/ui/consts/issue-52060.stderr b/tests/ui/consts/issue-52060.stderr
@@ -6,6 +6,7 @@ LL | static B: [u32; 1] = [0; A.len()];
    |
    = note: see issue #119618 <https://github.com/rust-lang/rust/issues/119618> for more information
    = help: add `#![feature(const_refs_to_static)]` to the crate attributes to enable
+   = note: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date
    = note: `static` and `const` variables can refer to other `const` variables. A `const` variable, however, cannot refer to a `static` variable.
    = help: to fix this, the value can be extracted to a `const` and then used.
 
diff --git a/tests/ui/consts/min_const_fn/min_const_fn.stderr b/tests/ui/consts/min_const_fn/min_const_fn.stderr
@@ -150,6 +150,7 @@ LL | const fn foo25() -> u32 { BAR }
    |
    = note: see issue #119618 <https://github.com/rust-lang/rust/issues/119618> for more information
    = help: add `#![feature(const_refs_to_static)]` to the crate attributes to enable
+   = note: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date
    = note: `static` and `const` variables can refer to other `const` variables. A `const` variable, however, cannot refer to a `static` variable.
    = help: to fix this, the value can be extracted to a `const` and then used.
 
@@ -161,6 +162,7 @@ LL | const fn foo26() -> &'static u32 { &BAR }
    |
    = note: see issue #119618 <https://github.com/rust-lang/rust/issues/119618> for more information
    = help: add `#![feature(const_refs_to_static)]` to the crate attributes to enable
+   = note: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date
    = note: `static` and `const` variables can refer to other `const` variables. A `const` variable, however, cannot refer to a `static` variable.
    = help: to fix this, the value can be extracted to a `const` and then used.
 
diff --git a/tests/ui/feature-gates/feature-gate-const-refs-to-static.stderr b/tests/ui/feature-gates/feature-gate-const-refs-to-static.stderr
@@ -6,6 +6,7 @@ LL | const C1: &i32 = &S;
    |
    = note: see issue #119618 <https://github.com/rust-lang/rust/issues/119618> for more information
    = help: add `#![feature(const_refs_to_static)]` to the crate attributes to enable
+   = note: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date
    = note: `static` and `const` variables can refer to other `const` variables. A `const` variable, however, cannot refer to a `static` variable.
    = help: to fix this, the value can be extracted to a `const` and then used.
 
@@ -17,6 +18,7 @@ LL | const C2: *const i32 = unsafe { std::ptr::addr_of!(S_MUT) };
    |
    = note: see issue #119618 <https://github.com/rust-lang/rust/issues/119618> for more information
    = help: add `#![feature(const_refs_to_static)]` to the crate attributes to enable
+   = note: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date
    = note: `static` and `const` variables can refer to other `const` variables. A `const` variable, however, cannot refer to a `static` variable.
    = help: to fix this, the value can be extracted to a `const` and then used.
 
@@ -28,6 +30,7 @@ LL | const C2: *const i32 = unsafe { std::ptr::addr_of!(S_MUT) };
    |
    = note: see issue #119618 <https://github.com/rust-lang/rust/issues/119618> for more information
    = help: add `#![feature(const_refs_to_static)]` to the crate attributes to enable
+   = note: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date
    = note: `static` and `const` variables can refer to other `const` variables. A `const` variable, however, cannot refer to a `static` variable.
    = help: to fix this, the value can be extracted to a `const` and then used.
    = note: duplicate diagnostic emitted due to `-Z deduplicate-diagnostics=no`
diff --git a/tests/ui/static/issue-18118-2.stderr b/tests/ui/static/issue-18118-2.stderr
@@ -6,6 +6,7 @@ LL |         &p
    |
    = note: see issue #119618 <https://github.com/rust-lang/rust/issues/119618> for more information
    = help: add `#![feature(const_refs_to_static)]` to the crate attributes to enable
+   = note: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date
    = note: `static` and `const` variables can refer to other `const` variables. A `const` variable, however, cannot refer to a `static` variable.
    = help: to fix this, the value can be extracted to a `const` and then used.
 
diff --git a/tests/ui/thread-local/thread-local-static.stderr b/tests/ui/thread-local/thread-local-static.stderr
@@ -45,6 +45,7 @@ LL |     std::mem::swap(x, &mut STATIC_VAR_2)
    |
    = note: see issue #119618 <https://github.com/rust-lang/rust/issues/119618> for more information
    = help: add `#![feature(const_refs_to_static)]` to the crate attributes to enable
+   = note: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date
    = note: `static` and `const` variables can refer to other `const` variables. A `const` variable, however, cannot refer to a `static` variable.
    = help: to fix this, the value can be extracted to a `const` and then used.
 

Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@ LL \| global_asm!("{}", const S);`
`6`	`6`	`\|`
`7`	`7`	`= note: see issue #119618 <https://github.com/rust-lang/rust/issues/119618> for more information`
`8`	`8`	= help: add `#![feature(const_refs_to_static)]` to the crate attributes to enable
	`9`	`+ = note: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date`
`9`	`10`	= note: `static` and `const` variables can refer to other `const` variables. A `const` variable, however, cannot refer to a `static` variable.
`10`	`11`	= help: to fix this, the value can be extracted to a `const` and then used.
`11`	`12`
`@@ -17,6 +18,7 @@ LL \| global_asm!("{}", const const_foo(S));`
`17`	`18`	`\|`
`18`	`19`	`= note: see issue #119618 <https://github.com/rust-lang/rust/issues/119618> for more information`
`19`	`20`	= help: add `#![feature(const_refs_to_static)]` to the crate attributes to enable
	`21`	`+ = note: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date`
`20`	`22`	= note: `static` and `const` variables can refer to other `const` variables. A `const` variable, however, cannot refer to a `static` variable.
`21`	`23`	= help: to fix this, the value can be extracted to a `const` and then used.
`22`	`24`
`@@ -28,6 +30,7 @@ LL \| global_asm!("{}", const const_bar(S));`
`28`	`30`	`\|`
`29`	`31`	`= note: see issue #119618 <https://github.com/rust-lang/rust/issues/119618> for more information`
`30`	`32`	= help: add `#![feature(const_refs_to_static)]` to the crate attributes to enable
	`33`	`+ = note: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date`
`31`	`34`	= note: `static` and `const` variables can refer to other `const` variables. A `const` variable, however, cannot refer to a `static` variable.
`32`	`35`	= help: to fix this, the value can be extracted to a `const` and then used.
`33`	`36`
Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,7 @@ LL \| Y`
`14`	`14`	`\|`
`15`	`15`	`= note: see issue #119618 <https://github.com/rust-lang/rust/issues/119618> for more information`
`16`	`16`	= help: add `#![feature(const_refs_to_static)]` to the crate attributes to enable
	`17`	`+ = note: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date`
`17`	`18`	= note: `static` and `const` variables can refer to other `const` variables. A `const` variable, however, cannot refer to a `static` variable.
`18`	`19`	= help: to fix this, the value can be extracted to a `const` and then used.
`19`	`20`
`@@ -25,6 +26,7 @@ LL \| &Y`
`25`	`26`	`\|`
`26`	`27`	`= note: see issue #119618 <https://github.com/rust-lang/rust/issues/119618> for more information`
`27`	`28`	= help: add `#![feature(const_refs_to_static)]` to the crate attributes to enable
	`29`	`+ = note: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date`
`28`	`30`	= note: `static` and `const` variables can refer to other `const` variables. A `const` variable, however, cannot refer to a `static` variable.
`29`	`31`	= help: to fix this, the value can be extracted to a `const` and then used.
`30`	`32`
Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,7 @@ LL \| const C2: &'static mut usize = unsafe { &mut S };`
`27`	`27`	`\|`
`28`	`28`	`= note: see issue #119618 <https://github.com/rust-lang/rust/issues/119618> for more information`
`29`	`29`	= help: add `#![feature(const_refs_to_static)]` to the crate attributes to enable
	`30`	`+ = note: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date`
`30`	`31`	= note: `static` and `const` variables can refer to other `const` variables. A `const` variable, however, cannot refer to a `static` variable.
`31`	`32`	= help: to fix this, the value can be extracted to a `const` and then used.
`32`	`33`
`@@ -38,6 +39,7 @@ LL \| const C2: &'static mut usize = unsafe { &mut S };`
`38`	`39`	`\|`
`39`	`40`	`= note: see issue #119618 <https://github.com/rust-lang/rust/issues/119618> for more information`
`40`	`41`	= help: add `#![feature(const_refs_to_static)]` to the crate attributes to enable
	`42`	`+ = note: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date`
`41`	`43`	= note: `static` and `const` variables can refer to other `const` variables. A `const` variable, however, cannot refer to a `static` variable.
`42`	`44`	= help: to fix this, the value can be extracted to a `const` and then used.
`43`	`45`	= note: duplicate diagnostic emitted due to `-Z deduplicate-diagnostics=no`
Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@ LL \| const T2: &'static usize = &S;`
`6`	`6`	`\|`
`7`	`7`	`= note: see issue #119618 <https://github.com/rust-lang/rust/issues/119618> for more information`
`8`	`8`	= help: add `#![feature(const_refs_to_static)]` to the crate attributes to enable
	`9`	`+ = note: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date`
`9`	`10`	= note: `static` and `const` variables can refer to other `const` variables. A `const` variable, however, cannot refer to a `static` variable.
`10`	`11`	= help: to fix this, the value can be extracted to a `const` and then used.
`11`	`12`
`@@ -17,6 +18,7 @@ LL \| const T6: usize = S;`
`17`	`18`	`\|`
`18`	`19`	`= note: see issue #119618 <https://github.com/rust-lang/rust/issues/119618> for more information`
`19`	`20`	= help: add `#![feature(const_refs_to_static)]` to the crate attributes to enable
	`21`	`+ = note: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date`
`20`	`22`	= note: `static` and `const` variables can refer to other `const` variables. A `const` variable, however, cannot refer to a `static` variable.
`21`	`23`	= help: to fix this, the value can be extracted to a `const` and then used.
`22`	`24`
`@@ -28,6 +30,7 @@ LL \| const T10: Struct = Struct { a: S };`
`28`	`30`	`\|`
`29`	`31`	`= note: see issue #119618 <https://github.com/rust-lang/rust/issues/119618> for more information`
`30`	`32`	= help: add `#![feature(const_refs_to_static)]` to the crate attributes to enable
	`33`	`+ = note: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date`
`31`	`34`	= note: `static` and `const` variables can refer to other `const` variables. A `const` variable, however, cannot refer to a `static` variable.
`32`	`35`	= help: to fix this, the value can be extracted to a `const` and then used.
`33`	`36`
Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@ LL \| static B: [u32; 1] = [0; A.len()];`
`6`	`6`	`\|`
`7`	`7`	`= note: see issue #119618 <https://github.com/rust-lang/rust/issues/119618> for more information`
`8`	`8`	= help: add `#![feature(const_refs_to_static)]` to the crate attributes to enable
	`9`	`+ = note: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date`
`9`	`10`	= note: `static` and `const` variables can refer to other `const` variables. A `const` variable, however, cannot refer to a `static` variable.
`10`	`11`	= help: to fix this, the value can be extracted to a `const` and then used.
`11`	`12`
Original file line number	Diff line number	Diff line change
`@@ -150,6 +150,7 @@ LL \| const fn foo25() -> u32 { BAR }`
`150`	`150`	`\|`
`151`	`151`	`= note: see issue #119618 <https://github.com/rust-lang/rust/issues/119618> for more information`
`152`	`152`	= help: add `#![feature(const_refs_to_static)]` to the crate attributes to enable
	`153`	`+ = note: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date`
`153`	`154`	= note: `static` and `const` variables can refer to other `const` variables. A `const` variable, however, cannot refer to a `static` variable.
`154`	`155`	= help: to fix this, the value can be extracted to a `const` and then used.
`155`	`156`
`@@ -161,6 +162,7 @@ LL \| const fn foo26() -> &'static u32 { &BAR }`
`161`	`162`	`\|`
`162`	`163`	`= note: see issue #119618 <https://github.com/rust-lang/rust/issues/119618> for more information`
`163`	`164`	= help: add `#![feature(const_refs_to_static)]` to the crate attributes to enable
	`165`	`+ = note: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date`
`164`	`166`	= note: `static` and `const` variables can refer to other `const` variables. A `const` variable, however, cannot refer to a `static` variable.
`165`	`167`	= help: to fix this, the value can be extracted to a `const` and then used.
`166`	`168`
Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@ LL \| &p`
`6`	`6`	`\|`
`7`	`7`	`= note: see issue #119618 <https://github.com/rust-lang/rust/issues/119618> for more information`
`8`	`8`	= help: add `#![feature(const_refs_to_static)]` to the crate attributes to enable
	`9`	`+ = note: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date`
`9`	`10`	= note: `static` and `const` variables can refer to other `const` variables. A `const` variable, however, cannot refer to a `static` variable.
`10`	`11`	= help: to fix this, the value can be extracted to a `const` and then used.
`11`	`12`
Original file line number	Diff line number	Diff line change
`@@ -45,6 +45,7 @@ LL \| std::mem::swap(x, &mut STATIC_VAR_2)`
`45`	`45`	`\|`
`46`	`46`	`= note: see issue #119618 <https://github.com/rust-lang/rust/issues/119618> for more information`
`47`	`47`	= help: add `#![feature(const_refs_to_static)]` to the crate attributes to enable
	`48`	`+ = note: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date`
`48`	`49`	= note: `static` and `const` variables can refer to other `const` variables. A `const` variable, however, cannot refer to a `static` variable.
`49`	`50`	= help: to fix this, the value can be extracted to a `const` and then used.
`50`	`51`