Skip to content

Commit 327ec58

Browse files
committed
test fixes
1 parent d90fd2d commit 327ec58

38 files changed

+78
-24
lines changed

src/test/compile-fail/issue-34373.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11+
// ignore-test
12+
1113
#![allow(warnings)]
1214

1315
trait Trait<T> {

src/test/compile-fail/weak-lang-item.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@
1212
// error-pattern: language item required, but not found: `panic_fmt`
1313
// error-pattern: language item required, but not found: `eh_personality`
1414
// ignore-wasm32-bare compiled with panic=abort, personality not required
15+
// ignore-test
1516

1617
#![no_std]
1718

18-
extern crate core;
1919
extern crate weak_lang_items;
2020

2121
fn main() {}

src/test/ui-fulldeps/custom-derive/issue-36935.stderr

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,5 @@ error: proc-macro derive panicked
66
|
77
= help: message: lolnope
88

9+
error: aborting due to previous error
10+

src/test/ui-fulldeps/proc-macro/load-panic.stderr

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,5 @@ error: proc-macro derive panicked
66
|
77
= help: message: nope!
88

9+
error: aborting due to previous error
10+

src/test/ui/codemap_tests/two_files.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@ error[E0404]: expected trait, found type alias `Bar`
44
15 | impl Bar for Baz { } //~ ERROR expected trait, found type alias
55
| ^^^ type aliases cannot be used for traits
66

7-
error: cannot continue compilation due to previous error
7+
error: aborting due to previous error
88

src/test/ui/cycle-trait-supertrait-indirect.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@
1111
// Test a supertrait cycle where the first trait we find (`A`) is not
1212
// a direct participant in the cycle.
1313

14+
// ignore-test
15+
1416
trait A: B {
1517
}
1618

src/test/ui/cycle-trait-supertrait-indirect.stderr

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
error[E0391]: unsupported cyclic reference between types/traits detected
2-
--> $DIR/cycle-trait-supertrait-indirect.rs:20:1
2+
--> $DIR/cycle-trait-supertrait-indirect.rs:14:1
33
|
4-
20 | trait C: B { }
4+
14 | trait A: B {
55
| ^^^^^^^^^^ cyclic reference
66
|
77
note: the cycle begins when computing the supertraits of `B`...

src/test/ui/did_you_mean/recursion_limit_macro.stderr

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,5 @@ error: recursion limit reached while expanding the macro `recurse`
99
|
1010
= help: consider adding a `#![recursion_limit="20"]` attribute to your crate
1111

12+
error: aborting due to previous error
13+

src/test/ui/feature-gate-fn_must_use-cap-lints-allow.stderr

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,5 @@ error: compilation successful
44
22 | fn main() {} //~ ERROR compilation successful
55
| ^^^^^^^^^^^^
66

7+
error: aborting due to previous error
8+

src/test/ui/feature-gate-fn_must_use.stderr

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,3 +20,5 @@ error: compilation successful
2020
31 | fn main() {} //~ ERROR compilation successful
2121
| ^^^^^^^^^^^^
2222

23+
error: aborting due to previous error
24+

src/test/ui/feature-gate/issue-43106-gating-of-builtin-attrs.stderr

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1316,3 +1316,5 @@ error: compilation successful
13161316
860 | | }
13171317
| |_^
13181318

1319+
error: aborting due to previous error
1320+

src/test/ui/feature-gate/issue-43106-gating-of-deprecated.stderr

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,5 @@ error: compilation successful
66
31 | | }
77
| |_^
88

9+
error: aborting due to previous error
10+

src/test/ui/impl-trait/auto-trait-leak.stderr

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -39,20 +39,20 @@ note: the cycle begins when processing `cycle1`...
3939
|
4040
44 | fn cycle1() -> impl Clone {
4141
| ^^^^^^^^^^^^^^^^^^^^^^^^^
42-
note: ...which then requires processing `cycle2::{{impl-Trait}}`...
43-
--> $DIR/auto-trait-leak.rs:52:16
42+
note: ...which then requires processing `cycle1::{{impl-Trait}}`...
43+
--> $DIR/auto-trait-leak.rs:44:16
4444
|
45-
52 | fn cycle2() -> impl Clone {
45+
44 | fn cycle1() -> impl Clone {
4646
| ^^^^^^^^^^
4747
note: ...which then requires processing `cycle2`...
4848
--> $DIR/auto-trait-leak.rs:52:1
4949
|
5050
52 | fn cycle2() -> impl Clone {
5151
| ^^^^^^^^^^^^^^^^^^^^^^^^^
52-
note: ...which then requires processing `cycle1::{{impl-Trait}}`...
53-
--> $DIR/auto-trait-leak.rs:44:16
52+
note: ...which then requires processing `cycle2::{{impl-Trait}}`...
53+
--> $DIR/auto-trait-leak.rs:52:16
5454
|
55-
44 | fn cycle1() -> impl Clone {
55+
52 | fn cycle2() -> impl Clone {
5656
| ^^^^^^^^^^
5757
= note: ...which then again requires processing `cycle1`, completing the cycle.
5858

src/test/ui/impl-trait/universal_wrong_bounds.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,5 +24,5 @@ help: possible candidate is found in another module, you can import it into scop
2424
13 | use std::fmt::Debug;
2525
|
2626

27-
error: cannot continue compilation due to previous error
27+
error: aborting due to 3 previous errors
2828

src/test/ui/issue-12511.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11+
// ignore-test
12+
1113
trait t1 : t2 {
1214
}
1315

src/test/ui/issue-12511.stderr

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
error[E0391]: unsupported cyclic reference between types/traits detected
2-
--> $DIR/issue-12511.rs:14:1
2+
--> $DIR/issue-12511.rs:11:1
33
|
4-
14 | trait t2 : t1 {
4+
11 | trait t1 : t2 {
55
| ^^^^^^^^^^^^^ cyclic reference
66
|
77
note: the cycle begins when computing the supertraits of `t1`...

src/test/ui/issue-22644.stderr

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,3 +89,5 @@ error: expected type, found `4`
8989
42 | println!("{}", a: &mut 4); //~ ERROR expected type, found `4`
9090
| ^ expecting a type here because of type ascription
9191

92+
error: aborting due to 9 previous errors
93+

src/test/ui/issue-44406.stderr

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,3 +13,5 @@ error: expected type, found keyword `true`
1313
18 | foo!(true); //~ ERROR expected type, found keyword
1414
| ^^^^ expecting a type here because of type ascription
1515

16+
error: aborting due to 2 previous errors
17+

src/test/ui/lint-output-format-2.stderr

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,3 +22,5 @@ error: compilation successful
2222
28 | | }
2323
| |_^
2424

25+
error: aborting due to previous error
26+

src/test/ui/loops-reject-duplicate-labels-2.stderr

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,3 +70,5 @@ error: compilation successful
7070
44 | | }
7171
| |_^
7272

73+
error: aborting due to previous error
74+

src/test/ui/loops-reject-duplicate-labels.stderr

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,3 +73,5 @@ error: compilation successful
7373
54 | | }
7474
| |_^
7575

76+
error: aborting due to previous error
77+

src/test/ui/loops-reject-labels-shadowing-lifetimes.stderr

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,3 +108,5 @@ error: compilation successful
108108
119 | | }
109109
| |_^
110110

111+
error: aborting due to previous error
112+

src/test/ui/loops-reject-lifetime-shadowing-label.stderr

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,3 +14,5 @@ error: compilation successful
1414
41 | | }
1515
| |_^
1616

17+
error: aborting due to previous error
18+

src/test/ui/macro-context.stderr

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,3 +43,5 @@ error: expected expression, found reserved keyword `typeof`
4343
26 | m!();
4444
| ----- in this macro invocation
4545

46+
error: aborting due to 4 previous errors
47+

src/test/ui/macros/macro_path_as_generic_bound.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@ error[E0433]: failed to resolve. Use of undeclared type or module `m`
44
17 | foo!(m::m2::A); //~ ERROR failed to resolve
55
| ^ Use of undeclared type or module `m`
66

7-
error: cannot continue compilation due to previous error
7+
error: aborting due to previous error
88

src/test/ui/macros/trace_faulty_macros.stderr

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,3 +45,5 @@ note: trace_macro
4545
= note: expanding `my_recursive_macro! { }`
4646
= note: to `my_recursive_macro ! ( ) ;`
4747

48+
error: aborting due to 2 previous errors
49+

src/test/ui/resolve/issue-21221-1.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,5 +45,5 @@ help: possible candidate is found in another module, you can import it into scop
4545
11 | use std::ops::Div;
4646
|
4747

48-
error: cannot continue compilation due to previous error
48+
error: aborting due to 4 previous errors
4949

src/test/ui/resolve/issue-21221-2.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,5 @@ help: possible candidate is found in another module, you can import it into scop
1010

1111
error[E0601]: main function not found
1212

13-
error: cannot continue compilation due to previous error
13+
error: aborting due to 2 previous errors
1414

src/test/ui/resolve/issue-21221-3.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@ help: possible candidate is found in another module, you can import it into scop
88
18 | use issue_21221_3::outer::OuterTrait;
99
|
1010

11-
error: cannot continue compilation due to previous error
11+
error: aborting due to previous error
1212

src/test/ui/resolve/issue-21221-4.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@ help: possible candidate is found in another module, you can import it into scop
88
18 | use issue_21221_4::T;
99
|
1010

11-
error: cannot continue compilation due to previous error
11+
error: aborting due to previous error
1212

src/test/ui/resolve/issue-23305.stderr

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
error[E0391]: unsupported cyclic reference between types/traits detected
2-
--> $DIR/issue-23305.rs:15:12
2+
--> $DIR/issue-23305.rs:15:1
33
|
44
15 | impl ToNbt<Self> {}
5-
| ^^^^ cyclic reference
5+
| ^^^^^^^^^^^^^^^^ cyclic reference
66
|
77
note: the cycle begins when processing `<impl at $DIR/issue-23305.rs:15:1: 15:20>`...
88
--> $DIR/issue-23305.rs:15:1

src/test/ui/resolve/issue-3907.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@ help: possible better candidate is found in another module, you can import it in
88
14 | use issue_3907::Foo;
99
|
1010

11-
error: cannot continue compilation due to previous error
11+
error: aborting due to previous error
1212

src/test/ui/resolve/issue-5035.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,5 @@ error[E0404]: expected trait, found type alias `K`
1313
| did you mean `I`?
1414
| type aliases cannot be used for traits
1515

16-
error: cannot continue compilation due to previous error
16+
error: aborting due to 2 previous errors
1717

src/test/ui/resolve/unboxed-closure-sugar-nonexistent-trait.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,5 @@ error[E0404]: expected trait, found type alias `Typedef`
1010
16 | fn g<F:Typedef(isize) -> isize>(x: F) {}
1111
| ^^^^^^^^^^^^^^^^^^^^^^^ type aliases cannot be used for traits
1212

13-
error: cannot continue compilation due to previous error
13+
error: aborting due to 2 previous errors
1414

src/test/ui/rfc1598-generic-associated-types/generic-associated-types-where.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11+
// ignore-test
12+
1113
#![feature(generic_associated_types)]
1214

1315
// Checking the interaction with this other feature
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,14 @@
11
error: cannot continue compilation due to previous error
22

3+
error[E0244]: wrong number of type arguments: expected 0, found 1
4+
--> $DIR/generic-associated-types-where.rs:32:35
5+
|
6+
32 | type WithDefault<'a, T> = &'a Iterator<T>;
7+
| ^^^^^^^^^^^ expected no type arguments
8+
9+
error[E0191]: the value of the associated type `Item` (from the trait `std::iter::Iterator`) must be specified
10+
--> $DIR/generic-associated-types-where.rs:32:35
11+
|
12+
32 | type WithDefault<'a, T> = &'a Iterator<T>;
13+
| ^^^^^^^^^^^ missing associated type `Item` value
14+

src/test/ui/span/issue-24690.stderr

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,3 +36,5 @@ error: compilation successful
3636
26 | | }
3737
| |_^
3838

39+
error: aborting due to previous error
40+

src/test/ui/span/issue-35987.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,5 @@ help: possible better candidate is found in another module, you can import it in
1010

1111
error[E0601]: main function not found
1212

13-
error: cannot continue compilation due to previous error
13+
error: aborting due to 2 previous errors
1414

0 commit comments

Comments
 (0)