Skip to content

Commit 22f3a5d

Browse files
Rollup merge of rust-lang#154331 - cyrgani:incomplete-3, r=JonathanBrouwer
allow `incomplete_features` in all ui tests This PR allows the `incomplete_features` lint for the `specialization` directory, thereby allowing it for all UI tests. Followup to rust-lang#154174 and rust-lang#154276. Closes rust-lang#154168.
2 parents f9f6c97 + 97e84d5 commit 22f3a5d

124 files changed

Lines changed: 94 additions & 822 deletions

File tree

Some content is hidden

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

src/tools/compiletest/src/runtest.rs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1921,10 +1921,7 @@ impl<'test> TestCx<'test> {
19211921

19221922
// Allow tests to use internal and incomplete features.
19231923
compiler.args(&["-A", "internal_features"]);
1924-
// FIXME(#154168); temporarily exclude some directories to make the transition easier
1925-
if !input_file.iter().any(|p| p == "specialization") {
1926-
compiler.args(&["-A", "incomplete_features"]);
1927-
}
1924+
compiler.args(&["-A", "incomplete_features"]);
19281925

19291926
// Allow tests to have unused parens and braces.
19301927
// Add #![deny(unused_parens, unused_braces)] to the test file if you want to

tests/ui/specialization/assoc-ty-graph-cycle.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
// Make sure we don't crash with a cycle error during coherence.
44

5-
#![feature(specialization)] //~ WARN the feature `specialization` is incomplete
5+
#![feature(specialization)]
66

77
trait Trait<T> {
88
type Assoc;

tests/ui/specialization/assoc-ty-graph-cycle.stderr

Lines changed: 0 additions & 12 deletions
This file was deleted.

tests/ui/specialization/coherence/default-impl-normalization-ambig-2.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// regression test for #118987
2-
#![feature(specialization)] //~ WARN the feature `specialization` is incomplete
2+
#![feature(specialization)]
33

44
trait Assoc {
55
type Output;
Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,3 @@
1-
warning: the feature `specialization` is incomplete and may not be safe to use and/or cause compiler crashes
2-
--> $DIR/default-impl-normalization-ambig-2.rs:2:12
3-
|
4-
LL | #![feature(specialization)]
5-
| ^^^^^^^^^^^^^^
6-
|
7-
= note: see issue #31844 <https://github.com/rust-lang/rust/issues/31844> for more information
8-
= help: consider using `min_specialization` instead, which is more stable and complete
9-
= note: `#[warn(incomplete_features)]` on by default
10-
111
error[E0277]: the trait bound `u16: Assoc` is not satisfied
122
--> $DIR/default-impl-normalization-ambig-2.rs:17:14
133
|
@@ -20,6 +10,6 @@ help: the trait `Assoc` is implemented for `u8`
2010
LL | impl Assoc for u8 {}
2111
| ^^^^^^^^^^^^^^^^^
2212

23-
error: aborting due to 1 previous error; 1 warning emitted
13+
error: aborting due to 1 previous error
2414

2515
For more information about this error, try `rustc --explain E0277`.

tests/ui/specialization/coherence/default-item-normalization-ambig-1.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// regression test for #73299.
2-
#![feature(specialization)] //~ WARN the feature `specialization` is incomplete
2+
#![feature(specialization)]
33

44
trait X {
55
type U;
Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,3 @@
1-
warning: the feature `specialization` is incomplete and may not be safe to use and/or cause compiler crashes
2-
--> $DIR/default-item-normalization-ambig-1.rs:2:12
3-
|
4-
LL | #![feature(specialization)]
5-
| ^^^^^^^^^^^^^^
6-
|
7-
= note: see issue #31844 <https://github.com/rust-lang/rust/issues/31844> for more information
8-
= help: consider using `min_specialization` instead, which is more stable and complete
9-
= note: `#[warn(incomplete_features)]` on by default
10-
111
error[E0119]: conflicting implementations of trait `Y` for type `<() as X>::U`
122
--> $DIR/default-item-normalization-ambig-1.rs:20:1
133
|
@@ -16,6 +6,6 @@ LL | impl Y for <() as X>::U {}
166
LL | impl Y for <i32 as X>::U {}
177
| ^^^^^^^^^^^^^^^^^^^^^^^^ conflicting implementation for `<() as X>::U`
188

19-
error: aborting due to 1 previous error; 1 warning emitted
9+
error: aborting due to 1 previous error
2010

2111
For more information about this error, try `rustc --explain E0119`.

tests/ui/specialization/cross-crate-defaults.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
//@ aux-build:cross_crates_defaults.rs
44

5-
#![feature(specialization)] //~ WARN the feature `specialization` is incomplete
5+
#![feature(specialization)]
66

77
extern crate cross_crates_defaults;
88

tests/ui/specialization/cross-crate-defaults.stderr

Lines changed: 0 additions & 12 deletions
This file was deleted.

tests/ui/specialization/ctfe/default-assoc-const.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
//! Regression test for revealing associated types through specialization during const eval.
22
//@ check-pass
33
#![feature(specialization)]
4-
//~^ WARNING the feature `specialization` is incomplete and may not be safe to use
54

65
trait Foo {
76
const ASSOC: usize;

0 commit comments

Comments
 (0)