Skip to content

Commit 94ece5e

Browse files
committed
[AVR] Re-bless the 'test/ui/symbol-names' tests
Adding a new ABI changes the hashes of all previous ABIs. Fix suggested by @shepmaster in #69478 (comment).
1 parent 737c342 commit 94ece5e

File tree

5 files changed

+15
-9
lines changed

5 files changed

+15
-9
lines changed

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

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

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

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

7-
error: demangling(impl1::foo::Foo::bar::h92cf46db76791039)
7+
error: demangling(impl1::foo::Foo::bar::hf9d7d0e61617a4b8)
88
--> $DIR/impl1.rs:16: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(_ZN5impl13bar33_$LT$impl$u20$impl1..foo..Foo$GT$3baz17h90c4a800b1aa0df0E)
25+
error: symbol-name(_ZN5impl13bar33_$LT$impl$u20$impl1..foo..Foo$GT$3baz17h6435cd4293f0ad82E)
2626
--> $DIR/impl1.rs:34:9
2727
|
2828
LL | #[rustc_symbol_name]
2929
| ^^^^^^^^^^^^^^^^^^^^
3030

31-
error: demangling(impl1::bar::<impl impl1::foo::Foo>::baz::h90c4a800b1aa0df0)
31+
error: demangling(impl1::bar::<impl impl1::foo::Foo>::baz::h6435cd4293f0ad82)
3232
--> $DIR/impl1.rs:34:9
3333
|
3434
LL | #[rustc_symbol_name]

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
//[legacy]compile-flags: -Z symbol-mangling-version=legacy
55
//[v0]compile-flags: -Z symbol-mangling-version=v0
66
//[legacy]normalize-stderr-32bit: "h5ef5dfc14aeecbfc" -> "SYMBOL_HASH"
7-
//[legacy]normalize-stderr-64bit: "h9e54d216f70fcbc5" -> "SYMBOL_HASH"
7+
//[legacy]normalize-stderr-64bit: "hd9e82dc29c74d643" -> "SYMBOL_HASH"
88

99
#![feature(optin_builtin_traits, rustc_attrs)]
1010
#![allow(dead_code)]

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$3foo17hc86312d25b60f6eeE)
1+
error: symbol-name(_ZN11issue_609253foo37Foo$LT$issue_60925..llv$u6d$..Foo$GT$3foo17h91943b9c102410e4E)
22
--> $DIR/issue-60925.rs:22:9
33
|
44
LL | #[rustc_symbol_name]
55
| ^^^^^^^^^^^^^^^^^^^^
66

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

src/tools/compiletest/src/header/tests.rs

+6
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,12 @@ fn test_parse_normalization_string() {
2727
let first = parse_normalization_string(&mut s);
2828
assert_eq!(first, Some("something (32 bits)".to_owned()));
2929
assert_eq!(s, " -> \"something ($WORD bits).");
30+
31+
// Nothing to normalize (No quotes, 16-bit)
32+
let mut s = "normalize-stderr-16bit: something (16 bits) -> something ($WORD bits).";
33+
let first = parse_normalization_string(&mut s);
34+
assert_eq!(first, None);
35+
assert_eq!(s, r#"normalize-stderr-16bit: something (16 bits) -> something ($WORD bits)."#);
3036
}
3137

3238
fn config() -> Config {

0 commit comments

Comments
 (0)