From 6888555ca91f8e729b84da13da20d886919489b3 Mon Sep 17 00:00:00 2001 From: Ralf Jung Date: Fri, 22 Nov 2019 09:50:22 +0100 Subject: [PATCH] rustup for never stabilization --- rust-version | 2 +- tests/compile-fail/never_say_never.rs | 1 - tests/compile-fail/never_transmute_humans.rs | 2 -- tests/compile-fail/never_transmute_void.rs | 1 - tests/run-pass/async-fn.rs | 2 -- tests/run-pass/generator.rs | 2 +- tests/run-pass/loop-break-value.rs | 1 - 7 files changed, 2 insertions(+), 9 deletions(-) diff --git a/rust-version b/rust-version index cb6136f40fb..09cac5bb059 100644 --- a/rust-version +++ b/rust-version @@ -1 +1 @@ -b9cf5417892ef242c783ef963deff5436205b0f6 +bd816fd76f4f7a040ca7ac8ca5bc556d761f96fa diff --git a/tests/compile-fail/never_say_never.rs b/tests/compile-fail/never_say_never.rs index d7e6a8c09f6..199ceb70fb6 100644 --- a/tests/compile-fail/never_say_never.rs +++ b/tests/compile-fail/never_say_never.rs @@ -1,7 +1,6 @@ // This should fail even without validation // compile-flags: -Zmiri-disable-validation -#![feature(never_type)] #![allow(unreachable_code)] fn main() { diff --git a/tests/compile-fail/never_transmute_humans.rs b/tests/compile-fail/never_transmute_humans.rs index ab25b1ffc74..f662fdcd987 100644 --- a/tests/compile-fail/never_transmute_humans.rs +++ b/tests/compile-fail/never_transmute_humans.rs @@ -1,8 +1,6 @@ // This should fail even without validation // compile-flags: -Zmiri-disable-validation -#![feature(never_type)] - struct Human; fn main() { diff --git a/tests/compile-fail/never_transmute_void.rs b/tests/compile-fail/never_transmute_void.rs index a5d6795d71e..933e0521195 100644 --- a/tests/compile-fail/never_transmute_void.rs +++ b/tests/compile-fail/never_transmute_void.rs @@ -1,7 +1,6 @@ // This should fail even without validation // compile-flags: -Zmiri-disable-validation -#![feature(never_type)] #![allow(unused, invalid_value)] enum Void {} diff --git a/tests/run-pass/async-fn.rs b/tests/run-pass/async-fn.rs index 90448aca177..a4c176ad8f1 100644 --- a/tests/run-pass/async-fn.rs +++ b/tests/run-pass/async-fn.rs @@ -1,5 +1,3 @@ -#![feature(never_type)] - use std::{future::Future, pin::Pin, task::Poll, ptr}; use std::task::{Waker, RawWaker, RawWakerVTable, Context}; diff --git a/tests/run-pass/generator.rs b/tests/run-pass/generator.rs index c31b5b9ed3b..00ebba6344e 100644 --- a/tests/run-pass/generator.rs +++ b/tests/run-pass/generator.rs @@ -1,4 +1,4 @@ -#![feature(generators, generator_trait, never_type)] +#![feature(generators, generator_trait)] use std::ops::{GeneratorState, Generator}; use std::pin::Pin; diff --git a/tests/run-pass/loop-break-value.rs b/tests/run-pass/loop-break-value.rs index bd7afa7ec1a..43acdc22820 100644 --- a/tests/run-pass/loop-break-value.rs +++ b/tests/run-pass/loop-break-value.rs @@ -1,4 +1,3 @@ -#![feature(never_type)] #![allow(unreachable_code)] #[allow(unused)] -- 2.44.0