bless you

ChrisDenton · ChrisDenton · commit b0b75de19042 · 2024-05-14T06:37:22.000Z
diff --git a/tests/ui/proc-macro/meta-macro-hygiene.stdout b/tests/ui/proc-macro/meta-macro-hygiene.stdout
@@ -55,6 +55,9 @@ crate1::{{expnNNN}}: parent: crate0::{{expn0}}, call_site_ctxt: #0, def_site_ctx
 crate1::{{expnNNN}}: parent: crate0::{{expn0}}, call_site_ctxt: #0, def_site_ctxt: #0, kind: Macro(Attr, "diagnostic::on_unimplemented")
 crate1::{{expnNNN}}: parent: crate0::{{expn0}}, call_site_ctxt: #0, def_site_ctxt: #0, kind: Macro(Attr, "derive")
 crate1::{{expnNNN}}: parent: crate0::{{expn0}}, call_site_ctxt: #0, def_site_ctxt: #0, kind: Macro(Attr, "derive")
+crate1::{{expnNNN}}: parent: crate0::{{expn0}}, call_site_ctxt: #0, def_site_ctxt: #0, kind: Macro(Attr, "derive")
+crate1::{{expnNNN}}: parent: crate0::{{expn0}}, call_site_ctxt: #0, def_site_ctxt: #0, kind: Macro(Attr, "derive")
+crate1::{{expnNNN}}: parent: crate0::{{expn0}}, call_site_ctxt: #0, def_site_ctxt: #0, kind: Macro(Attr, "derive")
 crate1::{{expnNNN}}: parent: crate0::{{expn0}}, call_site_ctxt: #0, def_site_ctxt: #0, kind: Macro(Bang, "include")
 
 SyntaxContexts:
diff --git a/tests/ui/proc-macro/nonterminal-token-hygiene.stdout b/tests/ui/proc-macro/nonterminal-token-hygiene.stdout
@@ -77,6 +77,9 @@ crate1::{{expnNNN}}: parent: crate0::{{expn0}}, call_site_ctxt: #0, def_site_ctx
 crate1::{{expnNNN}}: parent: crate0::{{expn0}}, call_site_ctxt: #0, def_site_ctxt: #0, kind: Macro(Attr, "diagnostic::on_unimplemented")
 crate1::{{expnNNN}}: parent: crate0::{{expn0}}, call_site_ctxt: #0, def_site_ctxt: #0, kind: Macro(Attr, "derive")
 crate1::{{expnNNN}}: parent: crate0::{{expn0}}, call_site_ctxt: #0, def_site_ctxt: #0, kind: Macro(Attr, "derive")
+crate1::{{expnNNN}}: parent: crate0::{{expn0}}, call_site_ctxt: #0, def_site_ctxt: #0, kind: Macro(Attr, "derive")
+crate1::{{expnNNN}}: parent: crate0::{{expn0}}, call_site_ctxt: #0, def_site_ctxt: #0, kind: Macro(Attr, "derive")
+crate1::{{expnNNN}}: parent: crate0::{{expn0}}, call_site_ctxt: #0, def_site_ctxt: #0, kind: Macro(Attr, "derive")
 crate1::{{expnNNN}}: parent: crate0::{{expn0}}, call_site_ctxt: #0, def_site_ctxt: #0, kind: Macro(Bang, "include")
 
 SyntaxContexts:
diff --git a/tests/ui/std-uncopyable-atomics.stderr b/tests/ui/std-uncopyable-atomics.stderr
@@ -2,7 +2,7 @@ error[E0507]: cannot move out of a shared reference
   --> $DIR/std-uncopyable-atomics.rs:9:13
    |
 LL |     let x = *&x;
-   |             ^^^ move occurs because value has type `std::sync::atomic::AtomicBool`, which does not implement the `Copy` trait
+   |             ^^^ move occurs because value has type `std::prelude::rust_2021::AtomicBool`, which does not implement the `Copy` trait
    |
 help: consider removing the dereference here
    |
@@ -14,7 +14,7 @@ error[E0507]: cannot move out of a shared reference
   --> $DIR/std-uncopyable-atomics.rs:11:13
    |
 LL |     let x = *&x;
-   |             ^^^ move occurs because value has type `std::sync::atomic::AtomicIsize`, which does not implement the `Copy` trait
+   |             ^^^ move occurs because value has type `std::prelude::rust_2021::AtomicIsize`, which does not implement the `Copy` trait
    |
 help: consider removing the dereference here
    |
@@ -26,7 +26,7 @@ error[E0507]: cannot move out of a shared reference
   --> $DIR/std-uncopyable-atomics.rs:13:13
    |
 LL |     let x = *&x;
-   |             ^^^ move occurs because value has type `std::sync::atomic::AtomicUsize`, which does not implement the `Copy` trait
+   |             ^^^ move occurs because value has type `std::prelude::rust_2021::AtomicUsize`, which does not implement the `Copy` trait
    |
 help: consider removing the dereference here
    |
@@ -38,7 +38,7 @@ error[E0507]: cannot move out of a shared reference
   --> $DIR/std-uncopyable-atomics.rs:15:13
    |
 LL |     let x = *&x;
-   |             ^^^ move occurs because value has type `std::sync::atomic::AtomicPtr<usize>`, which does not implement the `Copy` trait
+   |             ^^^ move occurs because value has type `std::prelude::rust_2021::AtomicPtr<usize>`, which does not implement the `Copy` trait
    |
 help: consider removing the dereference here
    |
diff --git a/tests/ui/suggestions/core-std-import-order-issue-83564.stderr b/tests/ui/suggestions/core-std-import-order-issue-83564.stderr
@@ -6,7 +6,7 @@ LL |     let _x = NonZero::new(5u32).unwrap();
    |
 help: consider importing one of these items
    |
-LL + use core::num::NonZero;
+LL + use core::prelude::rust_2024::NonZero;
    |
 LL + use std::num::NonZero;
    |

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@ error[E0507]: cannot move out of a shared reference`
`2`	`2`	`--> $DIR/std-uncopyable-atomics.rs:9:13`
`3`	`3`	`\|`
`4`	`4`	`LL \| let x = *&x;`
`5`		- \| ^^^ move occurs because value has type `std::sync::atomic::AtomicBool`, which does not implement the `Copy` trait
	`5`	+ \| ^^^ move occurs because value has type `std::prelude::rust_2021::AtomicBool`, which does not implement the `Copy` trait
`6`	`6`	`\|`
`7`	`7`	`help: consider removing the dereference here`
`8`	`8`	`\|`
`@@ -14,7 +14,7 @@ error[E0507]: cannot move out of a shared reference`
`14`	`14`	`--> $DIR/std-uncopyable-atomics.rs:11:13`
`15`	`15`	`\|`
`16`	`16`	`LL \| let x = *&x;`
`17`		- \| ^^^ move occurs because value has type `std::sync::atomic::AtomicIsize`, which does not implement the `Copy` trait
	`17`	+ \| ^^^ move occurs because value has type `std::prelude::rust_2021::AtomicIsize`, which does not implement the `Copy` trait
`18`	`18`	`\|`
`19`	`19`	`help: consider removing the dereference here`
`20`	`20`	`\|`
`@@ -26,7 +26,7 @@ error[E0507]: cannot move out of a shared reference`
`26`	`26`	`--> $DIR/std-uncopyable-atomics.rs:13:13`
`27`	`27`	`\|`
`28`	`28`	`LL \| let x = *&x;`
`29`		- \| ^^^ move occurs because value has type `std::sync::atomic::AtomicUsize`, which does not implement the `Copy` trait
	`29`	+ \| ^^^ move occurs because value has type `std::prelude::rust_2021::AtomicUsize`, which does not implement the `Copy` trait
`30`	`30`	`\|`
`31`	`31`	`help: consider removing the dereference here`
`32`	`32`	`\|`
`@@ -38,7 +38,7 @@ error[E0507]: cannot move out of a shared reference`
`38`	`38`	`--> $DIR/std-uncopyable-atomics.rs:15:13`
`39`	`39`	`\|`
`40`	`40`	`LL \| let x = *&x;`
`41`		- \| ^^^ move occurs because value has type `std::sync::atomic::AtomicPtr<usize>`, which does not implement the `Copy` trait
	`41`	+ \| ^^^ move occurs because value has type `std::prelude::rust_2021::AtomicPtr<usize>`, which does not implement the `Copy` trait
`42`	`42`	`\|`
`43`	`43`	`help: consider removing the dereference here`
`44`	`44`	`\|`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ LL \| let _x = NonZero::new(5u32).unwrap();`
`6`	`6`	`\|`
`7`	`7`	`help: consider importing one of these items`
`8`	`8`	`\|`
`9`		`-LL + use core::num::NonZero;`
	`9`	`+LL + use core::prelude::rust_2024::NonZero;`
`10`	`10`	`\|`
`11`	`11`	`LL + use std::num::NonZero;`
`12`	`12`	`\|`