Skip to content

Commit 38a3506

Browse files
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

Lines changed: 4 additions & 0 deletions
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
Lines changed: 8 additions & 3 deletions
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

Lines changed: 4 additions & 0 deletions
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

Lines changed: 4 additions & 4 deletions
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

Lines changed: 4 additions & 0 deletions
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

Lines changed: 3 additions & 3 deletions
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

Lines changed: 4 additions & 0 deletions
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

Lines changed: 1 addition & 1 deletion
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`
Lines changed: 4 additions & 0 deletions
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

Lines changed: 3 additions & 3 deletions
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

0 commit comments

Comments
 (0)