Skip to content

Commit 38a3506

Browse files
estebankestebank
committed
Ignore platforms that can't point to std
1 parent 6d97718 commit 38a3506

18 files changed

+120
-64
lines changed

‎src/test/ui/derives/deriving-meta-unknown-trait.rs

+4
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
// FIXME: missing sysroot spans (#53081)
2+
// ignore-i586-unknown-linux-gnu
3+
// ignore-i586-unknown-linux-musl
4+
// ignore-i686-unknown-linux-musl
15
#[derive(Eqr)]
26
//~^ ERROR cannot find derive macro `Eqr` in this scope
37
//~| ERROR cannot find derive macro `Eqr` in this scope

‎src/test/ui/derives/deriving-meta-unknown-trait.stderr

+8-3
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,24 @@
11
error: cannot find derive macro `Eqr` in this scope
2-
--> $DIR/deriving-meta-unknown-trait.rs:1:10
2+
--> $DIR/deriving-meta-unknown-trait.rs:5:10
33
|
44
LL | #[derive(Eqr)]
55
| ^^^ help: a derive macro with a similar name exists: `Eq`
66
|
77
::: $SRC_DIR/libcore/cmp.rs:LL:COL
88
|
9-
LL | pub macro Eq($item:item) { /* compiler built-in */ }
9+
LL | pub macro Eq($item:item) {
1010
| ------------------------ similarly named derive macro `Eq` defined here
1111

1212
error: cannot find derive macro `Eqr` in this scope
13-
--> $DIR/deriving-meta-unknown-trait.rs:1:10
13+
--> $DIR/deriving-meta-unknown-trait.rs:5:10
1414
|
1515
LL | #[derive(Eqr)]
1616
| ^^^ help: a derive macro with a similar name exists: `Eq`
17+
|
18+
::: $SRC_DIR/libcore/cmp.rs:LL:COL
19+
|
20+
LL | pub macro Eq($item:item) {
21+
| ------------------------ similarly named derive macro `Eq` defined here
1722

1823
error: aborting due to 2 previous errors
1924

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

+4
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
// FIXME: missing sysroot spans (#53081)
2+
// ignore-i586-unknown-linux-gnu
3+
// ignore-i586-unknown-linux-musl
4+
// ignore-i686-unknown-linux-musl
15
use foo::MyEnum::Result;
26
use foo::NoResult; // Through a re-export
37

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

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error[E0573]: expected type, found variant `NoResult`
2-
--> $DIR/issue-17546.rs:12:17
2+
--> $DIR/issue-17546.rs:16:17
33
|
44
LL | fn new() -> NoResult<MyEnum, String> {
55
| ^^^^^^^^^^^^^^^^^^^^^^^^
@@ -19,7 +19,7 @@ LL | fn new() -> Result<MyEnum, String> {
1919
| ^^^^^^
2020

2121
error[E0573]: expected type, found variant `Result`
22-
--> $DIR/issue-17546.rs:22:17
22+
--> $DIR/issue-17546.rs:26:17
2323
|
2424
LL | fn new() -> Result<foo::MyEnum, String> {
2525
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^ not a type
@@ -37,7 +37,7 @@ LL | use std::result::Result;
3737
and 1 other candidate
3838

3939
error[E0573]: expected type, found variant `Result`
40-
--> $DIR/issue-17546.rs:28:13
40+
--> $DIR/issue-17546.rs:32:13
4141
|
4242
LL | fn new() -> Result<foo::MyEnum, String> {
4343
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^ not a type
@@ -55,7 +55,7 @@ LL | use std::result::Result;
5555
and 1 other candidate
5656

5757
error[E0573]: expected type, found variant `NoResult`
58-
--> $DIR/issue-17546.rs:33:15
58+
--> $DIR/issue-17546.rs:37:15
5959
|
6060
LL | fn newer() -> NoResult<foo::MyEnum, String> {
6161
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

‎src/test/ui/issues/issue-7607-1.rs

+4
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
// FIXME: missing sysroot spans (#53081)
2+
// ignore-i586-unknown-linux-gnu
3+
// ignore-i586-unknown-linux-musl
4+
// ignore-i686-unknown-linux-musl
15
struct Foo {
26
x: isize
37
}

‎src/test/ui/issues/issue-7607-1.stderr

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
error[E0412]: cannot find type `Fo` in this scope
2-
--> $DIR/issue-7607-1.rs:5:6
2+
--> $DIR/issue-7607-1.rs:9:6
33
|
44
LL | impl Fo {
55
| ^^ help: a trait with a similar name exists: `Fn`
66
|
77
::: $SRC_DIR/libcore/ops/function.rs:LL:COL
88
|
9-
LL | pub trait Fn<Args> : FnMut<Args> {
10-
| -------------------------------- similarly named trait `Fn` defined here
9+
LL | pub trait Fn<Args>: FnMut<Args> {
10+
| ------------------------------- similarly named trait `Fn` defined here
1111

1212
error: aborting due to previous error
1313

‎src/test/ui/macros/macro-name-typo.rs

+4
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
// FIXME: missing sysroot spans (#53081)
2+
// ignore-i586-unknown-linux-gnu
3+
// ignore-i586-unknown-linux-musl
4+
// ignore-i686-unknown-linux-musl
15
fn main() {
26
printlx!("oh noes!"); //~ ERROR cannot find
37
}

‎src/test/ui/macros/macro-name-typo.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error: cannot find macro `printlx` in this scope
2-
--> $DIR/macro-name-typo.rs:2:5
2+
--> $DIR/macro-name-typo.rs:6:5
33
|
44
LL | printlx!("oh noes!");
55
| ^^^^^^^ help: a macro with a similar name exists: `println`

‎src/test/ui/macros/macro-path-prelude-fail-3.rs

+4
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
// FIXME: missing sysroot spans (#53081)
2+
// ignore-i586-unknown-linux-gnu
3+
// ignore-i586-unknown-linux-musl
4+
// ignore-i686-unknown-linux-musl
15
fn main() {
26
inline!(); //~ ERROR cannot find macro `inline` in this scope
37
}

‎src/test/ui/macros/macro-path-prelude-fail-3.stderr

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
error: cannot find macro `inline` in this scope
2-
--> $DIR/macro-path-prelude-fail-3.rs:2:5
2+
--> $DIR/macro-path-prelude-fail-3.rs:6:5
33
|
44
LL | inline!();
55
| ^^^^^^ help: a macro with a similar name exists: `line`
66
|
7-
::: $SRC_DIR/libcore/macros.rs:LL:COL
7+
::: $SRC_DIR/libcore/macros/mod.rs:LL:COL
88
|
9-
LL | macro_rules! line { () => { /* compiler built-in */ } }
9+
LL | macro_rules! line {
1010
| ----------------- similarly named macro `line` defined here
1111

1212
error: aborting due to previous error

‎src/test/ui/proc-macro/parent-source-spans.rs

+4
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
// FIXME: missing sysroot spans (#53081)
2+
// ignore-i586-unknown-linux-gnu
3+
// ignore-i586-unknown-linux-musl
4+
// ignore-i686-unknown-linux-musl
15
// aux-build:parent-source-spans.rs
26
#![feature(decl_macro, proc_macro_hygiene)]
37

‎src/test/ui/proc-macro/parent-source-spans.stderr

+21-21
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error: first final: "hello"
2-
--> $DIR/parent-source-spans.rs:15:12
2+
--> $DIR/parent-source-spans.rs:19:12
33
|
44
LL | three!($a, $b);
55
| ^^
@@ -8,7 +8,7 @@ LL | one!("hello", "world");
88
| ----------------------- in this macro invocation
99

1010
error: second final: "world"
11-
--> $DIR/parent-source-spans.rs:15:16
11+
--> $DIR/parent-source-spans.rs:19:16
1212
|
1313
LL | three!($a, $b);
1414
| ^^
@@ -17,7 +17,7 @@ LL | one!("hello", "world");
1717
| ----------------------- in this macro invocation
1818

1919
error: first parent: "hello"
20-
--> $DIR/parent-source-spans.rs:9:5
20+
--> $DIR/parent-source-spans.rs:13:5
2121
|
2222
LL | two!($a, $b);
2323
| ^^^^^^^^^^^^^
@@ -26,7 +26,7 @@ LL | one!("hello", "world");
2626
| ----------------------- in this macro invocation
2727

2828
error: second parent: "world"
29-
--> $DIR/parent-source-spans.rs:9:5
29+
--> $DIR/parent-source-spans.rs:13:5
3030
|
3131
LL | two!($a, $b);
3232
| ^^^^^^^^^^^^^
@@ -35,31 +35,31 @@ LL | one!("hello", "world");
3535
| ----------------------- in this macro invocation
3636

3737
error: first grandparent: "hello"
38-
--> $DIR/parent-source-spans.rs:35:5
38+
--> $DIR/parent-source-spans.rs:39:5
3939
|
4040
LL | one!("hello", "world");
4141
| ^^^^^^^^^^^^^^^^^^^^^^^
4242

4343
error: second grandparent: "world"
44-
--> $DIR/parent-source-spans.rs:35:5
44+
--> $DIR/parent-source-spans.rs:39:5
4545
|
4646
LL | one!("hello", "world");
4747
| ^^^^^^^^^^^^^^^^^^^^^^^
4848

4949
error: first source: "hello"
50-
--> $DIR/parent-source-spans.rs:35:5
50+
--> $DIR/parent-source-spans.rs:39:5
5151
|
5252
LL | one!("hello", "world");
5353
| ^^^^^^^^^^^^^^^^^^^^^^^
5454

5555
error: second source: "world"
56-
--> $DIR/parent-source-spans.rs:35:5
56+
--> $DIR/parent-source-spans.rs:39:5
5757
|
5858
LL | one!("hello", "world");
5959
| ^^^^^^^^^^^^^^^^^^^^^^^
6060

6161
error: first final: "yay"
62-
--> $DIR/parent-source-spans.rs:15:12
62+
--> $DIR/parent-source-spans.rs:19:12
6363
|
6464
LL | three!($a, $b);
6565
| ^^
@@ -68,7 +68,7 @@ LL | two!("yay", "rust");
6868
| -------------------- in this macro invocation
6969

7070
error: second final: "rust"
71-
--> $DIR/parent-source-spans.rs:15:16
71+
--> $DIR/parent-source-spans.rs:19:16
7272
|
7373
LL | three!($a, $b);
7474
| ^^
@@ -77,55 +77,55 @@ LL | two!("yay", "rust");
7777
| -------------------- in this macro invocation
7878

7979
error: first parent: "yay"
80-
--> $DIR/parent-source-spans.rs:41:5
80+
--> $DIR/parent-source-spans.rs:45:5
8181
|
8282
LL | two!("yay", "rust");
8383
| ^^^^^^^^^^^^^^^^^^^^
8484

8585
error: second parent: "rust"
86-
--> $DIR/parent-source-spans.rs:41:5
86+
--> $DIR/parent-source-spans.rs:45:5
8787
|
8888
LL | two!("yay", "rust");
8989
| ^^^^^^^^^^^^^^^^^^^^
9090

9191
error: first source: "yay"
92-
--> $DIR/parent-source-spans.rs:41:5
92+
--> $DIR/parent-source-spans.rs:45:5
9393
|
9494
LL | two!("yay", "rust");
9595
| ^^^^^^^^^^^^^^^^^^^^
9696

9797
error: second source: "rust"
98-
--> $DIR/parent-source-spans.rs:41:5
98+
--> $DIR/parent-source-spans.rs:45:5
9999
|
100100
LL | two!("yay", "rust");
101101
| ^^^^^^^^^^^^^^^^^^^^
102102

103103
error: first final: "hip"
104-
--> $DIR/parent-source-spans.rs:47:12
104+
--> $DIR/parent-source-spans.rs:51:12
105105
|
106106
LL | three!("hip", "hop");
107107
| ^^^^^
108108

109109
error: second final: "hop"
110-
--> $DIR/parent-source-spans.rs:47:19
110+
--> $DIR/parent-source-spans.rs:51:19
111111
|
112112
LL | three!("hip", "hop");
113113
| ^^^^^
114114

115115
error: first source: "hip"
116-
--> $DIR/parent-source-spans.rs:47:12
116+
--> $DIR/parent-source-spans.rs:51:12
117117
|
118118
LL | three!("hip", "hop");
119119
| ^^^^^
120120

121121
error: second source: "hop"
122-
--> $DIR/parent-source-spans.rs:47:19
122+
--> $DIR/parent-source-spans.rs:51:19
123123
|
124124
LL | three!("hip", "hop");
125125
| ^^^^^
126126

127127
error[E0425]: cannot find value `ok` in this scope
128-
--> $DIR/parent-source-spans.rs:28:5
128+
--> $DIR/parent-source-spans.rs:32:5
129129
|
130130
LL | parent_source_spans!($($tokens)*);
131131
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: a tuple variant with a similar name exists: `Ok`
@@ -139,7 +139,7 @@ LL | Ok(#[stable(feature = "rust1", since = "1.0.0")] T),
139139
| --------------------------------------------------- similarly named tuple variant `Ok` defined here
140140

141141
error[E0425]: cannot find value `ok` in this scope
142-
--> $DIR/parent-source-spans.rs:28:5
142+
--> $DIR/parent-source-spans.rs:32:5
143143
|
144144
LL | parent_source_spans!($($tokens)*);
145145
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: a tuple variant with a similar name exists: `Ok`
@@ -153,7 +153,7 @@ LL | Ok(#[stable(feature = "rust1", since = "1.0.0")] T),
153153
| --------------------------------------------------- similarly named tuple variant `Ok` defined here
154154

155155
error[E0425]: cannot find value `ok` in this scope
156-
--> $DIR/parent-source-spans.rs:28:5
156+
--> $DIR/parent-source-spans.rs:32:5
157157
|
158158
LL | parent_source_spans!($($tokens)*);
159159
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: a tuple variant with a similar name exists: `Ok`

‎src/test/ui/proc-macro/resolve-error.rs

+4
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
// FIXME: missing sysroot spans (#53081)
2+
// ignore-i586-unknown-linux-gnu
3+
// ignore-i586-unknown-linux-musl
4+
// ignore-i686-unknown-linux-musl
15
// aux-build:derive-foo.rs
26
// aux-build:derive-clona.rs
37
// aux-build:test-macros.rs

0 commit comments

Comments
 (0)