Skip to content

Commit a9b1ff9

Browse files
jieyouxujieyouxu
committed
tests: remove explicit long type filename hash normalization from some ui tests
1 parent 1bf15c2 commit a9b1ff9

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+109
-156
lines changed

‎tests/ui/diagnostic-width/E0271.ascii.stderr‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error[E0271]: type mismatch resolving `<Result<..., ()> as Future>::Error == Foo`
2-
--> $DIR/E0271.rs:20:5
2+
--> $DIR/E0271.rs:19:5
33
|
44
LL | / Box::new(
55
LL | | Ok::<_, ()>(
@@ -10,12 +10,12 @@ LL | | )
1010
| |_____^ type mismatch resolving `<Result<..., ()> as Future>::Error == Foo`
1111
|
1212
note: expected this to be `Foo`
13-
--> $DIR/E0271.rs:10:18
13+
--> $DIR/E0271.rs:9:18
1414
|
1515
LL | type Error = E;
1616
| ^
1717
= note: required for the cast from `Box<Result<..., ()>>` to `Box<...>`
18-
= note: the full name for the type has been written to '$TEST_BUILD_DIR/$FILE.long-type-hash.txt'
18+
= note: the full name for the type has been written to '$TEST_BUILD_DIR/E0271.long-type-$LONG_TYPE_HASH.txt'
1919
= note: consider using `--verbose` to print the full type name to the console
2020

2121
error: aborting due to 1 previous error

‎tests/ui/diagnostic-width/E0271.rs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
//@ revisions: ascii unicode
22
//@[ascii] compile-flags: --diagnostic-width=40 -Zwrite-long-types-to-disk=yes
33
//@[unicode] compile-flags: -Zunstable-options --error-format=human-unicode --diagnostic-width=40 -Zwrite-long-types-to-disk=yes
4-
//@ normalize-stderr: "'\$TEST_BUILD_DIR/.*\.long-type-\d+.txt'" -> "'$$TEST_BUILD_DIR/$$FILE.long-type-hash.txt'"
54
trait Future {
65
type Error;
76
}

‎tests/ui/diagnostic-width/E0271.unicode.stderr‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error[E0271]: type mismatch resolving `<Result<..., ()> as Future>::Error == Foo`
2-
╭▸ $DIR/E0271.rs:20:5
2+
╭▸ $DIR/E0271.rs:19:5
33
│
44
LL │ ┏ Box::new(
55
LL │ ┃ Ok::<_, ()>(
@@ -10,12 +10,12 @@ LL │ ┃ )
1010
│ ┗━━━━━┛ type mismatch resolving `<Result<..., ()> as Future>::Error == Foo`
1111
╰╴
1212
note: expected this to be `Foo`
13-
╭▸ $DIR/E0271.rs:10:18
13+
╭▸ $DIR/E0271.rs:9:18
1414
│
1515
LL │ type Error = E;
1616
│ ━
1717
├ note: required for the cast from `Box<Result<..., ()>>` to `Box<...>`
18-
├ note: the full name for the type has been written to '$TEST_BUILD_DIR/$FILE.long-type-hash.txt'
18+
├ note: the full name for the type has been written to '$TEST_BUILD_DIR/E0271.long-type-$LONG_TYPE_HASH.txt'
1919
╰ note: consider using `--verbose` to print the full type name to the console
2020

2121
error: aborting due to 1 previous error

‎tests/ui/diagnostic-width/binop.rs‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
//@ compile-flags: --diagnostic-width=60 -Zwrite-long-types-to-disk=yes
2-
// The regex below normalizes the long type file name to make it suitable for compare-modes.
3-
//@ normalize-stderr: "'\$TEST_BUILD_DIR/.*\.long-type-\d+.txt'" -> "'$$TEST_BUILD_DIR/$$FILE.long-type-hash.txt'"
42
type A = (i32, i32, i32, i32);
53
type B = (A, A, A, A);
64
type C = (B, B, B, B);

‎tests/ui/diagnostic-width/binop.stderr‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
error[E0369]: cannot add `(..., ..., ..., ...)` to `(..., ..., ..., ...)`
2-
--> $DIR/binop.rs:10:7
2+
--> $DIR/binop.rs:8:7
33
|
44
LL | x + x;
55
| - ^ - (..., ..., ..., ...)
66
| |
77
| (..., ..., ..., ...)
88
|
9-
= note: the full name for the type has been written to '$TEST_BUILD_DIR/$FILE.long-type-hash.txt'
9+
= note: the full name for the type has been written to '$TEST_BUILD_DIR/binop.long-type-$LONG_TYPE_HASH.txt'
1010
= note: consider using `--verbose` to print the full type name to the console
1111

1212
error[E0600]: cannot apply unary operator `!` to type `(..., ..., ..., ...)`
13-
--> $DIR/binop.rs:14:5
13+
--> $DIR/binop.rs:12:5
1414
|
1515
LL | !x;
1616
| ^^ cannot apply unary operator `!`
1717
|
18-
= note: the full name for the type has been written to '$TEST_BUILD_DIR/$FILE.long-type-hash.txt'
18+
= note: the full name for the type has been written to '$TEST_BUILD_DIR/binop.long-type-$LONG_TYPE_HASH.txt'
1919
= note: consider using `--verbose` to print the full type name to the console
2020

2121
error: aborting due to 2 previous errors

‎tests/ui/diagnostic-width/long-E0308.ascii.stderr‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error[E0308]: mismatched types
2-
--> $DIR/long-E0308.rs:48:9
2+
--> $DIR/long-E0308.rs:45:9
33
|
44
LL | let x: Atype<
55
| _____________-
@@ -20,11 +20,11 @@ LL | | ))))))))))))))))))))))))))))));
2020
|
2121
= note: expected struct `Atype<Btype<..., i32>, i32>`
2222
found enum `Result<Result<..., _>, _>`
23-
= note: the full name for the type has been written to '$TEST_BUILD_DIR/$FILE.long-type-hash.txt'
23+
= note: the full name for the type has been written to '$TEST_BUILD_DIR/long-E0308.long-type-$LONG_TYPE_HASH.txt'
2424
= note: consider using `--verbose` to print the full type name to the console
2525

2626
error[E0308]: mismatched types
27-
--> $DIR/long-E0308.rs:61:26
27+
--> $DIR/long-E0308.rs:58:26
2828
|
2929
LL | ))))))))))))))))) == Ok(Ok(Ok(Ok(Ok(Ok(Ok(Ok(O...
3030
| __________________________^
@@ -36,11 +36,11 @@ LL | | ))))))))))))))))))))))));
3636
|
3737
= note: expected enum `Option<Result<Option<...>, _>>`
3838
found enum `Result<Result<..., _>, _>`
39-
= note: the full name for the type has been written to '$TEST_BUILD_DIR/$FILE.long-type-hash.txt'
39+
= note: the full name for the type has been written to '$TEST_BUILD_DIR/long-E0308.long-type-$LONG_TYPE_HASH.txt'
4040
= note: consider using `--verbose` to print the full type name to the console
4141

4242
error[E0308]: mismatched types
43-
--> $DIR/long-E0308.rs:92:9
43+
--> $DIR/long-E0308.rs:89:9
4444
|
4545
LL | let x: Atype<
4646
| ____________-
@@ -56,11 +56,11 @@ LL | | > = ();
5656
|
5757
= note: expected struct `Atype<Btype<..., i32>, i32>`
5858
found unit type `()`
59-
= note: the full name for the type has been written to '$TEST_BUILD_DIR/$FILE.long-type-hash.txt'
59+
= note: the full name for the type has been written to '$TEST_BUILD_DIR/long-E0308.long-type-$LONG_TYPE_HASH.txt'
6060
= note: consider using `--verbose` to print the full type name to the console
6161

6262
error[E0308]: mismatched types
63-
--> $DIR/long-E0308.rs:95:17
63+
--> $DIR/long-E0308.rs:92:17
6464
|
6565
LL | let _: () = Ok(Ok(Ok(Ok(Ok(Ok(Ok(Ok(Ok(Ok(Ok(O...
6666
| ____________--___^
@@ -74,7 +74,7 @@ LL | | ))))))))))))))))))))))));
7474
|
7575
= note: expected unit type `()`
7676
found enum `Result<Result<..., _>, _>`
77-
= note: the full name for the type has been written to '$TEST_BUILD_DIR/$FILE.long-type-hash.txt'
77+
= note: the full name for the type has been written to '$TEST_BUILD_DIR/long-E0308.long-type-$LONG_TYPE_HASH.txt'
7878
= note: consider using `--verbose` to print the full type name to the console
7979

8080
error: aborting due to 4 previous errors

‎tests/ui/diagnostic-width/long-E0308.rs‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,6 @@
22
//@[ascii] compile-flags: --diagnostic-width=60 -Zwrite-long-types-to-disk=yes
33
//@[unicode] compile-flags: -Zunstable-options --json=diagnostic-unicode --diagnostic-width=60 -Zwrite-long-types-to-disk=yes
44

5-
// The regex below normalizes the long type file name to make it suitable for compare-modes.
6-
//@ normalize-stderr: "'\$TEST_BUILD_DIR/.*\.long-type-\d+.txt'" -> "'$$TEST_BUILD_DIR/$$FILE.long-type-hash.txt'"
7-
85
mod a {
96
// Force the "short path for unique types" machinery to trip up
107
pub struct Atype;

‎tests/ui/diagnostic-width/long-E0308.unicode.stderr‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error[E0308]: mismatched types
2-
╭▸ $DIR/long-E0308.rs:48:9
2+
╭▸ $DIR/long-E0308.rs:45:9
33
│
44
LL │ let x: Atype<
55
│ ┌─────────────┘
@@ -20,11 +20,11 @@ LL │ ┃ ))))))))))))))))))))))))))))));
2020
│
2121
├ note: expected struct `Atype<Btype<..., i32>, i32>`
2222
│ found enum `Result<Result<..., _>, _>`
23-
├ note: the full name for the type has been written to '$TEST_BUILD_DIR/$FILE.long-type-hash.txt'
23+
├ note: the full name for the type has been written to '$TEST_BUILD_DIR/long-E0308.long-type-$LONG_TYPE_HASH.txt'
2424
╰ note: consider using `--verbose` to print the full type name to the console
2525

2626
error[E0308]: mismatched types
27-
╭▸ $DIR/long-E0308.rs:61:26
27+
╭▸ $DIR/long-E0308.rs:58:26
2828
│
2929
LL │ ))))))))))))))))) == Ok(Ok(Ok(Ok(Ok(Ok(Ok(Ok(Ok(…
3030
│ ┏━━━━━━━━━━━━━━━━━━━━━━━━━━┛
@@ -36,11 +36,11 @@ LL │ ┃ ))))))))))))))))))))))));
3636
│
3737
├ note: expected enum `Option<Result<Option<...>, _>>`
3838
│ found enum `Result<Result<..., _>, _>`
39-
├ note: the full name for the type has been written to '$TEST_BUILD_DIR/$FILE.long-type-hash.txt'
39+
├ note: the full name for the type has been written to '$TEST_BUILD_DIR/long-E0308.long-type-$LONG_TYPE_HASH.txt'
4040
╰ note: consider using `--verbose` to print the full type name to the console
4141

4242
error[E0308]: mismatched types
43-
╭▸ $DIR/long-E0308.rs:92:9
43+
╭▸ $DIR/long-E0308.rs:89:9
4444
│
4545
LL │ let x: Atype<
4646
│ ┌────────────┘
@@ -56,11 +56,11 @@ LL │ │ > = ();
5656
│
5757
├ note: expected struct `Atype<Btype<..., i32>, i32>`
5858
│ found unit type `()`
59-
├ note: the full name for the type has been written to '$TEST_BUILD_DIR/$FILE.long-type-hash.txt'
59+
├ note: the full name for the type has been written to '$TEST_BUILD_DIR/long-E0308.long-type-$LONG_TYPE_HASH.txt'
6060
╰ note: consider using `--verbose` to print the full type name to the console
6161

6262
error[E0308]: mismatched types
63-
╭▸ $DIR/long-E0308.rs:95:17
63+
╭▸ $DIR/long-E0308.rs:92:17
6464
│
6565
LL │ let _: () = Ok(Ok(Ok(Ok(Ok(Ok(Ok(Ok(Ok(Ok(Ok(Ok(…
6666
│ ┏━━━━━━━━━━━━┬─━━━┛
@@ -74,7 +74,7 @@ LL │ ┃ ))))))))))))))))))))))));
7474
│
7575
├ note: expected unit type `()`
7676
│ found enum `Result<Result<..., _>, _>`
77-
├ note: the full name for the type has been written to '$TEST_BUILD_DIR/$FILE.long-type-hash.txt'
77+
├ note: the full name for the type has been written to '$TEST_BUILD_DIR/long-E0308.long-type-$LONG_TYPE_HASH.txt'
7878
╰ note: consider using `--verbose` to print the full type name to the console
7979

8080
error: aborting due to 4 previous errors

‎tests/ui/diagnostic-width/long-E0529.rs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
//@ compile-flags: --diagnostic-width=60 -Zwrite-long-types-to-disk=yes
2-
// The regex below normalizes the long type file name to make it suitable for compare-modes.
3-
//@ normalize-stderr: "'\$TEST_BUILD_DIR/.*\.long-type-\d+.txt'" -> "'$$TEST_BUILD_DIR/$$FILE.long-type-hash.txt'"
2+
43
type A = (i32, i32, i32, i32);
54
type B = (A, A, A, A);
65
type C = (B, B, B, B);

‎tests/ui/diagnostic-width/long-E0529.stderr‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
error[E0529]: expected an array or slice, found `(..., ..., ..., ...)`
2-
--> $DIR/long-E0529.rs:10:9
2+
--> $DIR/long-E0529.rs:9:9
33
|
44
LL | let [] = x;
55
| ^^ pattern cannot match with input type `(..., ..., ..., ...)`
66
|
7-
= note: the full name for the type has been written to '$TEST_BUILD_DIR/$FILE.long-type-hash.txt'
7+
= note: the full name for the type has been written to '$TEST_BUILD_DIR/long-E0529.long-type-$LONG_TYPE_HASH.txt'
88
= note: consider using `--verbose` to print the full type name to the console
99

1010
error: aborting due to 1 previous error

0 commit comments

Comments
 (0)