From d3f8b8be6fd5986af33f26768394cea386b686b5 Mon Sep 17 00:00:00 2001 From: Vadim Petrochenkov Date: Sat, 7 Apr 2018 17:28:31 +0300 Subject: [PATCH] Move hygiene tests to UI --- .../hygiene/assoc_item_ctxt.rs | 0 src/test/ui/hygiene/assoc_item_ctxt.stderr | 25 ++++++++++ .../hygiene/assoc_ty_bindings.rs | 0 src/test/ui/hygiene/assoc_ty_bindings.stderr | 8 +++ .../hygiene/auxiliary/intercrate.rs | 0 .../{compile-fail => ui}/hygiene/fields.rs | 0 src/test/ui/hygiene/fields.stderr | 38 ++++++++++++++ .../hygiene/for-loop.rs} | 0 src/test/ui/hygiene/for-loop.stderr | 9 ++++ .../{compile-fail => ui}/hygiene/globs.rs | 0 src/test/ui/hygiene/globs.stderr | 49 +++++++++++++++++++ .../hygiene/impl_items.rs | 0 src/test/ui/hygiene/impl_items.stderr | 11 +++++ .../hygiene/intercrate.rs | 0 src/test/ui/hygiene/intercrate.stderr | 10 ++++ .../hygiene/nested_macro_privacy.rs | 0 .../ui/hygiene/nested_macro_privacy.stderr | 9 ++++ .../hygiene/no_implicit_prelude.rs | 0 .../ui/hygiene/no_implicit_prelude.stderr | 30 ++++++++++++ .../hygiene/pattern-macro.rs} | 0 src/test/ui/hygiene/pattern-macro.stderr | 9 ++++ .../{compile-fail => ui}/hygiene/privacy.rs | 0 src/test/ui/hygiene/privacy.stderr | 9 ++++ .../hygiene/trait_items.rs | 0 src/test/ui/hygiene/trait_items.stderr | 16 ++++++ 25 files changed, 223 insertions(+) rename src/test/{compile-fail => ui}/hygiene/assoc_item_ctxt.rs (100%) create mode 100644 src/test/ui/hygiene/assoc_item_ctxt.stderr rename src/test/{compile-fail => ui}/hygiene/assoc_ty_bindings.rs (100%) create mode 100644 src/test/ui/hygiene/assoc_ty_bindings.stderr rename src/test/{compile-fail => ui}/hygiene/auxiliary/intercrate.rs (100%) rename src/test/{compile-fail => ui}/hygiene/fields.rs (100%) create mode 100644 src/test/ui/hygiene/fields.stderr rename src/test/{compile-fail/for-loop-hygiene.rs => ui/hygiene/for-loop.rs} (100%) create mode 100644 src/test/ui/hygiene/for-loop.stderr rename src/test/{compile-fail => ui}/hygiene/globs.rs (100%) create mode 100644 src/test/ui/hygiene/globs.stderr rename src/test/{compile-fail => ui}/hygiene/impl_items.rs (100%) create mode 100644 src/test/ui/hygiene/impl_items.stderr rename src/test/{compile-fail => ui}/hygiene/intercrate.rs (100%) create mode 100644 src/test/ui/hygiene/intercrate.stderr rename src/test/{compile-fail => ui}/hygiene/nested_macro_privacy.rs (100%) create mode 100644 src/test/ui/hygiene/nested_macro_privacy.stderr rename src/test/{compile-fail => ui}/hygiene/no_implicit_prelude.rs (100%) create mode 100644 src/test/ui/hygiene/no_implicit_prelude.stderr rename src/test/{compile-fail/pattern-macro-hygiene.rs => ui/hygiene/pattern-macro.rs} (100%) create mode 100644 src/test/ui/hygiene/pattern-macro.stderr rename src/test/{compile-fail => ui}/hygiene/privacy.rs (100%) create mode 100644 src/test/ui/hygiene/privacy.stderr rename src/test/{compile-fail => ui}/hygiene/trait_items.rs (100%) create mode 100644 src/test/ui/hygiene/trait_items.stderr diff --git a/src/test/compile-fail/hygiene/assoc_item_ctxt.rs b/src/test/ui/hygiene/assoc_item_ctxt.rs similarity index 100% rename from src/test/compile-fail/hygiene/assoc_item_ctxt.rs rename to src/test/ui/hygiene/assoc_item_ctxt.rs diff --git a/src/test/ui/hygiene/assoc_item_ctxt.stderr b/src/test/ui/hygiene/assoc_item_ctxt.stderr new file mode 100644 index 000000000000..8b410405ae5c --- /dev/null +++ b/src/test/ui/hygiene/assoc_item_ctxt.stderr @@ -0,0 +1,25 @@ +error[E0407]: method `method` is not a member of trait `Tr` + --> $DIR/assoc_item_ctxt.rs:45:13 + | +LL | fn method() {} //~ ERROR method `method` is not a member of trait `Tr` + | ^^^^^^^^^^^^^^ not a member of trait `Tr` +... +LL | mac_trait_impl!(); + | ------------------ in this macro invocation + +error[E0046]: not all trait items implemented, missing: `method` + --> $DIR/assoc_item_ctxt.rs:44:9 + | +LL | fn method(); + | ------------ `method` from trait +... +LL | impl Tr for u8 { //~ ERROR not all trait items implemented, missing: `method` + | ^^^^^^^^^^^^^^ missing `method` in implementation +... +LL | mac_trait_impl!(); + | ------------------ in this macro invocation + +error: aborting due to 2 previous errors + +Some errors occurred: E0046, E0407. +For more information about an error, try `rustc --explain E0046`. diff --git a/src/test/compile-fail/hygiene/assoc_ty_bindings.rs b/src/test/ui/hygiene/assoc_ty_bindings.rs similarity index 100% rename from src/test/compile-fail/hygiene/assoc_ty_bindings.rs rename to src/test/ui/hygiene/assoc_ty_bindings.rs diff --git a/src/test/ui/hygiene/assoc_ty_bindings.stderr b/src/test/ui/hygiene/assoc_ty_bindings.stderr new file mode 100644 index 000000000000..0adf80994f7f --- /dev/null +++ b/src/test/ui/hygiene/assoc_ty_bindings.stderr @@ -0,0 +1,8 @@ +error: compilation successful + --> $DIR/assoc_ty_bindings.rs:49:1 + | +LL | fn main() {} //~ ERROR compilation successful + | ^^^^^^^^^^^^ + +error: aborting due to previous error + diff --git a/src/test/compile-fail/hygiene/auxiliary/intercrate.rs b/src/test/ui/hygiene/auxiliary/intercrate.rs similarity index 100% rename from src/test/compile-fail/hygiene/auxiliary/intercrate.rs rename to src/test/ui/hygiene/auxiliary/intercrate.rs diff --git a/src/test/compile-fail/hygiene/fields.rs b/src/test/ui/hygiene/fields.rs similarity index 100% rename from src/test/compile-fail/hygiene/fields.rs rename to src/test/ui/hygiene/fields.rs diff --git a/src/test/ui/hygiene/fields.stderr b/src/test/ui/hygiene/fields.stderr new file mode 100644 index 000000000000..c4be1834c04f --- /dev/null +++ b/src/test/ui/hygiene/fields.stderr @@ -0,0 +1,38 @@ +error: type `foo::S` is private + --> $DIR/fields.rs:25:17 + | +LL | let s = S { x: 0 }; //~ ERROR type `foo::S` is private + | ^^^^^^^^^^ +... +LL | let s = foo::m!(S, x); + | ------------- in this macro invocation + +error: type `foo::S` is private + --> $DIR/fields.rs:26:17 + | +LL | let _ = s.x; //~ ERROR type `foo::S` is private + | ^ +... +LL | let s = foo::m!(S, x); + | ------------- in this macro invocation + +error: type `foo::T` is private + --> $DIR/fields.rs:28:17 + | +LL | let t = T(0); //~ ERROR type `foo::T` is private + | ^^^^ +... +LL | let s = foo::m!(S, x); + | ------------- in this macro invocation + +error: type `foo::T` is private + --> $DIR/fields.rs:29:17 + | +LL | let _ = t.0; //~ ERROR type `foo::T` is private + | ^ +... +LL | let s = foo::m!(S, x); + | ------------- in this macro invocation + +error: aborting due to 4 previous errors + diff --git a/src/test/compile-fail/for-loop-hygiene.rs b/src/test/ui/hygiene/for-loop.rs similarity index 100% rename from src/test/compile-fail/for-loop-hygiene.rs rename to src/test/ui/hygiene/for-loop.rs diff --git a/src/test/ui/hygiene/for-loop.stderr b/src/test/ui/hygiene/for-loop.stderr new file mode 100644 index 000000000000..7e606b2358c1 --- /dev/null +++ b/src/test/ui/hygiene/for-loop.stderr @@ -0,0 +1,9 @@ +error[E0425]: cannot find value `iter` in this scope + --> $DIR/for-loop.rs:16:9 + | +LL | iter.next(); //~ ERROR cannot find value `iter` in this scope + | ^^^^ not found in this scope + +error: aborting due to previous error + +For more information about this error, try `rustc --explain E0425`. diff --git a/src/test/compile-fail/hygiene/globs.rs b/src/test/ui/hygiene/globs.rs similarity index 100% rename from src/test/compile-fail/hygiene/globs.rs rename to src/test/ui/hygiene/globs.rs diff --git a/src/test/ui/hygiene/globs.stderr b/src/test/ui/hygiene/globs.stderr new file mode 100644 index 000000000000..d77242e135dd --- /dev/null +++ b/src/test/ui/hygiene/globs.stderr @@ -0,0 +1,49 @@ +error[E0425]: cannot find function `f` in this scope + --> $DIR/globs.rs:32:9 + | +LL | f(); //~ ERROR cannot find function `f` in this scope + | ^ not found in this scope +help: possible candidates are found in other modules, you can import them into scope + | +LL | use foo::f; + | +LL | use foo::f; + | +LL | use foo::f; + | + +error[E0425]: cannot find function `g` in this scope + --> $DIR/globs.rs:25:5 + | +LL | g(); //~ ERROR cannot find function `g` in this scope + | ^ not found in this scope +... +LL | / m! { +LL | | use bar::*; +LL | | g(); +LL | | f(); //~ ERROR cannot find function `f` in this scope +LL | | } + | |_____- in this macro invocation +help: possible candidates are found in other modules, you can import them into scope + | +LL | use bar::g; + | +LL | use foo::test2::test::g; + | +LL | use foo::test::g; + | +LL | use foo::test::g; + | + +error[E0425]: cannot find function `f` in this scope + --> $DIR/globs.rs:64:17 + | +LL | n!(f); + | ------ in this macro invocation +... +LL | f //~ ERROR cannot find function `f` in this scope + | ^ not found in this scope + +error: aborting due to 3 previous errors + +For more information about this error, try `rustc --explain E0425`. diff --git a/src/test/compile-fail/hygiene/impl_items.rs b/src/test/ui/hygiene/impl_items.rs similarity index 100% rename from src/test/compile-fail/hygiene/impl_items.rs rename to src/test/ui/hygiene/impl_items.rs diff --git a/src/test/ui/hygiene/impl_items.stderr b/src/test/ui/hygiene/impl_items.stderr new file mode 100644 index 000000000000..dbcf53554cf2 --- /dev/null +++ b/src/test/ui/hygiene/impl_items.stderr @@ -0,0 +1,11 @@ +error: type `for<'r> fn(&'r foo::S) {foo::S::f}` is private + --> $DIR/impl_items.rs:22:23 + | +LL | let _: () = S.f(); //~ ERROR type `for<'r> fn(&'r foo::S) {foo::S::f}` is private + | ^ +... +LL | foo::m!(); + | ---------- in this macro invocation + +error: aborting due to previous error + diff --git a/src/test/compile-fail/hygiene/intercrate.rs b/src/test/ui/hygiene/intercrate.rs similarity index 100% rename from src/test/compile-fail/hygiene/intercrate.rs rename to src/test/ui/hygiene/intercrate.rs diff --git a/src/test/ui/hygiene/intercrate.stderr b/src/test/ui/hygiene/intercrate.stderr new file mode 100644 index 000000000000..ecbc6e7b1472 --- /dev/null +++ b/src/test/ui/hygiene/intercrate.stderr @@ -0,0 +1,10 @@ +error: type `fn() -> u32 {intercrate::foo::bar::f}` is private + --> $DIR/intercrate.rs:22:16 + | +LL | assert_eq!(intercrate::foo::m!(), 1); + | ^^^^^^^^^^^^^^^^^^^^^ + | + = note: this error originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info) + +error: aborting due to previous error + diff --git a/src/test/compile-fail/hygiene/nested_macro_privacy.rs b/src/test/ui/hygiene/nested_macro_privacy.rs similarity index 100% rename from src/test/compile-fail/hygiene/nested_macro_privacy.rs rename to src/test/ui/hygiene/nested_macro_privacy.rs diff --git a/src/test/ui/hygiene/nested_macro_privacy.stderr b/src/test/ui/hygiene/nested_macro_privacy.stderr new file mode 100644 index 000000000000..1179065b94cd --- /dev/null +++ b/src/test/ui/hygiene/nested_macro_privacy.stderr @@ -0,0 +1,9 @@ +error[E0616]: field `i` of struct `foo::S` is private + --> $DIR/nested_macro_privacy.rs:25:5 + | +LL | S::default().i; //~ ERROR field `i` of struct `foo::S` is private + | ^^^^^^^^^^^^^^ + +error: aborting due to previous error + +For more information about this error, try `rustc --explain E0616`. diff --git a/src/test/compile-fail/hygiene/no_implicit_prelude.rs b/src/test/ui/hygiene/no_implicit_prelude.rs similarity index 100% rename from src/test/compile-fail/hygiene/no_implicit_prelude.rs rename to src/test/ui/hygiene/no_implicit_prelude.rs diff --git a/src/test/ui/hygiene/no_implicit_prelude.stderr b/src/test/ui/hygiene/no_implicit_prelude.stderr new file mode 100644 index 000000000000..5753d1a32f74 --- /dev/null +++ b/src/test/ui/hygiene/no_implicit_prelude.stderr @@ -0,0 +1,30 @@ +error[E0433]: failed to resolve. Use of undeclared type or module `Vec` + --> $DIR/no_implicit_prelude.rs:21:9 + | +LL | fn f() { ::bar::m!(); } + | ------------ in this macro invocation +... +LL | Vec::new(); //~ ERROR failed to resolve + | ^^^ Use of undeclared type or module `Vec` + +error[E0601]: `main` function not found in crate `no_implicit_prelude` + | + = note: consider adding a `main` function to `$DIR/no_implicit_prelude.rs` + +error[E0599]: no method named `clone` found for type `()` in the current scope + --> $DIR/no_implicit_prelude.rs:22:12 + | +LL | fn f() { ::bar::m!(); } + | ------------ in this macro invocation +... +LL | ().clone() //~ ERROR no method named `clone` found + | ^^^^^ + | + = help: items from traits can only be used if the trait is in scope + = note: the following trait is implemented but not in scope, perhaps add a `use` for it: + candidate #1: `use std::clone::Clone;` + +error: aborting due to 3 previous errors + +Some errors occurred: E0433, E0599, E0601. +For more information about an error, try `rustc --explain E0433`. diff --git a/src/test/compile-fail/pattern-macro-hygiene.rs b/src/test/ui/hygiene/pattern-macro.rs similarity index 100% rename from src/test/compile-fail/pattern-macro-hygiene.rs rename to src/test/ui/hygiene/pattern-macro.rs diff --git a/src/test/ui/hygiene/pattern-macro.stderr b/src/test/ui/hygiene/pattern-macro.stderr new file mode 100644 index 000000000000..b26084db02e9 --- /dev/null +++ b/src/test/ui/hygiene/pattern-macro.stderr @@ -0,0 +1,9 @@ +error[E0425]: cannot find value `x` in this scope + --> $DIR/pattern-macro.rs:15:5 + | +LL | x + 1; //~ ERROR cannot find value `x` in this scope + | ^ not found in this scope + +error: aborting due to previous error + +For more information about this error, try `rustc --explain E0425`. diff --git a/src/test/compile-fail/hygiene/privacy.rs b/src/test/ui/hygiene/privacy.rs similarity index 100% rename from src/test/compile-fail/hygiene/privacy.rs rename to src/test/ui/hygiene/privacy.rs diff --git a/src/test/ui/hygiene/privacy.stderr b/src/test/ui/hygiene/privacy.stderr new file mode 100644 index 000000000000..808d244e9cdb --- /dev/null +++ b/src/test/ui/hygiene/privacy.stderr @@ -0,0 +1,9 @@ +error[E0603]: function `f` is private + --> $DIR/privacy.rs:26:9 + | +LL | foo::f() //~ ERROR `f` is private + | ^^^^^^ + +error: aborting due to previous error + +For more information about this error, try `rustc --explain E0603`. diff --git a/src/test/compile-fail/hygiene/trait_items.rs b/src/test/ui/hygiene/trait_items.rs similarity index 100% rename from src/test/compile-fail/hygiene/trait_items.rs rename to src/test/ui/hygiene/trait_items.rs diff --git a/src/test/ui/hygiene/trait_items.stderr b/src/test/ui/hygiene/trait_items.stderr new file mode 100644 index 000000000000..56d9c585d6f8 --- /dev/null +++ b/src/test/ui/hygiene/trait_items.stderr @@ -0,0 +1,16 @@ +error[E0599]: no method named `f` found for type `()` in the current scope + --> $DIR/trait_items.rs:27:24 + | +LL | fn f() { ::baz::m!(); } + | ------------ in this macro invocation +... +LL | pub macro m() { ().f() } //~ ERROR no method named `f` found for type `()` in the current scope + | ^ + | + = help: items from traits can only be used if the trait is in scope + = note: the following trait is implemented but not in scope, perhaps add a `use` for it: + candidate #1: `use foo::T;` + +error: aborting due to previous error + +For more information about this error, try `rustc --explain E0599`.