Skip to content

Commit b6bd61c

Browse files
GuillaumeGomezGuillaumeGomez
committed
Update ui tests with new macro early erroring
1 parent 82bf67c commit b6bd61c

25 files changed

+260
-246
lines changed

‎tests/ui/const-generics/min_const_generics/macro-fail.rs

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,7 @@ trait Marker<const N: usize> {}
1212
impl<const N: usize> Marker<N> for Example<N> {}
1313

1414
fn make_marker() -> impl Marker<gimme_a_const!(marker)> {
15-
//~^ ERROR: type provided when a constant was expected
16-
//~| ERROR: type provided when a constant was expected
1715
Example::<gimme_a_const!(marker)>
18-
//~^ ERROR: type provided when a constant was expected
1916
}
2017

2118
fn from_marker(_: impl Marker<{
@@ -35,9 +32,7 @@ fn main() {
3532
}>;
3633

3734
let _fail = Example::<external_macro!()>;
38-
//~^ ERROR: type provided when a constant
3935

4036
let _fail = Example::<gimme_a_const!()>;
41-
//~^ ERROR unexpected end of macro invocation
42-
//~| ERROR: type provided when a constant was expected
37+
//~^ ERROR: unexpected end of macro invocation
4338
}

‎tests/ui/const-generics/min_const_generics/macro-fail.stderr

Lines changed: 5 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error: expected type, found `{`
2-
--> $DIR/macro-fail.rs:30:27
2+
--> $DIR/macro-fail.rs:27:27
33
|
44
LL | fn make_marker() -> impl Marker<gimme_a_const!(marker)> {
55
| ----------------------
@@ -13,7 +13,7 @@ LL | ($rusty: ident) => {{ let $rusty = 3; *&$rusty }}
1313
= note: this error originates in the macro `gimme_a_const` (in Nightly builds, run with -Z macro-backtrace for more info)
1414

1515
error: expected type, found `{`
16-
--> $DIR/macro-fail.rs:30:27
16+
--> $DIR/macro-fail.rs:27:27
1717
|
1818
LL | Example::<gimme_a_const!(marker)>
1919
| ----------------------
@@ -41,7 +41,7 @@ LL | let _fail = Example::<external_macro!()>;
4141
= note: this error originates in the macro `external_macro` (in Nightly builds, run with -Z macro-backtrace for more info)
4242

4343
error: unexpected end of macro invocation
44-
--> $DIR/macro-fail.rs:40:25
44+
--> $DIR/macro-fail.rs:36:25
4545
|
4646
LL | macro_rules! gimme_a_const {
4747
| -------------------------- when calling this macro
@@ -50,43 +50,10 @@ LL | let _fail = Example::<gimme_a_const!()>;
5050
| ^^^^^^^^^^^^^^^^ missing tokens in macro arguments
5151
|
5252
note: while trying to match meta-variable `$rusty:ident`
53-
--> $DIR/macro-fail.rs:30:8
53+
--> $DIR/macro-fail.rs:27:8
5454
|
5555
LL | ($rusty: ident) => {{ let $rusty = 3; *&$rusty }}
5656
| ^^^^^^^^^^^^^
5757

58-
error[E0747]: type provided when a constant was expected
59-
--> $DIR/macro-fail.rs:14:33
60-
|
61-
LL | fn make_marker() -> impl Marker<gimme_a_const!(marker)> {
62-
| ^^^^^^^^^^^^^^^^^^^^^^
63-
64-
error[E0747]: type provided when a constant was expected
65-
--> $DIR/macro-fail.rs:14:33
66-
|
67-
LL | fn make_marker() -> impl Marker<gimme_a_const!(marker)> {
68-
| ^^^^^^^^^^^^^^^^^^^^^^
69-
|
70-
= note: duplicate diagnostic emitted due to `-Z deduplicate-diagnostics=no`
71-
72-
error[E0747]: type provided when a constant was expected
73-
--> $DIR/macro-fail.rs:17:13
74-
|
75-
LL | Example::<gimme_a_const!(marker)>
76-
| ^^^^^^^^^^^^^^^^^^^^^^
77-
78-
error[E0747]: type provided when a constant was expected
79-
--> $DIR/macro-fail.rs:37:25
80-
|
81-
LL | let _fail = Example::<external_macro!()>;
82-
| ^^^^^^^^^^^^^^^^^
83-
84-
error[E0747]: type provided when a constant was expected
85-
--> $DIR/macro-fail.rs:40:25
86-
|
87-
LL | let _fail = Example::<gimme_a_const!()>;
88-
| ^^^^^^^^^^^^^^^^
89-
90-
error: aborting due to 9 previous errors
58+
error: aborting due to 4 previous errors
9159

92-
For more information about this error, try `rustc --explain E0747`.

‎tests/ui/editions/edition-keywords-2018-2015-2.rs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
//@ edition:2018
2+
3+
fn main() {
4+
let _recovery_witness: () = 0; //~ ERROR mismatched types
5+
}

‎tests/ui/editions/edition-keywords-2018-2015-2.stderr

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
error[E0308]: mismatched types
2+
--> $DIR/edition-keywords-2018-2015-2.rs:4:33
3+
|
4+
LL | let _recovery_witness: () = 0;
5+
| -- ^ expected `()`, found integer
6+
| |
7+
| expected due to this
8+
9+
error: aborting due to 1 previous error
10+
11+
For more information about this error, try `rustc --explain E0308`.

‎tests/ui/editions/edition-keywords-2018-2015-parsing.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,6 @@ pub fn check_async() {
2525
if passes_tt!(r#async) == 1 {} // OK
2626
module::async(); //~ ERROR expected identifier, found keyword `async`
2727
module::r#async(); // OK
28-
29-
let _recovery_witness: () = 0; //~ ERROR mismatched types
3028
}
3129

3230
//~? ERROR macro expansion ends with an incomplete expression

‎tests/ui/editions/edition-keywords-2018-2015-parsing.stderr

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -61,14 +61,5 @@ error: macro expansion ends with an incomplete expression: expected one of `move
6161
LL | if passes_tt!(async) == 1 {}
6262
| ^ expected one of `move`, `use`, `{`, `|`, or `||`
6363

64-
error[E0308]: mismatched types
65-
--> $DIR/edition-keywords-2018-2015-parsing.rs:29:33
66-
|
67-
LL | let _recovery_witness: () = 0;
68-
| -- ^ expected `()`, found integer
69-
| |
70-
| expected due to this
71-
72-
error: aborting due to 7 previous errors
64+
error: aborting due to 6 previous errors
7365

74-
For more information about this error, try `rustc --explain E0308`.

‎tests/ui/editions/edition-keywords-2018-2018-parsing-2.rs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
//@ edition:2018
2+
3+
fn main() {
4+
let _recovery_witness: () = 0; //~ ERROR mismatched types
5+
}

‎tests/ui/editions/edition-keywords-2018-2018-parsing-2.stderr

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
error[E0308]: mismatched types
2+
--> $DIR/edition-keywords-2018-2018-parsing-2.rs:4:33
3+
|
4+
LL | let _recovery_witness: () = 0;
5+
| -- ^ expected `()`, found integer
6+
| |
7+
| expected due to this
8+
9+
error: aborting due to 1 previous error
10+
11+
For more information about this error, try `rustc --explain E0308`.

‎tests/ui/editions/edition-keywords-2018-2018-parsing.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,6 @@ pub fn check_async() {
3636
if local_passes_tt!(r#async) == 1 {} // OK
3737
module::async(); //~ ERROR expected identifier, found keyword `async`
3838
module::r#async(); // OK
39-
40-
let _recovery_witness: () = 0; //~ ERROR mismatched types
4139
}
4240

4341
//~? ERROR macro expansion ends with an incomplete expression

‎tests/ui/editions/edition-keywords-2018-2018-parsing.stderr

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -73,14 +73,5 @@ error: macro expansion ends with an incomplete expression: expected one of `move
7373
LL | if local_passes_tt!(async) == 1 {}
7474
| ^ expected one of `move`, `use`, `{`, `|`, or `||`
7575

76-
error[E0308]: mismatched types
77-
--> $DIR/edition-keywords-2018-2018-parsing.rs:40:33
78-
|
79-
LL | let _recovery_witness: () = 0;
80-
| -- ^ expected `()`, found integer
81-
| |
82-
| expected due to this
83-
84-
error: aborting due to 9 previous errors
76+
error: aborting due to 8 previous errors
8577

86-
For more information about this error, try `rustc --explain E0308`.

0 commit comments

Comments
 (0)