Skip to content

Commit

Permalink
Rollup merge of rust-lang#56444 - petrochenkov:uifull, r=davidtwco
Browse files Browse the repository at this point in the history
Move compile-fail-fulldeps tests to UI

cc rust-lang#53353

r? @davidtwco
  • Loading branch information
kennytm authored Dec 4, 2018
2 parents 3dfaeab + 3d809d3 commit 2d7e7cf
Show file tree
Hide file tree
Showing 134 changed files with 1,109 additions and 173 deletions.
1 change: 0 additions & 1 deletion src/bootstrap/builder.rs
Original file line number Diff line number Diff line change
Expand Up @@ -389,7 +389,6 @@ impl<'a> Builder<'a> {
test::UiFullDeps,
test::RunPassFullDeps,
test::RunFailFullDeps,
test::CompileFailFullDeps,
test::Rustdoc,
test::Pretty,
test::RunPassPretty,
Expand Down
6 changes: 0 additions & 6 deletions src/bootstrap/test.rs
Original file line number Diff line number Diff line change
Expand Up @@ -833,12 +833,6 @@ host_test!(RunFailFullDeps {
suite: "run-fail-fulldeps"
});

host_test!(CompileFailFullDeps {
path: "src/test/compile-fail-fulldeps",
mode: "compile-fail",
suite: "compile-fail-fulldeps"
});

host_test!(Rustdoc {
path: "src/test/rustdoc",
mode: "rustdoc",
Expand Down
51 changes: 0 additions & 51 deletions src/test/compile-fail-fulldeps/auxiliary/lint_group_plugin_test.rs

This file was deleted.

48 changes: 0 additions & 48 deletions src/test/compile-fail-fulldeps/auxiliary/lint_plugin_test.rs

This file was deleted.

15 changes: 0 additions & 15 deletions src/test/compile-fail-fulldeps/auxiliary/macro_reexport_1.rs

This file was deleted.

23 changes: 0 additions & 23 deletions src/test/compile-fail/proc-macro/auxiliary/derive-clona.rs

This file was deleted.

23 changes: 0 additions & 23 deletions src/test/compile-fail/proc-macro/auxiliary/derive-foo.rs

This file was deleted.

13 changes: 13 additions & 0 deletions src/test/ui-fulldeps/dropck_tarena_cycle_checked.stderr
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
error[E0597]: `arena` does not live long enough
--> $DIR/dropck_tarena_cycle_checked.rs:126:8
|
LL | f(&arena);
| ^^^^^ borrowed value does not live long enough
LL | } //~^ ERROR `arena` does not live long enough
| - `arena` dropped here while still borrowed
|
= note: values in a scope are dropped in the opposite order they are created

error: aborting due to previous error

For more information about this error, try `rustc --explain E0597`.
13 changes: 13 additions & 0 deletions src/test/ui-fulldeps/dropck_tarena_unsound_drop.stderr
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
error[E0597]: `arena` does not live long enough
--> $DIR/dropck_tarena_unsound_drop.rs:51:8
|
LL | f(&arena);
| ^^^^^ borrowed value does not live long enough
LL | } //~^ ERROR `arena` does not live long enough
| - `arena` dropped here while still borrowed
|
= note: values in a scope are dropped in the opposite order they are created

error: aborting due to previous error

For more information about this error, try `rustc --explain E0597`.
File renamed without changes.
11 changes: 11 additions & 0 deletions src/test/ui-fulldeps/gated-plugin.stderr
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
error[E0658]: compiler plugins are experimental and possibly buggy (see issue #29597)
--> $DIR/gated-plugin.rs:13:1
|
LL | #![plugin(macro_crate_test)]
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
= help: add #![feature(plugin)] to the crate attributes to enable

error: aborting due to previous error

For more information about this error, try `rustc --explain E0658`.
File renamed without changes.
80 changes: 80 additions & 0 deletions src/test/ui-fulldeps/gated-quote.stderr
Original file line number Diff line number Diff line change
@@ -0,0 +1,80 @@
error: cannot find macro `quote_path!` in this scope
--> $DIR/gated-quote.rs:65:13
|
LL | let x = quote_path!(ecx, 3);
| ^^^^^^^^^^

error: cannot find macro `quote_meta_item!` in this scope
--> $DIR/gated-quote.rs:63:13
|
LL | let x = quote_meta_item!(ecx, 3);
| ^^^^^^^^^^^^^^^

error: cannot find macro `quote_block!` in this scope
--> $DIR/gated-quote.rs:61:13
|
LL | let x = quote_block!(ecx, 3);
| ^^^^^^^^^^^

error: cannot find macro `quote_arg!` in this scope
--> $DIR/gated-quote.rs:59:13
|
LL | let x = quote_arg!(ecx, 3);
| ^^^^^^^^^

error: cannot find macro `quote_attr!` in this scope
--> $DIR/gated-quote.rs:57:13
|
LL | let x = quote_attr!(ecx, 3);
| ^^^^^^^^^^

error: cannot find macro `quote_stmt!` in this scope
--> $DIR/gated-quote.rs:55:13
|
LL | let x = quote_stmt!(ecx, 3);
| ^^^^^^^^^^

error: cannot find macro `quote_arm!` in this scope
--> $DIR/gated-quote.rs:53:13
|
LL | let x = quote_arm!(ecx, 3);
| ^^^^^^^^^

error: cannot find macro `quote_pat!` in this scope
--> $DIR/gated-quote.rs:51:13
|
LL | let x = quote_pat!(ecx, 3);
| ^^^^^^^^^

error: cannot find macro `quote_item!` in this scope
--> $DIR/gated-quote.rs:49:13
|
LL | let x = quote_item!(ecx, 3);
| ^^^^^^^^^^

error: cannot find macro `quote_method!` in this scope
--> $DIR/gated-quote.rs:47:13
|
LL | let x = quote_method!(ecx, 3);
| ^^^^^^^^^^^^

error: cannot find macro `quote_ty!` in this scope
--> $DIR/gated-quote.rs:45:13
|
LL | let x = quote_ty!(ecx, 3);
| ^^^^^^^^

error: cannot find macro `quote_expr!` in this scope
--> $DIR/gated-quote.rs:43:13
|
LL | let x = quote_expr!(ecx, 3);
| ^^^^^^^^^^

error: cannot find macro `quote_tokens!` in this scope
--> $DIR/gated-quote.rs:41:13
|
LL | let x = quote_tokens!(ecx, 3);
| ^^^^^^^^^^^^

error: aborting due to 13 previous errors

File renamed without changes.
13 changes: 13 additions & 0 deletions src/test/ui-fulldeps/issue-15778-fail.stderr
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
error: crate is not marked with #![crate_okay]
--> $DIR/issue-15778-fail.rs:15:1
|
LL | / #![feature(plugin)] //~ ERROR crate is not marked with #![crate_okay]
LL | | #![plugin(lint_for_crate)]
LL | |
LL | | pub fn main() { }
| |_________________^
|
= note: requested on the command line with `-D crate-not-okay`

error: aborting due to previous error

File renamed without changes.
14 changes: 14 additions & 0 deletions src/test/ui-fulldeps/issue-48941.stderr
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
error: expected unsuffixed literal or identifier, found a
--> $DIR/issue-48941.rs:20:24
|
LL | #[noop_attribute("hi", rank = a)] //~ ERROR expected unsuffixed literal or identifier, found a
| ^^^^

error: expected unsuffixed literal or identifier, found =
--> $DIR/issue-48941.rs:23:27
|
LL | #[noop_attribute("/user", data= = "<user")] //~ ERROR literal or identifier
| ^^^^

error: aborting due to 2 previous errors

18 changes: 18 additions & 0 deletions src/test/ui-fulldeps/lint-group-plugin-deny-cmdline.stderr
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
error: item is named 'lintme'
--> $DIR/lint-group-plugin-deny-cmdline.rs:18:1
|
LL | fn lintme() { } //~ ERROR item is named 'lintme'
| ^^^^^^^^^^^^^^^
|
= note: `-D test-lint` implied by `-D lint-me`

error: item is named 'pleaselintme'
--> $DIR/lint-group-plugin-deny-cmdline.rs:20:1
|
LL | fn pleaselintme() { } //~ ERROR item is named 'pleaselintme'
| ^^^^^^^^^^^^^^^^^^^^^
|
= note: `-D please-lint` implied by `-D lint-me`

error: aborting due to 2 previous errors

14 changes: 14 additions & 0 deletions src/test/ui-fulldeps/lint-plugin-deny-attr.stderr
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
error: item is named 'lintme'
--> $DIR/lint-plugin-deny-attr.rs:18:1
|
LL | fn lintme() { } //~ ERROR item is named 'lintme'
| ^^^^^^^^^^^^^^^
|
note: lint level defined here
--> $DIR/lint-plugin-deny-attr.rs:16:9
|
LL | #![deny(test_lint)]
| ^^^^^^^^^

error: aborting due to previous error

10 changes: 10 additions & 0 deletions src/test/ui-fulldeps/lint-plugin-deny-cmdline.stderr
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
error: item is named 'lintme'
--> $DIR/lint-plugin-deny-cmdline.rs:18:1
|
LL | fn lintme() { } //~ ERROR item is named 'lintme'
| ^^^^^^^^^^^^^^^
|
= note: requested on the command line with `-D test-lint`

error: aborting due to previous error

Loading

0 comments on commit 2d7e7cf

Please sign in to comment.