Skip to content

Commit 8f6197f

Browse files
committed
Remove #![feature(never_type)] from tests.
Also remove `never_type` the feature-gate test.
1 parent 15c30dd commit 8f6197f

File tree

101 files changed

+130
-277
lines changed

Some content is hidden

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

101 files changed

+130
-277
lines changed

src/test/codegen/enum-debug-niche-2.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@
1212
// CHECK: {{.*}}DIDerivedType{{.*}}tag: DW_TAG_member,{{.*}}name: "Placeholder",{{.*}}extraData: i64 4294967295{{[,)].*}}
1313
// CHECK: {{.*}}DIDerivedType{{.*}}tag: DW_TAG_member,{{.*}}name: "Error",{{.*}}extraData: i64 0{{[,)].*}}
1414

15-
#![feature(never_type)]
16-
1715
#[derive(Copy, Clone)]
1816
pub struct Entity {
1917
private: std::num::NonZeroU32,

src/test/mir-opt/uninhabited-enum.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
#![feature(never_type)]
2-
31
pub enum Void {}
42

53
#[no_mangle]

src/test/ui/associated-types/associated-types-ICE-when-projecting-out-of-err.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,5 +21,5 @@ trait Add<RHS=Self> {
2121
fn ice<A>(a: A) {
2222
let r = loop {};
2323
r = r + a;
24-
//~^ ERROR the trait bound `(): Add<A>` is not satisfied
24+
//~^ ERROR the trait bound `!: Add<A>` is not satisfied
2525
}

src/test/ui/associated-types/associated-types-ICE-when-projecting-out-of-err.stderr

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
error[E0277]: the trait bound `(): Add<A>` is not satisfied
1+
error[E0277]: the trait bound `!: Add<A>` is not satisfied
22
--> $DIR/associated-types-ICE-when-projecting-out-of-err.rs:23:11
33
|
44
LL | r = r + a;
5-
| ^ the trait `Add<A>` is not implemented for `()`
5+
| ^ the trait `Add<A>` is not implemented for `!`
66

77
error: aborting due to previous error
88

src/test/ui/binding/empty-types-in-patterns.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
// run-pass
2-
#![feature(never_type)]
32
#![feature(exhaustive_patterns)]
43
#![feature(slice_patterns)]
54
#![allow(unreachable_patterns)]

src/test/ui/borrowck/assign-never-type.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22

33
// check-pass
44

5-
#![feature(never_type)]
6-
75
pub fn main() {
86
loop {
97
match None {

src/test/ui/break-while-condition.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
#![feature(never_type)]
2-
31
fn main() {
42
// The `if false` expressions are simply to
53
// make sure we don't avoid checking everything

src/test/ui/break-while-condition.stderr

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error[E0308]: mismatched types
2-
--> $DIR/break-while-condition.rs:9:20
2+
--> $DIR/break-while-condition.rs:7:20
33
|
44
LL | let _: ! = {
55
| ____________________^
@@ -11,7 +11,7 @@ LL | | };
1111
found type `()`
1212

1313
error[E0308]: mismatched types
14-
--> $DIR/break-while-condition.rs:16:13
14+
--> $DIR/break-while-condition.rs:14:13
1515
|
1616
LL | / while false {
1717
LL | | break
@@ -22,7 +22,7 @@ LL | | }
2222
found type `()`
2323

2424
error[E0308]: mismatched types
25-
--> $DIR/break-while-condition.rs:24:13
25+
--> $DIR/break-while-condition.rs:22:13
2626
|
2727
LL | / while false {
2828
LL | | return

src/test/ui/coercion/coerce-issue-49593-box-never.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
// check-pass
22

3-
#![feature(never_type)]
43
#![allow(unreachable_code)]
54

65
use std::error::Error;

src/test/ui/coercion/coerce-to-bang-cast.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
#![feature(never_type)]
2-
31
fn foo(x: usize, y: !, z: usize) { }
42

53
fn cast_a() {

0 commit comments

Comments
 (0)