Skip to content

Commit 0fffa97

Browse files
committed
Auto merge of #1068 - RalfJung:uprust, r=RalfJung
rustup for never stabilization
2 parents 35e92d9 + 6888555 commit 0fffa97

File tree

7 files changed

+2
-9
lines changed

7 files changed

+2
-9
lines changed

rust-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
b9cf5417892ef242c783ef963deff5436205b0f6
1+
bd816fd76f4f7a040ca7ac8ca5bc556d761f96fa

tests/compile-fail/never_say_never.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
// This should fail even without validation
22
// compile-flags: -Zmiri-disable-validation
33

4-
#![feature(never_type)]
54
#![allow(unreachable_code)]
65

76
fn main() {

tests/compile-fail/never_transmute_humans.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
// This should fail even without validation
22
// compile-flags: -Zmiri-disable-validation
33

4-
#![feature(never_type)]
5-
64
struct Human;
75

86
fn main() {

tests/compile-fail/never_transmute_void.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
// This should fail even without validation
22
// compile-flags: -Zmiri-disable-validation
33

4-
#![feature(never_type)]
54
#![allow(unused, invalid_value)]
65

76
enum Void {}

tests/run-pass/async-fn.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
use std::{future::Future, pin::Pin, task::Poll, ptr};
42
use std::task::{Waker, RawWaker, RawWakerVTable, Context};
53

tests/run-pass/generator.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#![feature(generators, generator_trait, never_type)]
1+
#![feature(generators, generator_trait)]
22

33
use std::ops::{GeneratorState, Generator};
44
use std::pin::Pin;

tests/run-pass/loop-break-value.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
#![feature(never_type)]
21
#![allow(unreachable_code)]
32

43
#[allow(unused)]

0 commit comments

Comments
 (0)