Skip to content

Commit 715c68f

Browse files
committed
Revert "Update tests"
This reverts commit c76b1b0.
1 parent 8d5fb5b commit 715c68f

18 files changed

+68
-68
lines changed

Diff for: src/test/ui/consts/miri_unleashed/tls.stderr

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@ error[E0080]: could not evaluate static initializer
22
--> $DIR/tls.rs:12:25
33
|
44
LL | unsafe { let _val = A; }
5-
| ^ cannot access thread local static (DefId(0:6 ~ tls[f423]::A))
5+
| ^ cannot access thread local static (DefId(0:6 ~ tls[317d]::A))
66

77
error[E0080]: could not evaluate static initializer
88
--> $DIR/tls.rs:19:26
99
|
1010
LL | unsafe { let _val = &A; }
11-
| ^ cannot access thread local static (DefId(0:6 ~ tls[f423]::A))
11+
| ^ cannot access thread local static (DefId(0:6 ~ tls[317d]::A))
1212

1313
warning: skipping const checks
1414
|

Diff for: src/test/ui/generator/print/generator-print-verbose-1.stderr

+5-5
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ note: generator is not `Send` as this value is used across a yield
1212
--> $DIR/generator-print-verbose-1.rs:35:9
1313
|
1414
LL | let _non_send_gen = make_non_send_generator();
15-
| ------------- has type `Opaque(DefId(0:34 ~ generator_print_verbose_1[70c9]::make_non_send_generator::{opaque#0}), [])` which is not `Send`
15+
| ------------- has type `Opaque(DefId(0:34 ~ generator_print_verbose_1[317d]::make_non_send_generator::{opaque#0}), [])` which is not `Send`
1616
LL | yield;
1717
| ^^^^^ yield occurs here, with `_non_send_gen` maybe used later
1818
LL | };
@@ -30,10 +30,10 @@ LL | require_send(send_gen);
3030
= help: the trait `Sync` is not implemented for `RefCell<i32>`
3131
= note: required because of the requirements on the impl of `Send` for `Arc<RefCell<i32>>`
3232
= note: required because it appears within the type `[make_gen2<Arc<RefCell<i32>>>::{closure#0} upvar_tys=(Arc<RefCell<i32>>) {()}]`
33-
= note: required because it appears within the type `Opaque(DefId(0:39 ~ generator_print_verbose_1[70c9]::make_gen2::{opaque#0}), [std::sync::Arc<std::cell::RefCell<i32>>])`
34-
= note: required because it appears within the type `Opaque(DefId(0:42 ~ generator_print_verbose_1[70c9]::make_non_send_generator2::{opaque#0}), [])`
35-
= note: required because it appears within the type `{Opaque(DefId(0:42 ~ generator_print_verbose_1[70c9]::make_non_send_generator2::{opaque#0}), []), ()}`
36-
= note: required because it appears within the type `[test2::{closure#0} upvar_tys=() {Opaque(DefId(0:42 ~ generator_print_verbose_1[70c9]::make_non_send_generator2::{opaque#0}), []), ()}]`
33+
= note: required because it appears within the type `Opaque(DefId(0:39 ~ generator_print_verbose_1[317d]::make_gen2::{opaque#0}), [std::sync::Arc<std::cell::RefCell<i32>>])`
34+
= note: required because it appears within the type `Opaque(DefId(0:42 ~ generator_print_verbose_1[317d]::make_non_send_generator2::{opaque#0}), [])`
35+
= note: required because it appears within the type `{Opaque(DefId(0:42 ~ generator_print_verbose_1[317d]::make_non_send_generator2::{opaque#0}), []), ()}`
36+
= note: required because it appears within the type `[test2::{closure#0} upvar_tys=() {Opaque(DefId(0:42 ~ generator_print_verbose_1[317d]::make_non_send_generator2::{opaque#0}), []), ()}]`
3737

3838
error: aborting due to 2 previous errors
3939

Diff for: src/test/ui/lto-duplicate-symbols.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
warning: Linking globals named 'foo': symbol multiply defined!
22

3-
error: failed to load bc of "lto-duplicate-symbols2.lto_duplicate_symbols2.288b404e693a75b4-cgu.0.rcgu.o":
3+
error: failed to load bc of "lto-duplicate-symbols2.lto_duplicate_symbols2.3a1fbbbh-cgu.0.rcgu.o":
44

55
error: aborting due to previous error; 1 warning emitted
66

Original file line numberDiff line numberDiff line change
@@ -1,26 +1,26 @@
1-
error: lifetime parameter `'a` only used once
2-
--> $DIR/one-use-in-fn-argument-in-band.rs:11:10
1+
error: lifetime parameter `'b` only used once
2+
--> $DIR/one-use-in-fn-argument-in-band.rs:11:22
33
|
44
LL | fn a(x: &'a u32, y: &'b u32) {
5-
| ^^-
6-
| |
7-
| this lifetime is only used here
8-
| help: elide the single-use lifetime
5+
| ^^-
6+
| |
7+
| this lifetime is only used here
8+
| help: elide the single-use lifetime
99
|
1010
note: the lint level is defined here
1111
--> $DIR/one-use-in-fn-argument-in-band.rs:4:9
1212
|
1313
LL | #![deny(single_use_lifetimes)]
1414
| ^^^^^^^^^^^^^^^^^^^^
1515

16-
error: lifetime parameter `'b` only used once
17-
--> $DIR/one-use-in-fn-argument-in-band.rs:11:22
16+
error: lifetime parameter `'a` only used once
17+
--> $DIR/one-use-in-fn-argument-in-band.rs:11:10
1818
|
1919
LL | fn a(x: &'a u32, y: &'b u32) {
20-
| ^^-
21-
| |
22-
| this lifetime is only used here
23-
| help: elide the single-use lifetime
20+
| ^^-
21+
| |
22+
| this lifetime is only used here
23+
| help: elide the single-use lifetime
2424

2525
error: aborting due to 2 previous errors
2626

Diff for: src/test/ui/specialization/min_specialization/repeated_projection_type.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
error: cannot specialize on `Binder(ProjectionPredicate(ProjectionTy { substs: [V], item_def_id: DefId(0:6 ~ repeated_projection_type[b09c]::Id::This) }, (I,)), [])`
1+
error: cannot specialize on `Binder(ProjectionPredicate(ProjectionTy { substs: [V], item_def_id: DefId(0:6 ~ repeated_projection_type[317d]::Id::This) }, (I,)), [])`
22
--> $DIR/repeated_projection_type.rs:19:1
33
|
44
LL | / impl<I, V: Id<This = (I,)>> X for V {

Diff for: src/test/ui/symbol-names/basic.legacy.stderr

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
error: symbol-name(_ZN5basic4main17hd75b915511563828E)
1+
error: symbol-name(_ZN5basic4main17h6c535bbea2051f85E)
22
--> $DIR/basic.rs:8:1
33
|
44
LL | #[rustc_symbol_name]
55
| ^^^^^^^^^^^^^^^^^^^^
66

7-
error: demangling(basic::main::hd75b915511563828)
7+
error: demangling(basic::main::h6c535bbea2051f85)
88
--> $DIR/basic.rs:8:1
99
|
1010
LL | #[rustc_symbol_name]

Diff for: src/test/ui/symbol-names/basic.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
//[legacy]~^ ERROR symbol-name(_ZN5basic4main
1010
//[legacy]~| ERROR demangling(basic::main
1111
//[legacy]~| ERROR demangling-alt(basic::main)
12-
//[v0]~^^^^ ERROR symbol-name(_RNvCsj6j3mjPNGKx_5basic4main)
13-
//[v0]~| ERROR demangling(basic[de7d5b6b69c71f37]::main)
12+
//[v0]~^^^^ ERROR symbol-name(_RNvCs21hi0yVfW1J_5basic4main)
13+
//[v0]~| ERROR demangling(basic[17891616a171812d]::main)
1414
//[v0]~| ERROR demangling-alt(basic::main)
1515
#[rustc_def_path]
1616
//[legacy]~^ ERROR def-path(main)

Diff for: src/test/ui/symbol-names/basic.v0.stderr

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
error: symbol-name(_RNvCsj6j3mjPNGKx_5basic4main)
1+
error: symbol-name(_RNvCs21hi0yVfW1J_5basic4main)
22
--> $DIR/basic.rs:8:1
33
|
44
LL | #[rustc_symbol_name]
55
| ^^^^^^^^^^^^^^^^^^^^
66

7-
error: demangling(basic[de7d5b6b69c71f37]::main)
7+
error: demangling(basic[17891616a171812d]::main)
88
--> $DIR/basic.rs:8:1
99
|
1010
LL | #[rustc_symbol_name]

Diff for: src/test/ui/symbol-names/const-generics-demangling.rs

+8-8
Original file line numberDiff line numberDiff line change
@@ -5,32 +5,32 @@
55
pub struct Unsigned<const F: u8>;
66

77
#[rustc_symbol_name]
8-
//~^ ERROR symbol-name(_RMCsaP8qXevlYG3_25const_generics_demanglingINtB0_8UnsignedKhb_E)
9-
//~| ERROR demangling(<const_generics_demangling[7e153590edc26969]::Unsigned<11: u8>>)
8+
//~^ ERROR symbol-name(_RMCs21hi0yVfW1J_25const_generics_demanglingINtB0_8UnsignedKhb_E)
9+
//~| ERROR demangling(<const_generics_demangling[17891616a171812d]::Unsigned<11: u8>>)
1010
//~| ERROR demangling-alt(<const_generics_demangling::Unsigned<11>>)
1111
impl Unsigned<11> {}
1212

1313
pub struct Signed<const F: i16>;
1414

1515
#[rustc_symbol_name]
16-
//~^ ERROR symbol-name(_RMs_CsaP8qXevlYG3_25const_generics_demanglingINtB2_6SignedKsn98_E)
17-
//~| ERROR demangling(<const_generics_demangling[7e153590edc26969]::Signed<-152: i16>>)
16+
//~^ ERROR symbol-name(_RMs_Cs21hi0yVfW1J_25const_generics_demanglingINtB2_6SignedKsn98_E)
17+
//~| ERROR demangling(<const_generics_demangling[17891616a171812d]::Signed<-152: i16>>)
1818
//~| ERROR demangling-alt(<const_generics_demangling::Signed<-152>>)
1919
impl Signed<-152> {}
2020

2121
pub struct Bool<const F: bool>;
2222

2323
#[rustc_symbol_name]
24-
//~^ ERROR symbol-name(_RMs0_CsaP8qXevlYG3_25const_generics_demanglingINtB3_4BoolKb1_E)
25-
//~| ERROR demangling(<const_generics_demangling[7e153590edc26969]::Bool<true: bool>>)
24+
//~^ ERROR symbol-name(_RMs0_Cs21hi0yVfW1J_25const_generics_demanglingINtB3_4BoolKb1_E)
25+
//~| ERROR demangling(<const_generics_demangling[17891616a171812d]::Bool<true: bool>>)
2626
//~| ERROR demangling-alt(<const_generics_demangling::Bool<true>>)
2727
impl Bool<true> {}
2828

2929
pub struct Char<const F: char>;
3030

3131
#[rustc_symbol_name]
32-
//~^ ERROR symbol-name(_RMs1_CsaP8qXevlYG3_25const_generics_demanglingINtB3_4CharKc2202_E)
33-
//~| ERROR demangling(<const_generics_demangling[7e153590edc26969]::Char<'∂': char>>)
32+
//~^ ERROR symbol-name(_RMs1_Cs21hi0yVfW1J_25const_generics_demanglingINtB3_4CharKc2202_E)
33+
//~| ERROR demangling(<const_generics_demangling[17891616a171812d]::Char<'∂': char>>)
3434
//~| ERROR demangling-alt(<const_generics_demangling::Char<'∂'>>)
3535
impl Char<'∂'> {}
3636

Diff for: src/test/ui/symbol-names/const-generics-demangling.stderr

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
error: symbol-name(_RMCsaP8qXevlYG3_25const_generics_demanglingINtB0_8UnsignedKhb_E)
1+
error: symbol-name(_RMCs21hi0yVfW1J_25const_generics_demanglingINtB0_8UnsignedKhb_E)
22
--> $DIR/const-generics-demangling.rs:7:1
33
|
44
LL | #[rustc_symbol_name]
55
| ^^^^^^^^^^^^^^^^^^^^
66

7-
error: demangling(<const_generics_demangling[7e153590edc26969]::Unsigned<11: u8>>)
7+
error: demangling(<const_generics_demangling[17891616a171812d]::Unsigned<11: u8>>)
88
--> $DIR/const-generics-demangling.rs:7:1
99
|
1010
LL | #[rustc_symbol_name]
@@ -16,13 +16,13 @@ error: demangling-alt(<const_generics_demangling::Unsigned<11>>)
1616
LL | #[rustc_symbol_name]
1717
| ^^^^^^^^^^^^^^^^^^^^
1818

19-
error: symbol-name(_RMs_CsaP8qXevlYG3_25const_generics_demanglingINtB2_6SignedKsn98_E)
19+
error: symbol-name(_RMs_Cs21hi0yVfW1J_25const_generics_demanglingINtB2_6SignedKsn98_E)
2020
--> $DIR/const-generics-demangling.rs:15:1
2121
|
2222
LL | #[rustc_symbol_name]
2323
| ^^^^^^^^^^^^^^^^^^^^
2424

25-
error: demangling(<const_generics_demangling[7e153590edc26969]::Signed<-152: i16>>)
25+
error: demangling(<const_generics_demangling[17891616a171812d]::Signed<-152: i16>>)
2626
--> $DIR/const-generics-demangling.rs:15:1
2727
|
2828
LL | #[rustc_symbol_name]
@@ -34,13 +34,13 @@ error: demangling-alt(<const_generics_demangling::Signed<-152>>)
3434
LL | #[rustc_symbol_name]
3535
| ^^^^^^^^^^^^^^^^^^^^
3636

37-
error: symbol-name(_RMs0_CsaP8qXevlYG3_25const_generics_demanglingINtB3_4BoolKb1_E)
37+
error: symbol-name(_RMs0_Cs21hi0yVfW1J_25const_generics_demanglingINtB3_4BoolKb1_E)
3838
--> $DIR/const-generics-demangling.rs:23:1
3939
|
4040
LL | #[rustc_symbol_name]
4141
| ^^^^^^^^^^^^^^^^^^^^
4242

43-
error: demangling(<const_generics_demangling[7e153590edc26969]::Bool<true: bool>>)
43+
error: demangling(<const_generics_demangling[17891616a171812d]::Bool<true: bool>>)
4444
--> $DIR/const-generics-demangling.rs:23:1
4545
|
4646
LL | #[rustc_symbol_name]
@@ -52,13 +52,13 @@ error: demangling-alt(<const_generics_demangling::Bool<true>>)
5252
LL | #[rustc_symbol_name]
5353
| ^^^^^^^^^^^^^^^^^^^^
5454

55-
error: symbol-name(_RMs1_CsaP8qXevlYG3_25const_generics_demanglingINtB3_4CharKc2202_E)
55+
error: symbol-name(_RMs1_Cs21hi0yVfW1J_25const_generics_demanglingINtB3_4CharKc2202_E)
5656
--> $DIR/const-generics-demangling.rs:31:1
5757
|
5858
LL | #[rustc_symbol_name]
5959
| ^^^^^^^^^^^^^^^^^^^^
6060

61-
error: demangling(<const_generics_demangling[7e153590edc26969]::Char<'∂': char>>)
61+
error: demangling(<const_generics_demangling[17891616a171812d]::Char<'∂': char>>)
6262
--> $DIR/const-generics-demangling.rs:31:1
6363
|
6464
LL | #[rustc_symbol_name]

Diff for: src/test/ui/symbol-names/impl1.rs

+6-6
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ mod foo {
1515
//[legacy]~^ ERROR symbol-name(_ZN5impl13foo3Foo3bar
1616
//[legacy]~| ERROR demangling(impl1::foo::Foo::bar
1717
//[legacy]~| ERROR demangling-alt(impl1::foo::Foo::bar)
18-
//[v0]~^^^^ ERROR symbol-name(_RNvMNtCs2qSCrjELJET_5impl13fooNtB2_3Foo3bar)
19-
//[v0]~| ERROR demangling(<impl1[1c5860ab79c9e305]::foo::Foo>::bar)
18+
//[v0]~^^^^ ERROR symbol-name(_RNvMNtCs21hi0yVfW1J_5impl13fooNtB2_3Foo3bar)
19+
//[v0]~| ERROR demangling(<impl1[17891616a171812d]::foo::Foo>::bar)
2020
//[v0]~| ERROR demangling-alt(<impl1::foo::Foo>::bar)
2121
#[rustc_def_path]
2222
//[legacy]~^ ERROR def-path(foo::Foo::bar)
@@ -33,8 +33,8 @@ mod bar {
3333
//[legacy]~^ ERROR symbol-name(_ZN5impl13bar33_$LT$impl$u20$impl1..foo..Foo$GT$3baz
3434
//[legacy]~| ERROR demangling(impl1::bar::<impl impl1::foo::Foo>::baz
3535
//[legacy]~| ERROR demangling-alt(impl1::bar::<impl impl1::foo::Foo>::baz)
36-
//[v0]~^^^^ ERROR symbol-name(_RNvMNtCs2qSCrjELJET_5impl13barNtNtB4_3foo3Foo3baz)
37-
//[v0]~| ERROR demangling(<impl1[1c5860ab79c9e305]::foo::Foo>::baz)
36+
//[v0]~^^^^ ERROR symbol-name(_RNvMNtCs21hi0yVfW1J_5impl13barNtNtB4_3foo3Foo3baz)
37+
//[v0]~| ERROR demangling(<impl1[17891616a171812d]::foo::Foo>::baz)
3838
//[v0]~| ERROR demangling-alt(<impl1::foo::Foo>::baz)
3939
#[rustc_def_path]
4040
//[legacy]~^ ERROR def-path(bar::<impl foo::Foo>::baz)
@@ -63,8 +63,8 @@ fn main() {
6363
//[legacy]~^ ERROR symbol-name(_ZN209_$LT$$u5b$$RF$dyn$u20$impl1..Foo$u2b$Assoc$u20$$u3d$$u20$extern$u20$$u22$C$u22$$u20$fn$LP$$RF$u8$C$$u20$...$RP$$u2b$impl1..AutoTrait$u3b$$u20$3$u5d$$u20$as$u20$impl1..main..$u7b$$u7b$closure$u7d$$u7d$..Bar$GT$6method
6464
//[legacy]~| ERROR demangling(<[&dyn impl1::Foo+Assoc = extern "C" fn(&u8, ::.)+impl1::AutoTrait; 3] as impl1::main::{{closure}}::Bar>::method
6565
//[legacy]~| ERROR demangling-alt(<[&dyn impl1::Foo+Assoc = extern "C" fn(&u8, ::.)+impl1::AutoTrait; 3] as impl1::main::{{closure}}::Bar>::method)
66-
//[v0]~^^^^ ERROR symbol-name(_RNvXNCNvCs2qSCrjELJET_5impl14mains_0ARDNtB6_3Foop5AssocFG_KCRL0_hvEuNtB6_9AutoTraitEL_j3_NtB2_3Bar6method)
67-
//[v0]~| ERROR demangling(<[&dyn impl1[1c5860ab79c9e305]::Foo<Assoc = for<'a> extern "C" fn(&'a u8, ...)> + impl1[1c5860ab79c9e305]::AutoTrait; 3: usize] as impl1[1c5860ab79c9e305]::main::{closure#1}::Bar>::method)
66+
//[v0]~^^^^ ERROR symbol-name(_RNvXNCNvCs21hi0yVfW1J_5impl14mains_0ARDNtB6_3Foop5AssocFG_KCRL0_hvEuNtB6_9AutoTraitEL_j3_NtB2_3Bar6method)
67+
//[v0]~| ERROR demangling(<[&dyn impl1[17891616a171812d]::Foo<Assoc = for<'a> extern "C" fn(&'a u8, ...)> + impl1[17891616a171812d]::AutoTrait; 3: usize] as impl1[17891616a171812d]::main::{closure#1}::Bar>::method)
6868
//[v0]~| ERROR demangling-alt(<[&dyn impl1::Foo<Assoc = for<'a> extern "C" fn(&'a u8, ...)> + impl1::AutoTrait; 3] as impl1::main::{closure#1}::Bar>::method)
6969
#[rustc_def_path]
7070
//[legacy]~^ ERROR def-path(<[&dyn Foo<Assoc = for<'r> extern "C" fn(&'r u8, ...)> + AutoTrait; 3] as main::{closure#1}::Bar>::method)

Diff for: src/test/ui/symbol-names/impl1.v0.stderr

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
error: symbol-name(_RNvMNtCs2qSCrjELJET_5impl13fooNtB2_3Foo3bar)
1+
error: symbol-name(_RNvMNtCs21hi0yVfW1J_5impl13fooNtB2_3Foo3bar)
22
--> $DIR/impl1.rs:14:9
33
|
44
LL | #[rustc_symbol_name]
55
| ^^^^^^^^^^^^^^^^^^^^
66

7-
error: demangling(<impl1[1c5860ab79c9e305]::foo::Foo>::bar)
7+
error: demangling(<impl1[17891616a171812d]::foo::Foo>::bar)
88
--> $DIR/impl1.rs:14:9
99
|
1010
LL | #[rustc_symbol_name]
@@ -22,13 +22,13 @@ error: def-path(foo::Foo::bar)
2222
LL | #[rustc_def_path]
2323
| ^^^^^^^^^^^^^^^^^
2424

25-
error: symbol-name(_RNvMNtCs2qSCrjELJET_5impl13barNtNtB4_3foo3Foo3baz)
25+
error: symbol-name(_RNvMNtCs21hi0yVfW1J_5impl13barNtNtB4_3foo3Foo3baz)
2626
--> $DIR/impl1.rs:32:9
2727
|
2828
LL | #[rustc_symbol_name]
2929
| ^^^^^^^^^^^^^^^^^^^^
3030

31-
error: demangling(<impl1[1c5860ab79c9e305]::foo::Foo>::baz)
31+
error: demangling(<impl1[17891616a171812d]::foo::Foo>::baz)
3232
--> $DIR/impl1.rs:32:9
3333
|
3434
LL | #[rustc_symbol_name]
@@ -46,13 +46,13 @@ error: def-path(bar::<impl foo::Foo>::baz)
4646
LL | #[rustc_def_path]
4747
| ^^^^^^^^^^^^^^^^^
4848

49-
error: symbol-name(_RNvXNCNvCs2qSCrjELJET_5impl14mains_0ARDNtB6_3Foop5AssocFG_KCRL0_hvEuNtB6_9AutoTraitEL_j3_NtB2_3Bar6method)
49+
error: symbol-name(_RNvXNCNvCs21hi0yVfW1J_5impl14mains_0ARDNtB6_3Foop5AssocFG_KCRL0_hvEuNtB6_9AutoTraitEL_j3_NtB2_3Bar6method)
5050
--> $DIR/impl1.rs:62:13
5151
|
5252
LL | #[rustc_symbol_name]
5353
| ^^^^^^^^^^^^^^^^^^^^
5454

55-
error: demangling(<[&dyn impl1[1c5860ab79c9e305]::Foo<Assoc = for<'a> extern "C" fn(&'a u8, ...)> + impl1[1c5860ab79c9e305]::AutoTrait; 3: usize] as impl1[1c5860ab79c9e305]::main::{closure#1}::Bar>::method)
55+
error: demangling(<[&dyn impl1[17891616a171812d]::Foo<Assoc = for<'a> extern "C" fn(&'a u8, ...)> + impl1[17891616a171812d]::AutoTrait; 3: usize] as impl1[17891616a171812d]::main::{closure#1}::Bar>::method)
5656
--> $DIR/impl1.rs:62:13
5757
|
5858
LL | #[rustc_symbol_name]

Diff for: src/test/ui/symbol-names/issue-60925.legacy.stderr

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
error: symbol-name(_ZN11issue_609253foo37Foo$LT$issue_60925..llv$u6d$..Foo$GT$3foo17h18eaa05e22e59176E)
1+
error: symbol-name(_ZN11issue_609253foo37Foo$LT$issue_60925..llv$u6d$..Foo$GT$3foo17h6244e5288326926aE)
22
--> $DIR/issue-60925.rs:21:9
33
|
44
LL | #[rustc_symbol_name]
55
| ^^^^^^^^^^^^^^^^^^^^
66

7-
error: demangling(issue_60925::foo::Foo<issue_60925::llvm::Foo>::foo::h18eaa05e22e59176)
7+
error: demangling(issue_60925::foo::Foo<issue_60925::llvm::Foo>::foo::h6244e5288326926a)
88
--> $DIR/issue-60925.rs:21:9
99
|
1010
LL | #[rustc_symbol_name]

Diff for: src/test/ui/symbol-names/issue-60925.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ mod foo {
2222
//[legacy]~^ ERROR symbol-name(_ZN11issue_609253foo37Foo$LT$issue_60925..llv$u6d$..Foo$GT$3foo
2323
//[legacy]~| ERROR demangling(issue_60925::foo::Foo<issue_60925::llvm::Foo>::foo
2424
//[legacy]~| ERROR demangling-alt(issue_60925::foo::Foo<issue_60925::llvm::Foo>::foo)
25-
//[v0]~^^^^ ERROR symbol-name(_RNvMNtCs8dUWfuENynB_11issue_609253fooINtB2_3FooNtNtB4_4llvm3FooE3foo)
26-
//[v0]~| ERROR demangling(<issue_60925[5fcbb46c6fac4139]::foo::Foo<issue_60925[5fcbb46c6fac4139]::llvm::Foo>>::foo)
25+
//[v0]~^^^^ ERROR symbol-name(_RNvMNtCs21hi0yVfW1J_11issue_609253fooINtB2_3FooNtNtB4_4llvm3FooE3foo)
26+
//[v0]~| ERROR demangling(<issue_60925[17891616a171812d]::foo::Foo<issue_60925[17891616a171812d]::llvm::Foo>>::foo)
2727
//[v0]~| ERROR demangling-alt(<issue_60925::foo::Foo<issue_60925::llvm::Foo>>::foo)
2828
pub(crate) fn foo() {
2929
for _ in 0..0 {

Diff for: src/test/ui/symbol-names/issue-60925.v0.stderr

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
error: symbol-name(_RNvMNtCs8dUWfuENynB_11issue_609253fooINtB2_3FooNtNtB4_4llvm3FooE3foo)
1+
error: symbol-name(_RNvMNtCs21hi0yVfW1J_11issue_609253fooINtB2_3FooNtNtB4_4llvm3FooE3foo)
22
--> $DIR/issue-60925.rs:21:9
33
|
44
LL | #[rustc_symbol_name]
55
| ^^^^^^^^^^^^^^^^^^^^
66

7-
error: demangling(<issue_60925[5fcbb46c6fac4139]::foo::Foo<issue_60925[5fcbb46c6fac4139]::llvm::Foo>>::foo)
7+
error: demangling(<issue_60925[17891616a171812d]::foo::Foo<issue_60925[17891616a171812d]::llvm::Foo>>::foo)
88
--> $DIR/issue-60925.rs:21:9
99
|
1010
LL | #[rustc_symbol_name]

Diff for: src/test/ui/symbol-names/issue-75326.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@ where
4242
//[legacy]~^ ERROR symbol-name(_ZN72_$LT$issue_75326..Foo$LT$I$C$E$GT$$u20$as$u20$issue_75326..Iterator2$GT$4next
4343
//[legacy]~| ERROR demangling(<issue_75326::Foo<I,E> as issue_75326::Iterator2>::next
4444
//[legacy]~| ERROR demangling-alt(<issue_75326::Foo<I,E> as issue_75326::Iterator2>::next)
45-
//[v0]~^^^^ ERROR symbol-name(_RNvXINICsiMBouZZ1iuD_11issue_75326s_0pppEINtB5_3FooppENtB5_9Iterator24nextB5_)
46-
//[v0]~| ERROR demangling(<issue_75326[dac9b7624645f95d]::Foo<_, _> as issue_75326[dac9b7624645f95d]::Iterator2>::next)
45+
//[v0]~^^^^ ERROR symbol-name(_RNvXINICs21hi0yVfW1J_11issue_75326s_0pppEINtB5_3FooppENtB5_9Iterator24nextB5_)
46+
//[v0]~| ERROR demangling(<issue_75326[17891616a171812d]::Foo<_, _> as issue_75326[17891616a171812d]::Iterator2>::next)
4747
//[v0]~| ERROR demangling-alt(<issue_75326::Foo<_, _> as issue_75326::Iterator2>::next)
4848
fn next(&mut self) -> Option<Self::Item> {
4949
self.find(|_| true)

Diff for: src/test/ui/symbol-names/issue-75326.v0.stderr

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
error: symbol-name(_RNvXINICsiMBouZZ1iuD_11issue_75326s_0pppEINtB5_3FooppENtB5_9Iterator24nextB5_)
1+
error: symbol-name(_RNvXINICs21hi0yVfW1J_11issue_75326s_0pppEINtB5_3FooppENtB5_9Iterator24nextB5_)
22
--> $DIR/issue-75326.rs:41:5
33
|
44
LL | #[rustc_symbol_name]
55
| ^^^^^^^^^^^^^^^^^^^^
66

7-
error: demangling(<issue_75326[dac9b7624645f95d]::Foo<_, _> as issue_75326[dac9b7624645f95d]::Iterator2>::next)
7+
error: demangling(<issue_75326[17891616a171812d]::Foo<_, _> as issue_75326[17891616a171812d]::Iterator2>::next)
88
--> $DIR/issue-75326.rs:41:5
99
|
1010
LL | #[rustc_symbol_name]

0 commit comments

Comments
 (0)