Skip to content

Commit 1719337

Browse files
committed
Revert "Remove #![feature(never_type)] from tests."
This reverts commit 8f6197f.
1 parent ca81548 commit 1719337

File tree

90 files changed

+268
-98
lines changed

Some content is hidden

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

90 files changed

+268
-98
lines changed

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
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+
1517
#[derive(Copy, Clone)]
1618
pub struct Entity {
1719
private: std::num::NonZeroU32,

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

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

35
#[no_mangle]

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// run-pass
2-
#![feature(never_type_fallback)]
2+
#![feature(never_type, never_type_fallback)]
33
#![feature(exhaustive_patterns)]
44
#![feature(slice_patterns)]
55
#![allow(unreachable_patterns)]

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

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

33
// check-pass
44

5+
#![feature(never_type)]
6+
57
pub fn main() {
68
loop {
79
match None {

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
#![feature(never_type)]
2+
13
fn main() {
24
// The `if false` expressions are simply to
35
// 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:7:20
2+
--> $DIR/break-while-condition.rs:9:20
33
|
44
LL | let _: ! = {
55
| ____________________^
@@ -11,7 +11,7 @@ LL | | };
1111
found unit type `()`
1212

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

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

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// check-pass
2-
#![feature(never_type_fallback)]
2+
#![feature(never_type, never_type_fallback)]
33
#![allow(unreachable_code)]
44

55
use std::error::Error;

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

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

35
fn cast_a() {

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
error[E0605]: non-primitive cast: `i32` as `!`
2-
--> $DIR/coerce-to-bang-cast.rs:4:13
2+
--> $DIR/coerce-to-bang-cast.rs:6:13
33
|
44
LL | let y = {return; 22} as !;
55
| ^^^^^^^^^^^^^^^^^
66
|
77
= note: an `as` expression can only be used to convert between primitive types. Consider using the `From` trait
88

99
error[E0605]: non-primitive cast: `i32` as `!`
10-
--> $DIR/coerce-to-bang-cast.rs:9:13
10+
--> $DIR/coerce-to-bang-cast.rs:11:13
1111
|
1212
LL | let y = 22 as !;
1313
| ^^^^^^^

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

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

35
fn call_foo_a() {

0 commit comments

Comments
 (0)