Skip to content

Commit 6a4878f

Browse files
michaelwoeristermichaelwoerister
committed
Update UI tests affected by changed DefPathHash value construction.
1 parent 22d489b commit 6a4878f

15 files changed

+94
-96
lines changed

‎src/test/ui/single-use-lifetime/one-use-in-fn-argument-in-band.stderr

+12-12
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

‎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(_ZN5basic4main17h4272b3de5e868f5aE)
1+
error: symbol-name(_ZN5basic4main17hfcf1daab33c43a6aE)
22
--> $DIR/basic.rs:8:1
33
|
44
LL | #[rustc_symbol_name]
55
| ^^^^^^^^^^^^^^^^^^^^
66

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

‎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(_RNvCs4fqI2P2rA04_5basic4main)
13-
//[v0]~| ERROR demangling(basic[317d481089b8c8fe]::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)

‎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(_RNvCs4fqI2P2rA04_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[317d481089b8c8fe]::main)
7+
error: demangling(basic[17891616a171812d]::main)
88
--> $DIR/basic.rs:8:1
99
|
1010
LL | #[rustc_symbol_name]

‎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(_RMCs4fqI2P2rA04_25const_generics_demanglingINtB0_8UnsignedKhb_E)
9-
//~| ERROR demangling(<const_generics_demangling[317d481089b8c8fe]::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_Cs4fqI2P2rA04_25const_generics_demanglingINtB2_6SignedKsn98_E)
17-
//~| ERROR demangling(<const_generics_demangling[317d481089b8c8fe]::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_Cs4fqI2P2rA04_25const_generics_demanglingINtB3_4BoolKb1_E)
25-
//~| ERROR demangling(<const_generics_demangling[317d481089b8c8fe]::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_Cs4fqI2P2rA04_25const_generics_demanglingINtB3_4CharKc2202_E)
33-
//~| ERROR demangling(<const_generics_demangling[317d481089b8c8fe]::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

‎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(_RMCs4fqI2P2rA04_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[317d481089b8c8fe]::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_Cs4fqI2P2rA04_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[317d481089b8c8fe]::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_Cs4fqI2P2rA04_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[317d481089b8c8fe]::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_Cs4fqI2P2rA04_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[317d481089b8c8fe]::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]

‎src/test/ui/symbol-names/impl1.legacy.stderr

+18-18
Original file line numberDiff line numberDiff line change
@@ -1,71 +1,71 @@
1-
error: symbol-name(_ZN5impl13foo3Foo3bar17ha318160f105e638cE)
2-
--> $DIR/impl1.rs:16:9
1+
error: symbol-name(_ZN5impl13foo3Foo3bar17<SYMBOL_HASH>)
2+
--> $DIR/impl1.rs:15:9
33
|
44
LL | #[rustc_symbol_name]
55
| ^^^^^^^^^^^^^^^^^^^^
66

7-
error: demangling(impl1::foo::Foo::bar::ha318160f105e638c)
8-
--> $DIR/impl1.rs:16:9
7+
error: demangling(impl1::foo::Foo::bar::<SYMBOL_HASH>)
8+
--> $DIR/impl1.rs:15:9
99
|
1010
LL | #[rustc_symbol_name]
1111
| ^^^^^^^^^^^^^^^^^^^^
1212

1313
error: demangling-alt(impl1::foo::Foo::bar)
14-
--> $DIR/impl1.rs:16:9
14+
--> $DIR/impl1.rs:15:9
1515
|
1616
LL | #[rustc_symbol_name]
1717
| ^^^^^^^^^^^^^^^^^^^^
1818

1919
error: def-path(foo::Foo::bar)
20-
--> $DIR/impl1.rs:23:9
20+
--> $DIR/impl1.rs:22:9
2121
|
2222
LL | #[rustc_def_path]
2323
| ^^^^^^^^^^^^^^^^^
2424

25-
error: symbol-name(_ZN5impl13bar33_$LT$impl$u20$impl1..foo..Foo$GT$3baz17h6c2dbab6e66f9fa3E)
26-
--> $DIR/impl1.rs:34:9
25+
error: symbol-name(_ZN5impl13bar33_$LT$impl$u20$impl1..foo..Foo$GT$3baz17<SYMBOL_HASH>)
26+
--> $DIR/impl1.rs:33:9
2727
|
2828
LL | #[rustc_symbol_name]
2929
| ^^^^^^^^^^^^^^^^^^^^
3030

31-
error: demangling(impl1::bar::<impl impl1::foo::Foo>::baz::h6c2dbab6e66f9fa3)
32-
--> $DIR/impl1.rs:34:9
31+
error: demangling(impl1::bar::<impl impl1::foo::Foo>::baz::<SYMBOL_HASH>)
32+
--> $DIR/impl1.rs:33:9
3333
|
3434
LL | #[rustc_symbol_name]
3535
| ^^^^^^^^^^^^^^^^^^^^
3636

3737
error: demangling-alt(impl1::bar::<impl impl1::foo::Foo>::baz)
38-
--> $DIR/impl1.rs:34:9
38+
--> $DIR/impl1.rs:33:9
3939
|
4040
LL | #[rustc_symbol_name]
4141
| ^^^^^^^^^^^^^^^^^^^^
4242

4343
error: def-path(bar::<impl foo::Foo>::baz)
44-
--> $DIR/impl1.rs:41:9
44+
--> $DIR/impl1.rs:40:9
4545
|
4646
LL | #[rustc_def_path]
4747
| ^^^^^^^^^^^^^^^^^
4848

49-
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$6method17SYMBOL_HASHE)
50-
--> $DIR/impl1.rs:64:13
49+
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$6method17<SYMBOL_HASH>)
50+
--> $DIR/impl1.rs:63:13
5151
|
5252
LL | #[rustc_symbol_name]
5353
| ^^^^^^^^^^^^^^^^^^^^
5454

55-
error: demangling(<[&dyn impl1::Foo+Assoc = extern "C" fn(&u8, ::.)+impl1::AutoTrait; 3] as impl1::main::{{closure}}::Bar>::method::SYMBOL_HASH)
56-
--> $DIR/impl1.rs:64:13
55+
error: demangling(<[&dyn impl1::Foo+Assoc = extern "C" fn(&u8, ::.)+impl1::AutoTrait; 3] as impl1::main::{{closure}}::Bar>::method::<SYMBOL_HASH>)
56+
--> $DIR/impl1.rs:63:13
5757
|
5858
LL | #[rustc_symbol_name]
5959
| ^^^^^^^^^^^^^^^^^^^^
6060

6161
error: demangling-alt(<[&dyn impl1::Foo+Assoc = extern "C" fn(&u8, ::.)+impl1::AutoTrait; 3] as impl1::main::{{closure}}::Bar>::method)
62-
--> $DIR/impl1.rs:64:13
62+
--> $DIR/impl1.rs:63:13
6363
|
6464
LL | #[rustc_symbol_name]
6565
| ^^^^^^^^^^^^^^^^^^^^
6666

6767
error: def-path(<[&dyn Foo<Assoc = for<'r> extern "C" fn(&'r u8, ...)> + AutoTrait; 3] as main::{closure#1}::Bar>::method)
68-
--> $DIR/impl1.rs:71:13
68+
--> $DIR/impl1.rs:70:13
6969
|
7070
LL | #[rustc_def_path]
7171
| ^^^^^^^^^^^^^^^^^

‎src/test/ui/symbol-names/impl1.rs

+7-8
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@
33
// revisions: legacy v0
44
//[legacy]compile-flags: -Z symbol-mangling-version=legacy
55
//[v0]compile-flags: -Z symbol-mangling-version=v0
6-
//[legacy]normalize-stderr-32bit: "hee444285569b39c2" -> "SYMBOL_HASH"
7-
//[legacy]normalize-stderr-64bit: "h310ea0259fc3d32d" -> "SYMBOL_HASH"
6+
//[legacy]normalize-stderr-test: "h[\w]{16}E?\)" -> "<SYMBOL_HASH>)"
87

98
#![feature(auto_traits, rustc_attrs)]
109
#![allow(dead_code)]
@@ -17,8 +16,8 @@ mod foo {
1716
//[legacy]~^ ERROR symbol-name(_ZN5impl13foo3Foo3bar
1817
//[legacy]~| ERROR demangling(impl1::foo::Foo::bar
1918
//[legacy]~| ERROR demangling-alt(impl1::foo::Foo::bar)
20-
//[v0]~^^^^ ERROR symbol-name(_RNvMNtCs4fqI2P2rA04_5impl13fooNtB2_3Foo3bar)
21-
//[v0]~| ERROR demangling(<impl1[317d481089b8c8fe]::foo::Foo>::bar)
19+
//[v0]~^^^^ ERROR symbol-name(_RNvMNtCs21hi0yVfW1J_5impl13fooNtB2_3Foo3bar)
20+
//[v0]~| ERROR demangling(<impl1[17891616a171812d]::foo::Foo>::bar)
2221
//[v0]~| ERROR demangling-alt(<impl1::foo::Foo>::bar)
2322
#[rustc_def_path]
2423
//[legacy]~^ ERROR def-path(foo::Foo::bar)
@@ -35,8 +34,8 @@ mod bar {
3534
//[legacy]~^ ERROR symbol-name(_ZN5impl13bar33_$LT$impl$u20$impl1..foo..Foo$GT$3baz
3635
//[legacy]~| ERROR demangling(impl1::bar::<impl impl1::foo::Foo>::baz
3736
//[legacy]~| ERROR demangling-alt(impl1::bar::<impl impl1::foo::Foo>::baz)
38-
//[v0]~^^^^ ERROR symbol-name(_RNvMNtCs4fqI2P2rA04_5impl13barNtNtB4_3foo3Foo3baz)
39-
//[v0]~| ERROR demangling(<impl1[317d481089b8c8fe]::foo::Foo>::baz)
37+
//[v0]~^^^^ ERROR symbol-name(_RNvMNtCs21hi0yVfW1J_5impl13barNtNtB4_3foo3Foo3baz)
38+
//[v0]~| ERROR demangling(<impl1[17891616a171812d]::foo::Foo>::baz)
4039
//[v0]~| ERROR demangling-alt(<impl1::foo::Foo>::baz)
4140
#[rustc_def_path]
4241
//[legacy]~^ ERROR def-path(bar::<impl foo::Foo>::baz)
@@ -65,8 +64,8 @@ fn main() {
6564
//[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
6665
//[legacy]~| ERROR demangling(<[&dyn impl1::Foo+Assoc = extern "C" fn(&u8, ::.)+impl1::AutoTrait; 3] as impl1::main::{{closure}}::Bar>::method
6766
//[legacy]~| ERROR demangling-alt(<[&dyn impl1::Foo+Assoc = extern "C" fn(&u8, ::.)+impl1::AutoTrait; 3] as impl1::main::{{closure}}::Bar>::method)
68-
//[v0]~^^^^ ERROR symbol-name(_RNvXNCNvCs4fqI2P2rA04_5impl14mains_0ARDNtB6_3Foop5AssocFG_KCRL0_hvEuNtB6_9AutoTraitEL_j3_NtB2_3Bar6method)
69-
//[v0]~| ERROR demangling(<[&dyn impl1[317d481089b8c8fe]::Foo<Assoc = for<'a> extern "C" fn(&'a u8, ...)> + impl1[317d481089b8c8fe]::AutoTrait; 3: usize] as impl1[317d481089b8c8fe]::main::{closure#1}::Bar>::method)
67+
//[v0]~^^^^ ERROR symbol-name(_RNvXNCNvCs21hi0yVfW1J_5impl14mains_0ARDNtB6_3Foop5AssocFG_KCRL0_hvEuNtB6_9AutoTraitEL_j3_NtB2_3Bar6method)
68+
//[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)
7069
//[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)
7170
#[rustc_def_path]
7271
//[legacy]~^ ERROR def-path(<[&dyn Foo<Assoc = for<'r> extern "C" fn(&'r u8, ...)> + AutoTrait; 3] as main::{closure#1}::Bar>::method)

0 commit comments

Comments
 (0)