Skip to content

Commit 2d7e7cf

Browse files
authored
Rollup merge of rust-lang#56444 - petrochenkov:uifull, r=davidtwco
Move compile-fail-fulldeps tests to UI cc rust-lang#53353 r? @davidtwco
2 parents 3dfaeab + 3d809d3 commit 2d7e7cf

File tree

134 files changed

+1109
-173
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

134 files changed

+1109
-173
lines changed

src/bootstrap/builder.rs

-1
Original file line numberDiff line numberDiff line change
@@ -389,7 +389,6 @@ impl<'a> Builder<'a> {
389389
test::UiFullDeps,
390390
test::RunPassFullDeps,
391391
test::RunFailFullDeps,
392-
test::CompileFailFullDeps,
393392
test::Rustdoc,
394393
test::Pretty,
395394
test::RunPassPretty,

src/bootstrap/test.rs

-6
Original file line numberDiff line numberDiff line change
@@ -833,12 +833,6 @@ host_test!(RunFailFullDeps {
833833
suite: "run-fail-fulldeps"
834834
});
835835

836-
host_test!(CompileFailFullDeps {
837-
path: "src/test/compile-fail-fulldeps",
838-
mode: "compile-fail",
839-
suite: "compile-fail-fulldeps"
840-
});
841-
842836
host_test!(Rustdoc {
843837
path: "src/test/rustdoc",
844838
mode: "rustdoc",

src/test/compile-fail-fulldeps/auxiliary/lint_group_plugin_test.rs

-51
This file was deleted.

src/test/compile-fail-fulldeps/auxiliary/lint_plugin_test.rs

-48
This file was deleted.

src/test/compile-fail-fulldeps/auxiliary/macro_reexport_1.rs

-15
This file was deleted.

src/test/compile-fail/proc-macro/auxiliary/derive-clona.rs

-23
This file was deleted.

src/test/compile-fail/proc-macro/auxiliary/derive-foo.rs

-23
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
error[E0597]: `arena` does not live long enough
2+
--> $DIR/dropck_tarena_cycle_checked.rs:126:8
3+
|
4+
LL | f(&arena);
5+
| ^^^^^ borrowed value does not live long enough
6+
LL | } //~^ ERROR `arena` does not live long enough
7+
| - `arena` dropped here while still borrowed
8+
|
9+
= note: values in a scope are dropped in the opposite order they are created
10+
11+
error: aborting due to previous error
12+
13+
For more information about this error, try `rustc --explain E0597`.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
error[E0597]: `arena` does not live long enough
2+
--> $DIR/dropck_tarena_unsound_drop.rs:51:8
3+
|
4+
LL | f(&arena);
5+
| ^^^^^ borrowed value does not live long enough
6+
LL | } //~^ ERROR `arena` does not live long enough
7+
| - `arena` dropped here while still borrowed
8+
|
9+
= note: values in a scope are dropped in the opposite order they are created
10+
11+
error: aborting due to previous error
12+
13+
For more information about this error, try `rustc --explain E0597`.
+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
error[E0658]: compiler plugins are experimental and possibly buggy (see issue #29597)
2+
--> $DIR/gated-plugin.rs:13:1
3+
|
4+
LL | #![plugin(macro_crate_test)]
5+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
6+
|
7+
= help: add #![feature(plugin)] to the crate attributes to enable
8+
9+
error: aborting due to previous error
10+
11+
For more information about this error, try `rustc --explain E0658`.
+80
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,80 @@
1+
error: cannot find macro `quote_path!` in this scope
2+
--> $DIR/gated-quote.rs:65:13
3+
|
4+
LL | let x = quote_path!(ecx, 3);
5+
| ^^^^^^^^^^
6+
7+
error: cannot find macro `quote_meta_item!` in this scope
8+
--> $DIR/gated-quote.rs:63:13
9+
|
10+
LL | let x = quote_meta_item!(ecx, 3);
11+
| ^^^^^^^^^^^^^^^
12+
13+
error: cannot find macro `quote_block!` in this scope
14+
--> $DIR/gated-quote.rs:61:13
15+
|
16+
LL | let x = quote_block!(ecx, 3);
17+
| ^^^^^^^^^^^
18+
19+
error: cannot find macro `quote_arg!` in this scope
20+
--> $DIR/gated-quote.rs:59:13
21+
|
22+
LL | let x = quote_arg!(ecx, 3);
23+
| ^^^^^^^^^
24+
25+
error: cannot find macro `quote_attr!` in this scope
26+
--> $DIR/gated-quote.rs:57:13
27+
|
28+
LL | let x = quote_attr!(ecx, 3);
29+
| ^^^^^^^^^^
30+
31+
error: cannot find macro `quote_stmt!` in this scope
32+
--> $DIR/gated-quote.rs:55:13
33+
|
34+
LL | let x = quote_stmt!(ecx, 3);
35+
| ^^^^^^^^^^
36+
37+
error: cannot find macro `quote_arm!` in this scope
38+
--> $DIR/gated-quote.rs:53:13
39+
|
40+
LL | let x = quote_arm!(ecx, 3);
41+
| ^^^^^^^^^
42+
43+
error: cannot find macro `quote_pat!` in this scope
44+
--> $DIR/gated-quote.rs:51:13
45+
|
46+
LL | let x = quote_pat!(ecx, 3);
47+
| ^^^^^^^^^
48+
49+
error: cannot find macro `quote_item!` in this scope
50+
--> $DIR/gated-quote.rs:49:13
51+
|
52+
LL | let x = quote_item!(ecx, 3);
53+
| ^^^^^^^^^^
54+
55+
error: cannot find macro `quote_method!` in this scope
56+
--> $DIR/gated-quote.rs:47:13
57+
|
58+
LL | let x = quote_method!(ecx, 3);
59+
| ^^^^^^^^^^^^
60+
61+
error: cannot find macro `quote_ty!` in this scope
62+
--> $DIR/gated-quote.rs:45:13
63+
|
64+
LL | let x = quote_ty!(ecx, 3);
65+
| ^^^^^^^^
66+
67+
error: cannot find macro `quote_expr!` in this scope
68+
--> $DIR/gated-quote.rs:43:13
69+
|
70+
LL | let x = quote_expr!(ecx, 3);
71+
| ^^^^^^^^^^
72+
73+
error: cannot find macro `quote_tokens!` in this scope
74+
--> $DIR/gated-quote.rs:41:13
75+
|
76+
LL | let x = quote_tokens!(ecx, 3);
77+
| ^^^^^^^^^^^^
78+
79+
error: aborting due to 13 previous errors
80+
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
error: crate is not marked with #![crate_okay]
2+
--> $DIR/issue-15778-fail.rs:15:1
3+
|
4+
LL | / #![feature(plugin)] //~ ERROR crate is not marked with #![crate_okay]
5+
LL | | #![plugin(lint_for_crate)]
6+
LL | |
7+
LL | | pub fn main() { }
8+
| |_________________^
9+
|
10+
= note: requested on the command line with `-D crate-not-okay`
11+
12+
error: aborting due to previous error
13+
+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
error: expected unsuffixed literal or identifier, found a
2+
--> $DIR/issue-48941.rs:20:24
3+
|
4+
LL | #[noop_attribute("hi", rank = a)] //~ ERROR expected unsuffixed literal or identifier, found a
5+
| ^^^^
6+
7+
error: expected unsuffixed literal or identifier, found =
8+
--> $DIR/issue-48941.rs:23:27
9+
|
10+
LL | #[noop_attribute("/user", data= = "<user")] //~ ERROR literal or identifier
11+
| ^^^^
12+
13+
error: aborting due to 2 previous errors
14+
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
error: item is named 'lintme'
2+
--> $DIR/lint-group-plugin-deny-cmdline.rs:18:1
3+
|
4+
LL | fn lintme() { } //~ ERROR item is named 'lintme'
5+
| ^^^^^^^^^^^^^^^
6+
|
7+
= note: `-D test-lint` implied by `-D lint-me`
8+
9+
error: item is named 'pleaselintme'
10+
--> $DIR/lint-group-plugin-deny-cmdline.rs:20:1
11+
|
12+
LL | fn pleaselintme() { } //~ ERROR item is named 'pleaselintme'
13+
| ^^^^^^^^^^^^^^^^^^^^^
14+
|
15+
= note: `-D please-lint` implied by `-D lint-me`
16+
17+
error: aborting due to 2 previous errors
18+
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
error: item is named 'lintme'
2+
--> $DIR/lint-plugin-deny-attr.rs:18:1
3+
|
4+
LL | fn lintme() { } //~ ERROR item is named 'lintme'
5+
| ^^^^^^^^^^^^^^^
6+
|
7+
note: lint level defined here
8+
--> $DIR/lint-plugin-deny-attr.rs:16:9
9+
|
10+
LL | #![deny(test_lint)]
11+
| ^^^^^^^^^
12+
13+
error: aborting due to previous error
14+
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
error: item is named 'lintme'
2+
--> $DIR/lint-plugin-deny-cmdline.rs:18:1
3+
|
4+
LL | fn lintme() { } //~ ERROR item is named 'lintme'
5+
| ^^^^^^^^^^^^^^^
6+
|
7+
= note: requested on the command line with `-D test-lint`
8+
9+
error: aborting due to previous error
10+

0 commit comments

Comments
 (0)