Skip to content

Commit

Permalink
Ignore platforms that can't point to std
Browse files Browse the repository at this point in the history
  • Loading branch information
estebank committed Jan 10, 2020
1 parent 6d97718 commit 38a3506
Show file tree
Hide file tree
Showing 18 changed files with 120 additions and 64 deletions.
4 changes: 4 additions & 0 deletions src/test/ui/derives/deriving-meta-unknown-trait.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
// FIXME: missing sysroot spans (#53081)
// ignore-i586-unknown-linux-gnu
// ignore-i586-unknown-linux-musl
// ignore-i686-unknown-linux-musl
#[derive(Eqr)]
//~^ ERROR cannot find derive macro `Eqr` in this scope
//~| ERROR cannot find derive macro `Eqr` in this scope
Expand Down
11 changes: 8 additions & 3 deletions src/test/ui/derives/deriving-meta-unknown-trait.stderr
Original file line number Diff line number Diff line change
@@ -1,19 +1,24 @@
error: cannot find derive macro `Eqr` in this scope
--> $DIR/deriving-meta-unknown-trait.rs:1:10
--> $DIR/deriving-meta-unknown-trait.rs:5:10
|
LL | #[derive(Eqr)]
| ^^^ help: a derive macro with a similar name exists: `Eq`
|
::: $SRC_DIR/libcore/cmp.rs:LL:COL
|
LL | pub macro Eq($item:item) { /* compiler built-in */ }
LL | pub macro Eq($item:item) {
| ------------------------ similarly named derive macro `Eq` defined here

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

error: aborting due to 2 previous errors

4 changes: 4 additions & 0 deletions src/test/ui/issues/issue-17546.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
// FIXME: missing sysroot spans (#53081)
// ignore-i586-unknown-linux-gnu
// ignore-i586-unknown-linux-musl
// ignore-i686-unknown-linux-musl
use foo::MyEnum::Result;
use foo::NoResult; // Through a re-export

Expand Down
8 changes: 4 additions & 4 deletions src/test/ui/issues/issue-17546.stderr
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
error[E0573]: expected type, found variant `NoResult`
--> $DIR/issue-17546.rs:12:17
--> $DIR/issue-17546.rs:16:17
|
LL | fn new() -> NoResult<MyEnum, String> {
| ^^^^^^^^^^^^^^^^^^^^^^^^
Expand All @@ -19,7 +19,7 @@ LL | fn new() -> Result<MyEnum, String> {
| ^^^^^^

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

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

error[E0573]: expected type, found variant `NoResult`
--> $DIR/issue-17546.rs:33:15
--> $DIR/issue-17546.rs:37:15
|
LL | fn newer() -> NoResult<foo::MyEnum, String> {
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
Expand Down
4 changes: 4 additions & 0 deletions src/test/ui/issues/issue-7607-1.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
// FIXME: missing sysroot spans (#53081)
// ignore-i586-unknown-linux-gnu
// ignore-i586-unknown-linux-musl
// ignore-i686-unknown-linux-musl
struct Foo {
x: isize
}
Expand Down
6 changes: 3 additions & 3 deletions src/test/ui/issues/issue-7607-1.stderr
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
error[E0412]: cannot find type `Fo` in this scope
--> $DIR/issue-7607-1.rs:5:6
--> $DIR/issue-7607-1.rs:9:6
|
LL | impl Fo {
| ^^ help: a trait with a similar name exists: `Fn`
|
::: $SRC_DIR/libcore/ops/function.rs:LL:COL
|
LL | pub trait Fn<Args> : FnMut<Args> {
| -------------------------------- similarly named trait `Fn` defined here
LL | pub trait Fn<Args>: FnMut<Args> {
| ------------------------------- similarly named trait `Fn` defined here

error: aborting due to previous error

Expand Down
4 changes: 4 additions & 0 deletions src/test/ui/macros/macro-name-typo.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
// FIXME: missing sysroot spans (#53081)
// ignore-i586-unknown-linux-gnu
// ignore-i586-unknown-linux-musl
// ignore-i686-unknown-linux-musl
fn main() {
printlx!("oh noes!"); //~ ERROR cannot find
}
2 changes: 1 addition & 1 deletion src/test/ui/macros/macro-name-typo.stderr
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
error: cannot find macro `printlx` in this scope
--> $DIR/macro-name-typo.rs:2:5
--> $DIR/macro-name-typo.rs:6:5
|
LL | printlx!("oh noes!");
| ^^^^^^^ help: a macro with a similar name exists: `println`
Expand Down
4 changes: 4 additions & 0 deletions src/test/ui/macros/macro-path-prelude-fail-3.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
// FIXME: missing sysroot spans (#53081)
// ignore-i586-unknown-linux-gnu
// ignore-i586-unknown-linux-musl
// ignore-i686-unknown-linux-musl
fn main() {
inline!(); //~ ERROR cannot find macro `inline` in this scope
}
6 changes: 3 additions & 3 deletions src/test/ui/macros/macro-path-prelude-fail-3.stderr
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
error: cannot find macro `inline` in this scope
--> $DIR/macro-path-prelude-fail-3.rs:2:5
--> $DIR/macro-path-prelude-fail-3.rs:6:5
|
LL | inline!();
| ^^^^^^ help: a macro with a similar name exists: `line`
|
::: $SRC_DIR/libcore/macros.rs:LL:COL
::: $SRC_DIR/libcore/macros/mod.rs:LL:COL
|
LL | macro_rules! line { () => { /* compiler built-in */ } }
LL | macro_rules! line {
| ----------------- similarly named macro `line` defined here

error: aborting due to previous error
Expand Down
4 changes: 4 additions & 0 deletions src/test/ui/proc-macro/parent-source-spans.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
// FIXME: missing sysroot spans (#53081)
// ignore-i586-unknown-linux-gnu
// ignore-i586-unknown-linux-musl
// ignore-i686-unknown-linux-musl
// aux-build:parent-source-spans.rs
#![feature(decl_macro, proc_macro_hygiene)]

Expand Down
42 changes: 21 additions & 21 deletions src/test/ui/proc-macro/parent-source-spans.stderr
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
error: first final: "hello"
--> $DIR/parent-source-spans.rs:15:12
--> $DIR/parent-source-spans.rs:19:12
|
LL | three!($a, $b);
| ^^
Expand All @@ -8,7 +8,7 @@ LL | one!("hello", "world");
| ----------------------- in this macro invocation

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

error[E0425]: cannot find value `ok` in this scope
--> $DIR/parent-source-spans.rs:28:5
--> $DIR/parent-source-spans.rs:32:5
|
LL | parent_source_spans!($($tokens)*);
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: a tuple variant with a similar name exists: `Ok`
Expand Down
4 changes: 4 additions & 0 deletions src/test/ui/proc-macro/resolve-error.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
// FIXME: missing sysroot spans (#53081)
// ignore-i586-unknown-linux-gnu
// ignore-i586-unknown-linux-musl
// ignore-i686-unknown-linux-musl
// aux-build:derive-foo.rs
// aux-build:derive-clona.rs
// aux-build:test-macros.rs
Expand Down
Loading

0 comments on commit 38a3506

Please sign in to comment.