Skip to content

Commit 23de376

Browse files
CentrilCentril
authored
Rollup merge of #61403 - estebank:test-cleanup, r=petrochenkov
Remove unnecessary `-Z continue-parse-after-error` from tests r? @petrochenkov
2 parents c081974 + d6ea6b9 commit 23de376

File tree

73 files changed

+142
-214
lines changed

Some content is hidden

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

73 files changed

+142
-214
lines changed

‎src/test/ui/extern/extern-const.fixed

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
// run-rustfix
88
// ignore-wasm32 no external library to link to.
9-
// compile-flags: -g -Z continue-parse-after-error
9+
// compile-flags: -g
1010
#![feature(rustc_private)]
1111
extern crate libc;
1212

‎src/test/ui/extern/extern-const.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
// run-rustfix
88
// ignore-wasm32 no external library to link to.
9-
// compile-flags: -g -Z continue-parse-after-error
9+
// compile-flags: -g
1010
#![feature(rustc_private)]
1111
extern crate libc;
1212

‎src/test/ui/fmt/format-string-error-2.rs

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
// compile-flags: -Z continue-parse-after-error
21
// ignore-tidy-tab
32

43
fn main() {

‎src/test/ui/fmt/format-string-error-2.stderr

+18-18
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
error: incorrect unicode escape sequence
2-
--> $DIR/format-string-error-2.rs:78:20
2+
--> $DIR/format-string-error-2.rs:77:20
33
|
44
LL | println!("\x7B}\u8 {", 1);
55
| ^^-
66
| |
77
| help: format of unicode escape sequences uses braces: `\u{8}`
88

99
error: invalid format string: expected `'}'`, found `'a'`
10-
--> $DIR/format-string-error-2.rs:6:5
10+
--> $DIR/format-string-error-2.rs:5:5
1111
|
1212
LL | format!("{
1313
| - because of this opening brace
@@ -17,7 +17,7 @@ LL | a");
1717
= note: if you intended to print `{`, you can escape it using `{{`
1818

1919
error: invalid format string: expected `'}'`, found `'b'`
20-
--> $DIR/format-string-error-2.rs:10:5
20+
--> $DIR/format-string-error-2.rs:9:5
2121
|
2222
LL | format!("{ \
2323
| - because of this opening brace
@@ -28,7 +28,7 @@ LL | b");
2828
= note: if you intended to print `{`, you can escape it using `{{`
2929

3030
error: invalid format string: expected `'}'`, found `'\'`
31-
--> $DIR/format-string-error-2.rs:12:18
31+
--> $DIR/format-string-error-2.rs:11:18
3232
|
3333
LL | format!(r#"{ \
3434
| - ^ expected `}` in format string
@@ -38,7 +38,7 @@ LL | format!(r#"{ \
3838
= note: if you intended to print `{`, you can escape it using `{{`
3939

4040
error: invalid format string: expected `'}'`, found `'\'`
41-
--> $DIR/format-string-error-2.rs:16:18
41+
--> $DIR/format-string-error-2.rs:15:18
4242
|
4343
LL | format!(r#"{ \n
4444
| - ^ expected `}` in format string
@@ -48,7 +48,7 @@ LL | format!(r#"{ \n
4848
= note: if you intended to print `{`, you can escape it using `{{`
4949

5050
error: invalid format string: expected `'}'`, found `'e'`
51-
--> $DIR/format-string-error-2.rs:22:5
51+
--> $DIR/format-string-error-2.rs:21:5
5252
|
5353
LL | format!("{ \n
5454
| - because of this opening brace
@@ -59,7 +59,7 @@ LL | e");
5959
= note: if you intended to print `{`, you can escape it using `{{`
6060

6161
error: invalid format string: expected `'}'`, found `'a'`
62-
--> $DIR/format-string-error-2.rs:26:5
62+
--> $DIR/format-string-error-2.rs:25:5
6363
|
6464
LL | {
6565
| - because of this opening brace
@@ -69,7 +69,7 @@ LL | a");
6969
= note: if you intended to print `{`, you can escape it using `{{`
7070

7171
error: invalid format string: expected `'}'`, found `'a'`
72-
--> $DIR/format-string-error-2.rs:30:5
72+
--> $DIR/format-string-error-2.rs:29:5
7373
|
7474
LL | {
7575
| - because of this opening brace
@@ -79,7 +79,7 @@ LL | a
7979
= note: if you intended to print `{`, you can escape it using `{{`
8080

8181
error: invalid format string: expected `'}'`, found `'b'`
82-
--> $DIR/format-string-error-2.rs:36:5
82+
--> $DIR/format-string-error-2.rs:35:5
8383
|
8484
LL | { \
8585
| - because of this opening brace
@@ -90,7 +90,7 @@ LL | b");
9090
= note: if you intended to print `{`, you can escape it using `{{`
9191

9292
error: invalid format string: expected `'}'`, found `'b'`
93-
--> $DIR/format-string-error-2.rs:41:5
93+
--> $DIR/format-string-error-2.rs:40:5
9494
|
9595
LL | { \
9696
| - because of this opening brace
@@ -101,7 +101,7 @@ LL | b \
101101
= note: if you intended to print `{`, you can escape it using `{{`
102102

103103
error: invalid format string: expected `'}'`, found `'\'`
104-
--> $DIR/format-string-error-2.rs:46:8
104+
--> $DIR/format-string-error-2.rs:45:8
105105
|
106106
LL | raw { \
107107
| - ^ expected `}` in format string
@@ -111,7 +111,7 @@ LL | raw { \
111111
= note: if you intended to print `{`, you can escape it using `{{`
112112

113113
error: invalid format string: expected `'}'`, found `'\'`
114-
--> $DIR/format-string-error-2.rs:51:8
114+
--> $DIR/format-string-error-2.rs:50:8
115115
|
116116
LL | raw { \n
117117
| - ^ expected `}` in format string
@@ -121,7 +121,7 @@ LL | raw { \n
121121
= note: if you intended to print `{`, you can escape it using `{{`
122122

123123
error: invalid format string: expected `'}'`, found `'e'`
124-
--> $DIR/format-string-error-2.rs:58:5
124+
--> $DIR/format-string-error-2.rs:57:5
125125
|
126126
LL | { \n
127127
| - because of this opening brace
@@ -132,7 +132,7 @@ LL | e");
132132
= note: if you intended to print `{`, you can escape it using `{{`
133133

134134
error: invalid format string: expected `'}'`, found `'a'`
135-
--> $DIR/format-string-error-2.rs:68:5
135+
--> $DIR/format-string-error-2.rs:67:5
136136
|
137137
LL | {
138138
| - because of this opening brace
@@ -142,13 +142,13 @@ LL | asdf}
142142
= note: if you intended to print `{`, you can escape it using `{{`
143143

144144
error: 1 positional argument in format string, but no arguments were given
145-
--> $DIR/format-string-error-2.rs:71:17
145+
--> $DIR/format-string-error-2.rs:70:17
146146
|
147147
LL | println!("\t{}");
148148
| ^^
149149

150150
error: invalid format string: expected `'}'` but string was terminated
151-
--> $DIR/format-string-error-2.rs:75:27
151+
--> $DIR/format-string-error-2.rs:74:27
152152
|
153153
LL | println!("\x7B}\u{8} {", 1);
154154
| -^ expected `'}'` in format string
@@ -158,15 +158,15 @@ LL | println!("\x7B}\u{8} {", 1);
158158
= note: if you intended to print `{`, you can escape it using `{{`
159159

160160
error: invalid format string: unmatched `}` found
161-
--> $DIR/format-string-error-2.rs:82:21
161+
--> $DIR/format-string-error-2.rs:81:21
162162
|
163163
LL | println!(r#"\x7B}\u{8} {"#, 1);
164164
| ^ unmatched `}` in format string
165165
|
166166
= note: if you intended to print `}`, you can escape it using `}}`
167167

168168
error: invalid format string: unmatched `}` found
169-
--> $DIR/format-string-error-2.rs:85:21
169+
--> $DIR/format-string-error-2.rs:84:21
170170
|
171171
LL | println!(r#"\x7B}\u8 {"#, 1);
172172
| ^ unmatched `}` in format string

‎src/test/ui/impl-trait/impl-trait-plus-priority.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// compile-flags: -Z parse-only -Z continue-parse-after-error
1+
// compile-flags: -Z parse-only
22

33
fn f() -> impl A + {} // OK
44
fn f() -> impl A + B {} // OK

‎src/test/ui/issues/issue-28433.rs

-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
// compile-flags: -Z continue-parse-after-error
2-
31
enum Bird {
42
pub Duck,
53
//~^ ERROR unnecessary visibility qualifier

‎src/test/ui/issues/issue-28433.stderr

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
error: unnecessary visibility qualifier
2-
--> $DIR/issue-28433.rs:4:5
2+
--> $DIR/issue-28433.rs:2:5
33
|
44
LL | pub Duck,
55
| ^^^ `pub` not permitted here
66

77
error: unnecessary visibility qualifier
8-
--> $DIR/issue-28433.rs:7:5
8+
--> $DIR/issue-28433.rs:5:5
99
|
1010
LL | pub(crate) Dove
1111
| ^^^^^^^^^^ `pub` not permitted here

‎src/test/ui/issues/issue-36638.rs

-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
// compile-flags: -Z continue-parse-after-error
2-
31
struct Foo<Self>(Self);
42
//~^ ERROR expected identifier, found keyword `Self`
53
//~^^ ERROR E0392

‎src/test/ui/issues/issue-36638.stderr

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
error: expected identifier, found keyword `Self`
2-
--> $DIR/issue-36638.rs:3:12
2+
--> $DIR/issue-36638.rs:1:12
33
|
44
LL | struct Foo<Self>(Self);
55
| ^^^^ expected identifier, found keyword
66

77
error: expected identifier, found keyword `Self`
8-
--> $DIR/issue-36638.rs:7:11
8+
--> $DIR/issue-36638.rs:5:11
99
|
1010
LL | trait Bar<Self> {}
1111
| ^^^^ expected identifier, found keyword
1212

1313
error[E0392]: parameter `Self` is never used
14-
--> $DIR/issue-36638.rs:3:12
14+
--> $DIR/issue-36638.rs:1:12
1515
|
1616
LL | struct Foo<Self>(Self);
1717
| ^^^^ unused parameter

‎src/test/ui/parser/associated-types-project-from-hrtb-explicit.rs

-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
// compile-flags: -Z continue-parse-after-error
2-
31
// Test you can't use a higher-ranked trait bound inside of a qualified
42
// path (just won't parse).
53

‎src/test/ui/parser/associated-types-project-from-hrtb-explicit.stderr

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error: expected identifier, found keyword `for`
2-
--> $DIR/associated-types-project-from-hrtb-explicit.rs:12:21
2+
--> $DIR/associated-types-project-from-hrtb-explicit.rs:10:21
33
|
44
LL | fn foo2<I>(x: <I as for<'x> Foo<&'x isize>>::A)
55
| ^^^ expected identifier, found keyword
@@ -9,7 +9,7 @@ LL | fn foo2<I>(x: <I as r#for<'x> Foo<&'x isize>>::A)
99
| ^^^^^
1010

1111
error: expected one of `::` or `>`, found `Foo`
12-
--> $DIR/associated-types-project-from-hrtb-explicit.rs:12:29
12+
--> $DIR/associated-types-project-from-hrtb-explicit.rs:10:29
1313
|
1414
LL | fn foo2<I>(x: <I as for<'x> Foo<&'x isize>>::A)
1515
| ^^^ expected one of `::` or `>` here

‎src/test/ui/parser/bad-lit-suffixes.rs

-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
// compile-flags: -Z continue-parse-after-error
2-
3-
41
extern
52
"C"suffix //~ ERROR suffixes on an ABI spec are invalid
63
fn foo() {}

‎src/test/ui/parser/bad-lit-suffixes.stderr

+16-16
Original file line numberDiff line numberDiff line change
@@ -1,109 +1,109 @@
11
error: suffixes on an ABI spec are invalid
2-
--> $DIR/bad-lit-suffixes.rs:5:5
2+
--> $DIR/bad-lit-suffixes.rs:2:5
33
|
44
LL | "C"suffix
55
| ^^^^^^^^^ invalid suffix `suffix`
66

77
error: suffixes on an ABI spec are invalid
8-
--> $DIR/bad-lit-suffixes.rs:9:5
8+
--> $DIR/bad-lit-suffixes.rs:6:5
99
|
1010
LL | "C"suffix
1111
| ^^^^^^^^^ invalid suffix `suffix`
1212

1313
error: suffixes on a string literal are invalid
14-
--> $DIR/bad-lit-suffixes.rs:13:5
14+
--> $DIR/bad-lit-suffixes.rs:10:5
1515
|
1616
LL | ""suffix;
1717
| ^^^^^^^^ invalid suffix `suffix`
1818

1919
error: suffixes on a byte string literal are invalid
20-
--> $DIR/bad-lit-suffixes.rs:14:5
20+
--> $DIR/bad-lit-suffixes.rs:11:5
2121
|
2222
LL | b""suffix;
2323
| ^^^^^^^^^ invalid suffix `suffix`
2424

2525
error: suffixes on a string literal are invalid
26-
--> $DIR/bad-lit-suffixes.rs:15:5
26+
--> $DIR/bad-lit-suffixes.rs:12:5
2727
|
2828
LL | r#""#suffix;
2929
| ^^^^^^^^^^^ invalid suffix `suffix`
3030

3131
error: suffixes on a byte string literal are invalid
32-
--> $DIR/bad-lit-suffixes.rs:16:5
32+
--> $DIR/bad-lit-suffixes.rs:13:5
3333
|
3434
LL | br#""#suffix;
3535
| ^^^^^^^^^^^^ invalid suffix `suffix`
3636

3737
error: suffixes on a char literal are invalid
38-
--> $DIR/bad-lit-suffixes.rs:17:5
38+
--> $DIR/bad-lit-suffixes.rs:14:5
3939
|
4040
LL | 'a'suffix;
4141
| ^^^^^^^^^ invalid suffix `suffix`
4242

4343
error: suffixes on a byte literal are invalid
44-
--> $DIR/bad-lit-suffixes.rs:18:5
44+
--> $DIR/bad-lit-suffixes.rs:15:5
4545
|
4646
LL | b'a'suffix;
4747
| ^^^^^^^^^^ invalid suffix `suffix`
4848

4949
error: invalid width `1024` for integer literal
50-
--> $DIR/bad-lit-suffixes.rs:20:5
50+
--> $DIR/bad-lit-suffixes.rs:17:5
5151
|
5252
LL | 1234u1024;
5353
| ^^^^^^^^^
5454
|
5555
= help: valid widths are 8, 16, 32, 64 and 128
5656

5757
error: invalid width `1024` for integer literal
58-
--> $DIR/bad-lit-suffixes.rs:21:5
58+
--> $DIR/bad-lit-suffixes.rs:18:5
5959
|
6060
LL | 1234i1024;
6161
| ^^^^^^^^^
6262
|
6363
= help: valid widths are 8, 16, 32, 64 and 128
6464

6565
error: invalid width `1024` for float literal
66-
--> $DIR/bad-lit-suffixes.rs:22:5
66+
--> $DIR/bad-lit-suffixes.rs:19:5
6767
|
6868
LL | 1234f1024;
6969
| ^^^^^^^^^
7070
|
7171
= help: valid widths are 32 and 64
7272

7373
error: invalid width `1024` for float literal
74-
--> $DIR/bad-lit-suffixes.rs:23:5
74+
--> $DIR/bad-lit-suffixes.rs:20:5
7575
|
7676
LL | 1234.5f1024;
7777
| ^^^^^^^^^^^
7878
|
7979
= help: valid widths are 32 and 64
8080

8181
error: invalid suffix `suffix` for integer literal
82-
--> $DIR/bad-lit-suffixes.rs:25:5
82+
--> $DIR/bad-lit-suffixes.rs:22:5
8383
|
8484
LL | 1234suffix;
8585
| ^^^^^^^^^^ invalid suffix `suffix`
8686
|
8787
= help: the suffix must be one of the integral types (`u32`, `isize`, etc)
8888

8989
error: invalid suffix `suffix` for integer literal
90-
--> $DIR/bad-lit-suffixes.rs:26:5
90+
--> $DIR/bad-lit-suffixes.rs:23:5
9191
|
9292
LL | 0b101suffix;
9393
| ^^^^^^^^^^^ invalid suffix `suffix`
9494
|
9595
= help: the suffix must be one of the integral types (`u32`, `isize`, etc)
9696

9797
error: invalid suffix `suffix` for float literal
98-
--> $DIR/bad-lit-suffixes.rs:27:5
98+
--> $DIR/bad-lit-suffixes.rs:24:5
9999
|
100100
LL | 1.0suffix;
101101
| ^^^^^^^^^ invalid suffix `suffix`
102102
|
103103
= help: valid suffixes are `f32` and `f64`
104104

105105
error: invalid suffix `suffix` for float literal
106-
--> $DIR/bad-lit-suffixes.rs:28:5
106+
--> $DIR/bad-lit-suffixes.rs:25:5
107107
|
108108
LL | 1.0e10suffix;
109109
| ^^^^^^^^^^^^ invalid suffix `suffix`

‎src/test/ui/parser/bounds-type.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// compile-flags: -Z parse-only -Z continue-parse-after-error
1+
// compile-flags: -Z parse-only
22

33
struct S<
44
T: 'a + Tr, // OK

0 commit comments

Comments
 (0)