Skip to content

Commit a9a67a3

Browse files
Rollup merge of #53368 - matthewjasper:only-stage-2, r=varkor
Ignore test that fails on stage1 The error code is not emitted on stage1, so ignore this test there.
2 parents 25839dd + 0e43e6f commit a9a67a3

File tree

2 files changed

+16
-15
lines changed

2 files changed

+16
-15
lines changed

src/test/ui/macros/macros-nonfatal-errors.rs

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

1111
// normalize-stderr-test: "The system cannot find the file specified\." -> "No such file or directory"
1212
// ignore-tidy-linelength
13+
// ignore-stage1
1314

1415
// test that errors in a (selection) of macros don't kill compilation
1516
// immediately, so that we get more errors listed at a time.

src/test/ui/macros/macros-nonfatal-errors.stderr

+15-15
Original file line numberDiff line numberDiff line change
@@ -1,55 +1,55 @@
11
error[E0665]: `Default` cannot be derived for enums, only structs
2-
--> $DIR/macros-nonfatal-errors.rs:20:10
2+
--> $DIR/macros-nonfatal-errors.rs:21:10
33
|
44
LL | #[derive(Default)] //~ ERROR
55
| ^^^^^^^
66

77
error: inline assembly must be a string literal
8-
--> $DIR/macros-nonfatal-errors.rs:24:10
8+
--> $DIR/macros-nonfatal-errors.rs:25:10
99
|
1010
LL | asm!(invalid); //~ ERROR
1111
| ^^^^^^^
1212

1313
error: concat_idents! requires ident args.
14-
--> $DIR/macros-nonfatal-errors.rs:26:5
14+
--> $DIR/macros-nonfatal-errors.rs:27:5
1515
|
1616
LL | concat_idents!("not", "idents"); //~ ERROR
1717
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
1818

1919
error: argument must be a string literal
20-
--> $DIR/macros-nonfatal-errors.rs:28:17
20+
--> $DIR/macros-nonfatal-errors.rs:29:17
2121
|
2222
LL | option_env!(invalid); //~ ERROR
2323
| ^^^^^^^
2424

2525
error: expected string literal
26-
--> $DIR/macros-nonfatal-errors.rs:29:10
26+
--> $DIR/macros-nonfatal-errors.rs:30:10
2727
|
2828
LL | env!(invalid); //~ ERROR
2929
| ^^^^^^^
3030

3131
error: expected string literal
32-
--> $DIR/macros-nonfatal-errors.rs:30:10
32+
--> $DIR/macros-nonfatal-errors.rs:31:10
3333
|
3434
LL | env!(foo, abr, baz); //~ ERROR
3535
| ^^^
3636

3737
error: environment variable `RUST_HOPEFULLY_THIS_DOESNT_EXIST` not defined
38-
--> $DIR/macros-nonfatal-errors.rs:31:5
38+
--> $DIR/macros-nonfatal-errors.rs:32:5
3939
|
4040
LL | env!("RUST_HOPEFULLY_THIS_DOESNT_EXIST"); //~ ERROR
4141
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
4242

4343
error[E0658]: non-ident macro paths are experimental (see issue #35896)
44-
--> $DIR/macros-nonfatal-errors.rs:33:5
44+
--> $DIR/macros-nonfatal-errors.rs:34:5
4545
|
4646
LL | foo::blah!(); //~ ERROR
4747
| ^^^^^^^^^
4848
|
4949
= help: add #![feature(use_extern_macros)] to the crate attributes to enable
5050

5151
error: format argument must be a string literal
52-
--> $DIR/macros-nonfatal-errors.rs:35:13
52+
--> $DIR/macros-nonfatal-errors.rs:36:13
5353
|
5454
LL | format!(invalid); //~ ERROR
5555
| ^^^^^^^
@@ -59,37 +59,37 @@ LL | format!("{}", invalid); //~ ERROR
5959
| ^^^^^
6060

6161
error: argument must be a string literal
62-
--> $DIR/macros-nonfatal-errors.rs:37:14
62+
--> $DIR/macros-nonfatal-errors.rs:38:14
6363
|
6464
LL | include!(invalid); //~ ERROR
6565
| ^^^^^^^
6666

6767
error: argument must be a string literal
68-
--> $DIR/macros-nonfatal-errors.rs:39:18
68+
--> $DIR/macros-nonfatal-errors.rs:40:18
6969
|
7070
LL | include_str!(invalid); //~ ERROR
7171
| ^^^^^^^
7272

7373
error: couldn't read $DIR/i'd be quite surprised if a file with this name existed: No such file or directory (os error 2)
74-
--> $DIR/macros-nonfatal-errors.rs:40:5
74+
--> $DIR/macros-nonfatal-errors.rs:41:5
7575
|
7676
LL | include_str!("i'd be quite surprised if a file with this name existed"); //~ ERROR
7777
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
7878

7979
error: argument must be a string literal
80-
--> $DIR/macros-nonfatal-errors.rs:41:20
80+
--> $DIR/macros-nonfatal-errors.rs:42:20
8181
|
8282
LL | include_bytes!(invalid); //~ ERROR
8383
| ^^^^^^^
8484

8585
error: couldn't read $DIR/i'd be quite surprised if a file with this name existed: No such file or directory (os error 2)
86-
--> $DIR/macros-nonfatal-errors.rs:42:5
86+
--> $DIR/macros-nonfatal-errors.rs:43:5
8787
|
8888
LL | include_bytes!("i'd be quite surprised if a file with this name existed"); //~ ERROR
8989
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
9090

9191
error: trace_macros! accepts only `true` or `false`
92-
--> $DIR/macros-nonfatal-errors.rs:44:5
92+
--> $DIR/macros-nonfatal-errors.rs:45:5
9393
|
9494
LL | trace_macros!(invalid); //~ ERROR
9595
| ^^^^^^^^^^^^^^^^^^^^^^^

0 commit comments

Comments
 (0)