diff --git a/src/libcore/clone.rs b/src/libcore/clone.rs
index 14d947ccf2402..86dd77f10f324 100644
--- a/src/libcore/clone.rs
+++ b/src/libcore/clone.rs
@@ -185,7 +185,7 @@ mod impls {
bool char
}
- #[unstable(feature = "never_type", issue = "35121")]
+ #[stable(feature = "never_type", since = "1.41.0")]
impl Clone for ! {
#[inline]
fn clone(&self) -> Self {
diff --git a/src/libcore/cmp.rs b/src/libcore/cmp.rs
index 1ac51291b93d7..1e2e595f1dd0a 100644
--- a/src/libcore/cmp.rs
+++ b/src/libcore/cmp.rs
@@ -1128,24 +1128,24 @@ mod impls {
ord_impl! { char usize u8 u16 u32 u64 u128 isize i8 i16 i32 i64 i128 }
- #[unstable(feature = "never_type", issue = "35121")]
+ #[stable(feature = "never_type", since = "1.41.0")]
impl PartialEq for ! {
fn eq(&self, _: &!) -> bool {
*self
}
}
- #[unstable(feature = "never_type", issue = "35121")]
+ #[stable(feature = "never_type", since = "1.41.0")]
impl Eq for ! {}
- #[unstable(feature = "never_type", issue = "35121")]
+ #[stable(feature = "never_type", since = "1.41.0")]
impl PartialOrd for ! {
fn partial_cmp(&self, _: &!) -> Option<Ordering> {
*self
}
}
- #[unstable(feature = "never_type", issue = "35121")]
+ #[stable(feature = "never_type", since = "1.41.0")]
impl Ord for ! {
fn cmp(&self, _: &!) -> Ordering {
*self
diff --git a/src/libcore/convert.rs b/src/libcore/convert.rs
index e16c384026045..89a269bdb8eb9 100644
--- a/src/libcore/convert.rs
+++ b/src/libcore/convert.rs
@@ -40,8 +40,6 @@
#![stable(feature = "rust1", since = "1.0.0")]
-use crate::fmt;
-
/// The identity function.
///
/// Two things are important to note about this function:
@@ -426,9 +424,7 @@ pub trait TryInto<T>: Sized {
/// - `TryFrom<T> for U` implies [`TryInto`]`<U> for T`
/// - [`try_from`] is reflexive, which means that `TryFrom<T> for T`
/// is implemented and cannot fail -- the associated `Error` type for
-/// calling `T::try_from()` on a value of type `T` is [`Infallible`].
-/// When the [`!`] type is stabilized [`Infallible`] and [`!`] will be
-/// equivalent.
+/// calling `T::try_from()` on a value of type `T` is [`!`].
///
/// `TryFrom<T>` can be implemented as follows:
///
@@ -477,7 +473,6 @@ pub trait TryInto<T>: Sized {
/// [`TryInto`]: trait.TryInto.html
/// [`i32::MAX`]: ../../std/i32/constant.MAX.html
/// [`!`]: ../../std/primitive.never.html
-/// [`Infallible`]: enum.Infallible.html
#[stable(feature = "try_from", since = "1.34.0")]
pub trait TryFrom<T>: Sized {
/// The type returned in the event of a conversion error.
@@ -615,9 +610,9 @@ impl AsRef<str> for str {
// THE NO-ERROR ERROR TYPE
////////////////////////////////////////////////////////////////////////////////
-/// The error type for errors that can never happen.
+/// A type alias for [the `!` “never” type][never].
///
-/// Since this enum has no variant, a value of this type can never actually exist.
+/// `Infallible` represents types of errors that can never happen since `!` has no valid values.
/// This can be useful for generic APIs that use [`Result`] and parameterize the error type,
/// to indicate that the result is always [`Ok`].
///
@@ -634,33 +629,10 @@ impl AsRef<str> for str {
/// }
/// ```
///
-/// # Future compatibility
-///
-/// This enum has the same role as [the `!` “never” type][never],
-/// which is unstable in this version of Rust.
-/// When `!` is stabilized, we plan to make `Infallible` a type alias to it:
-///
-/// ```ignore (illustrates future std change)
-/// pub type Infallible = !;
-/// ```
-///
-/// … and eventually deprecate `Infallible`.
-///
-///
-/// However there is one case where `!` syntax can be used
-/// before `!` is stabilized as a full-fleged type: in the position of a function’s return type.
-/// Specifically, it is possible implementations for two different function pointer types:
-///
-/// ```
-/// trait MyTrait {}
-/// impl MyTrait for fn() -> ! {}
-/// impl MyTrait for fn() -> std::convert::Infallible {}
-/// ```
+/// # Eventual deprecation
///
-/// With `Infallible` being an enum, this code is valid.
-/// However when `Infallible` becomes an alias for the never type,
-/// the two `impl`s will start to overlap
-/// and therefore will be disallowed by the language’s trait coherence rules.
+/// Previously, `Infallible` was defined as `enum Infallible {}`.
+/// Now that it is merely a type alias to `!`, we will eventually deprecate `Infallible`.
///
/// [`Ok`]: ../result/enum.Result.html#variant.Ok
/// [`Result`]: ../result/enum.Result.html
@@ -668,57 +640,4 @@ impl AsRef<str> for str {
/// [`Into`]: trait.Into.html
/// [never]: ../../std/primitive.never.html
#[stable(feature = "convert_infallible", since = "1.34.0")]
-#[derive(Copy)]
-pub enum Infallible {}
-
-#[stable(feature = "convert_infallible", since = "1.34.0")]
-impl Clone for Infallible {
- fn clone(&self) -> Infallible {
- match *self {}
- }
-}
-
-#[stable(feature = "convert_infallible", since = "1.34.0")]
-impl fmt::Debug for Infallible {
- fn fmt(&self, _: &mut fmt::Formatter<'_>) -> fmt::Result {
- match *self {}
- }
-}
-
-#[stable(feature = "convert_infallible", since = "1.34.0")]
-impl fmt::Display for Infallible {
- fn fmt(&self, _: &mut fmt::Formatter<'_>) -> fmt::Result {
- match *self {}
- }
-}
-
-#[stable(feature = "convert_infallible", since = "1.34.0")]
-impl PartialEq for Infallible {
- fn eq(&self, _: &Infallible) -> bool {
- match *self {}
- }
-}
-
-#[stable(feature = "convert_infallible", since = "1.34.0")]
-impl Eq for Infallible {}
-
-#[stable(feature = "convert_infallible", since = "1.34.0")]
-impl PartialOrd for Infallible {
- fn partial_cmp(&self, _other: &Self) -> Option<crate::cmp::Ordering> {
- match *self {}
- }
-}
-
-#[stable(feature = "convert_infallible", since = "1.34.0")]
-impl Ord for Infallible {
- fn cmp(&self, _other: &Self) -> crate::cmp::Ordering {
- match *self {}
- }
-}
-
-#[stable(feature = "convert_infallible", since = "1.34.0")]
-impl From<!> for Infallible {
- fn from(x: !) -> Self {
- x
- }
-}
+pub type Infallible = !;
diff --git a/src/libcore/fmt/mod.rs b/src/libcore/fmt/mod.rs
index 5a039144f667f..07dca9ad214ec 100644
--- a/src/libcore/fmt/mod.rs
+++ b/src/libcore/fmt/mod.rs
@@ -1935,14 +1935,14 @@ macro_rules! fmt_refs {
fmt_refs! { Debug, Display, Octal, Binary, LowerHex, UpperHex, LowerExp, UpperExp }
-#[unstable(feature = "never_type", issue = "35121")]
+#[stable(feature = "never_type", since = "1.41.0")]
impl Debug for ! {
fn fmt(&self, _: &mut Formatter<'_>) -> Result {
*self
}
}
-#[unstable(feature = "never_type", issue = "35121")]
+#[stable(feature = "never_type", since = "1.41.0")]
impl Display for ! {
fn fmt(&self, _: &mut Formatter<'_>) -> Result {
*self
diff --git a/src/libcore/lib.rs b/src/libcore/lib.rs
index ea5536eb50cae..ec19392450a4b 100644
--- a/src/libcore/lib.rs
+++ b/src/libcore/lib.rs
@@ -85,7 +85,7 @@
#![feature(iter_once_with)]
#![feature(lang_items)]
#![feature(link_llvm_intrinsics)]
-#![feature(never_type)]
+#![cfg_attr(bootstrap, feature(never_type))]
#![feature(nll)]
#![feature(exhaustive_patterns)]
#![feature(no_core)]
diff --git a/src/libcore/marker.rs b/src/libcore/marker.rs
index 2d2fc4102e190..86ee673cea941 100644
--- a/src/libcore/marker.rs
+++ b/src/libcore/marker.rs
@@ -774,7 +774,7 @@ mod copy_impls {
bool char
}
- #[unstable(feature = "never_type", issue = "35121")]
+ #[stable(feature = "never_type", since = "1.41.0")]
impl Copy for ! {}
#[stable(feature = "rust1", since = "1.0.0")]
diff --git a/src/libcore/num/mod.rs b/src/libcore/num/mod.rs
index b5d61a3fd4e78..4313248f2636a 100644
--- a/src/libcore/num/mod.rs
+++ b/src/libcore/num/mod.rs
@@ -4,7 +4,7 @@
#![stable(feature = "rust1", since = "1.0.0")]
-use crate::convert::{TryFrom, Infallible};
+use crate::convert::TryFrom;
use crate::fmt;
use crate::intrinsics;
use crate::mem;
@@ -4722,18 +4722,8 @@ impl fmt::Display for TryFromIntError {
}
#[stable(feature = "try_from", since = "1.34.0")]
-impl From<Infallible> for TryFromIntError {
- fn from(x: Infallible) -> TryFromIntError {
- match x {}
- }
-}
-
-#[unstable(feature = "never_type", issue = "35121")]
impl From<!> for TryFromIntError {
fn from(never: !) -> TryFromIntError {
- // Match rather than coerce to make sure that code like
- // `From<Infallible> for TryFromIntError` above will keep working
- // when `Infallible` becomes an alias to `!`.
match never {}
}
}
diff --git a/src/librustc/lib.rs b/src/librustc/lib.rs
index 38877dee71106..1fc157eca3e89 100644
--- a/src/librustc/lib.rs
+++ b/src/librustc/lib.rs
@@ -36,7 +36,7 @@
#![feature(core_intrinsics)]
#![feature(drain_filter)]
#![cfg_attr(windows, feature(libc))]
-#![feature(never_type)]
+#![cfg_attr(bootstrap, feature(never_type))]
#![feature(exhaustive_patterns)]
#![feature(overlapping_marker_traits)]
#![feature(extern_types)]
diff --git a/src/librustc/ty/context.rs b/src/librustc/ty/context.rs
index 41d069bf6ae33..d0767a1fc4c38 100644
--- a/src/librustc/ty/context.rs
+++ b/src/librustc/ty/context.rs
@@ -2440,10 +2440,10 @@ impl<'tcx> TyCtxt<'tcx> {
#[inline]
pub fn mk_diverging_default(self) -> Ty<'tcx> {
- if self.features().never_type {
+ if self.features().never_type_fallback {
self.types.never
} else {
- self.intern_tup(&[])
+ self.types.unit
}
}
diff --git a/src/librustc_codegen_utils/lib.rs b/src/librustc_codegen_utils/lib.rs
index fb2099e71a31a..f2739a3b30c92 100644
--- a/src/librustc_codegen_utils/lib.rs
+++ b/src/librustc_codegen_utils/lib.rs
@@ -8,7 +8,7 @@
#![feature(box_patterns)]
#![feature(box_syntax)]
#![feature(core_intrinsics)]
-#![feature(never_type)]
+#![cfg_attr(bootstrap, feature(never_type))]
#![feature(nll)]
#![feature(in_band_lifetimes)]
diff --git a/src/librustc_error_codes/error_codes/E0725.md b/src/librustc_error_codes/error_codes/E0725.md
index 9bd321e5f82d6..b96a5e694dfc0 100644
--- a/src/librustc_error_codes/error_codes/E0725.md
+++ b/src/librustc_error_codes/error_codes/E0725.md
@@ -4,8 +4,8 @@ command line flags.
Erroneous code example:
```ignore (can't specify compiler flags from doctests)
-#![feature(never_type)] // error: the feature `never_type` is not in
- // the list of allowed features
+#![feature(specialization)] // error: the feature `specialization` is not in
+ // the list of allowed features
```
Delete the offending feature attribute, or add it to the list of allowed
diff --git a/src/librustc_mir/lib.rs b/src/librustc_mir/lib.rs
index 6d19cd63bc32e..cbb6408126a45 100644
--- a/src/librustc_mir/lib.rs
+++ b/src/librustc_mir/lib.rs
@@ -16,7 +16,7 @@ Rust MIR: a lowered representation of Rust. Also: an experiment!
#![feature(decl_macro)]
#![feature(drain_filter)]
#![feature(exhaustive_patterns)]
-#![feature(never_type)]
+#![cfg_attr(bootstrap, feature(never_type))]
#![feature(specialization)]
#![feature(try_trait)]
#![feature(unicode_internals)]
diff --git a/src/librustc_typeck/check/mod.rs b/src/librustc_typeck/check/mod.rs
index 50c1a74fe911b..512a49d13e7cf 100644
--- a/src/librustc_typeck/check/mod.rs
+++ b/src/librustc_typeck/check/mod.rs
@@ -3129,9 +3129,14 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
}
// Tries to apply a fallback to `ty` if it is an unsolved variable.
- // Non-numerics get replaced with ! or () (depending on whether
- // feature(never_type) is enabled, unconstrained ints with i32,
- // unconstrained floats with f64.
+ //
+ // - Unconstrained ints are replaced with `i32`.
+ //
+ // - Unconstrained floats are replaced with with `f64`.
+ //
+ // - Non-numerics get replaced with `!` when `#![feature(never_type_fallback)]`
+ // is enabled. Otherwise, they are replaced with `()`.
+ //
// Fallback becomes very dubious if we have encountered type-checking errors.
// In that case, fallback to Error.
// The return value indicates whether fallback has occurred.
diff --git a/src/librustc_typeck/lib.rs b/src/librustc_typeck/lib.rs
index 9289f3c7ef30d..0f147f92b5f7e 100644
--- a/src/librustc_typeck/lib.rs
+++ b/src/librustc_typeck/lib.rs
@@ -66,7 +66,7 @@ This API is completely unstable and subject to change.
#![feature(in_band_lifetimes)]
#![feature(nll)]
#![feature(slice_patterns)]
-#![feature(never_type)]
+#![cfg_attr(bootstrap, feature(never_type))]
#![recursion_limit="256"]
diff --git a/src/librustdoc/lib.rs b/src/librustdoc/lib.rs
index 277475f6fffd8..6ed2d4b8477ca 100644
--- a/src/librustdoc/lib.rs
+++ b/src/librustdoc/lib.rs
@@ -14,7 +14,7 @@
#![feature(crate_visibility_modifier)]
#![feature(const_fn)]
#![feature(drain_filter)]
-#![feature(never_type)]
+#![cfg_attr(bootstrap, feature(never_type))]
#![feature(unicode_internals)]
#![recursion_limit="256"]
diff --git a/src/libserialize/lib.rs b/src/libserialize/lib.rs
index e45d56c320cd8..13d83337f5f6f 100644
--- a/src/libserialize/lib.rs
+++ b/src/libserialize/lib.rs
@@ -11,7 +11,7 @@ Core encoding and decoding interfaces.
#![feature(box_syntax)]
#![feature(core_intrinsics)]
#![feature(specialization)]
-#![feature(never_type)]
+#![cfg_attr(bootstrap, feature(never_type))]
#![feature(nll)]
#![feature(associated_type_bounds)]
#![cfg_attr(test, feature(test))]
diff --git a/src/libstd/error.rs b/src/libstd/error.rs
index d1cb0862d82a8..74a9e7c9e331f 100644
--- a/src/libstd/error.rs
+++ b/src/libstd/error.rs
@@ -465,7 +465,7 @@ impl<'a> From<Cow<'a, str>> for Box<dyn Error> {
}
}
-#[unstable(feature = "never_type", issue = "35121")]
+#[stable(feature = "never_type", since = "1.41.0")]
impl Error for ! {
fn description(&self) -> &str { *self }
}
@@ -551,13 +551,6 @@ impl Error for string::FromUtf16Error {
}
}
-#[stable(feature = "str_parse_error2", since = "1.8.0")]
-impl Error for string::ParseError {
- fn description(&self) -> &str {
- match *self {}
- }
-}
-
#[stable(feature = "decode_utf16", since = "1.9.0")]
impl Error for char::DecodeUtf16Error {
fn description(&self) -> &str {
diff --git a/src/libstd/lib.rs b/src/libstd/lib.rs
index 32023a5b75bfb..acf53f7f00348 100644
--- a/src/libstd/lib.rs
+++ b/src/libstd/lib.rs
@@ -280,7 +280,7 @@
#![feature(maybe_uninit_ref)]
#![feature(maybe_uninit_slice)]
#![feature(needs_panic_runtime)]
-#![feature(never_type)]
+#![cfg_attr(bootstrap, feature(never_type))]
#![feature(nll)]
#![cfg_attr(bootstrap, feature(on_unimplemented))]
#![feature(optin_builtin_traits)]
diff --git a/src/libstd/primitive_docs.rs b/src/libstd/primitive_docs.rs
index a72951c034610..b4495588c9949 100644
--- a/src/libstd/primitive_docs.rs
+++ b/src/libstd/primitive_docs.rs
@@ -71,7 +71,6 @@ mod prim_bool { }
/// write:
///
/// ```
-/// #![feature(never_type)]
/// # fn foo() -> u32 {
/// let x: ! = {
/// return 123
@@ -201,7 +200,6 @@ mod prim_bool { }
/// for example:
///
/// ```
-/// #![feature(never_type)]
/// # use std::fmt;
/// # trait Debug {
/// # fn fmt(&self, formatter: &mut fmt::Formatter<'_>) -> fmt::Result;
@@ -239,7 +237,7 @@ mod prim_bool { }
/// [`Default`]: default/trait.Default.html
/// [`default()`]: default/trait.Default.html#tymethod.default
///
-#[unstable(feature = "never_type", issue = "35121")]
+#[stable(feature = "never_type", since = "1.41.0")]
mod prim_never { }
#[doc(primitive = "char")]
diff --git a/src/libsyntax/feature_gate/accepted.rs b/src/libsyntax/feature_gate/accepted.rs
index 0107611460b09..dab83f48a03ae 100644
--- a/src/libsyntax/feature_gate/accepted.rs
+++ b/src/libsyntax/feature_gate/accepted.rs
@@ -253,6 +253,8 @@ declare_features! (
(accepted, const_constructor, "1.40.0", Some(61456), None),
/// Allows the use of `#[cfg(doctest)]`, set when rustdoc is collecting doctests.
(accepted, cfg_doctest, "1.40.0", Some(62210), None),
+ /// Allows the `!` type. Does not imply 'exhaustive_patterns' any more.
+ (accepted, never_type, "1.41.0", Some(35121), None),
/// Allows relaxing the coherence rules such that
/// `impl<T> ForeignTrait<LocalType> for ForeignType<T>` is permitted.
(accepted, re_rebalance_coherence, "1.41.0", Some(55437), None),
diff --git a/src/libsyntax/feature_gate/active.rs b/src/libsyntax/feature_gate/active.rs
index 2819ee273d9f0..bd029514a9524 100644
--- a/src/libsyntax/feature_gate/active.rs
+++ b/src/libsyntax/feature_gate/active.rs
@@ -318,9 +318,6 @@ declare_features! (
/// Allows `X..Y` patterns.
(active, exclusive_range_pattern, "1.11.0", Some(37854), None),
- /// Allows the `!` type. Does not imply 'exhaustive_patterns' (below) any more.
- (active, never_type, "1.13.0", Some(35121), None),
-
/// Allows exhaustive pattern matching on types that contain uninhabited types.
(active, exhaustive_patterns, "1.13.0", Some(51085), None),
@@ -523,6 +520,9 @@ declare_features! (
/// Allows using the `efiapi` ABI.
(active, abi_efiapi, "1.40.0", Some(65815), None),
+ /// Allows diverging expressions to fall back to `!` rather than `()`.
+ (active, never_type_fallback, "1.41.0", Some(65992), None),
+
/// Allows using the `#[register_attr]` attribute.
(active, register_attr, "1.41.0", Some(66080), None),
diff --git a/src/libsyntax/feature_gate/check.rs b/src/libsyntax/feature_gate/check.rs
index abf9adefd3c44..f966850254f9a 100644
--- a/src/libsyntax/feature_gate/check.rs
+++ b/src/libsyntax/feature_gate/check.rs
@@ -521,25 +521,11 @@ impl<'a> Visitor<'a> for PostExpansionVisitor<'a> {
ast::TyKind::BareFn(ref bare_fn_ty) => {
self.check_extern(bare_fn_ty.ext);
}
- ast::TyKind::Never => {
- gate_feature_post!(&self, never_type, ty.span,
- "The `!` type is experimental");
- }
_ => {}
}
visit::walk_ty(self, ty)
}
- fn visit_fn_ret_ty(&mut self, ret_ty: &'a ast::FunctionRetTy) {
- if let ast::FunctionRetTy::Ty(ref output_ty) = *ret_ty {
- if let ast::TyKind::Never = output_ty.kind {
- // Do nothing.
- } else {
- self.visit_ty(output_ty)
- }
- }
- }
-
fn visit_expr(&mut self, e: &'a ast::Expr) {
match e.kind {
ast::ExprKind::Box(_) => {
@@ -567,10 +553,6 @@ impl<'a> Visitor<'a> for PostExpansionVisitor<'a> {
visit::walk_expr(self, e)
}
- fn visit_arm(&mut self, arm: &'a ast::Arm) {
- visit::walk_arm(self, arm)
- }
-
fn visit_pat(&mut self, pattern: &'a ast::Pat) {
match &pattern.kind {
PatKind::Slice(pats) => {
diff --git a/src/libsyntax_pos/symbol.rs b/src/libsyntax_pos/symbol.rs
index 1139bf67a36d0..979074f17c7e0 100644
--- a/src/libsyntax_pos/symbol.rs
+++ b/src/libsyntax_pos/symbol.rs
@@ -444,6 +444,7 @@ symbols! {
negate_unsigned,
never,
never_type,
+ never_type_fallback,
new,
next,
__next,
diff --git a/src/test/codegen/enum-debug-niche-2.rs b/src/test/codegen/enum-debug-niche-2.rs
index 0f17976ef4965..7e00dc5463f68 100644
--- a/src/test/codegen/enum-debug-niche-2.rs
+++ b/src/test/codegen/enum-debug-niche-2.rs
@@ -12,8 +12,6 @@
// CHECK: {{.*}}DIDerivedType{{.*}}tag: DW_TAG_member,{{.*}}name: "Placeholder",{{.*}}extraData: i64 4294967295{{[,)].*}}
// CHECK: {{.*}}DIDerivedType{{.*}}tag: DW_TAG_member,{{.*}}name: "Error",{{.*}}extraData: i64 0{{[,)].*}}
-#![feature(never_type)]
-
#[derive(Copy, Clone)]
pub struct Entity {
private: std::num::NonZeroU32,
diff --git a/src/test/mir-opt/uninhabited-enum.rs b/src/test/mir-opt/uninhabited-enum.rs
index 904a9c43c1bcc..409be8587cf0f 100644
--- a/src/test/mir-opt/uninhabited-enum.rs
+++ b/src/test/mir-opt/uninhabited-enum.rs
@@ -1,5 +1,3 @@
-#![feature(never_type)]
-
pub enum Void {}
#[no_mangle]
diff --git a/src/test/ui/binding/empty-types-in-patterns.rs b/src/test/ui/binding/empty-types-in-patterns.rs
index 2b8b1b29df8c9..1864d4bb8205b 100644
--- a/src/test/ui/binding/empty-types-in-patterns.rs
+++ b/src/test/ui/binding/empty-types-in-patterns.rs
@@ -1,5 +1,5 @@
// run-pass
-#![feature(never_type)]
+#![feature(never_type_fallback)]
#![feature(exhaustive_patterns)]
#![feature(slice_patterns)]
#![allow(unreachable_patterns)]
diff --git a/src/test/ui/borrowck/assign-never-type.rs b/src/test/ui/borrowck/assign-never-type.rs
index 4f30ea1467023..52b2e70d159a9 100644
--- a/src/test/ui/borrowck/assign-never-type.rs
+++ b/src/test/ui/borrowck/assign-never-type.rs
@@ -2,8 +2,6 @@
// check-pass
-#![feature(never_type)]
-
pub fn main() {
loop {
match None {
diff --git a/src/test/ui/break-while-condition.rs b/src/test/ui/break-while-condition.rs
index 6064e6ab00235..7aa5682b923a6 100644
--- a/src/test/ui/break-while-condition.rs
+++ b/src/test/ui/break-while-condition.rs
@@ -1,5 +1,3 @@
-#![feature(never_type)]
-
fn main() {
// The `if false` expressions are simply to
// make sure we don't avoid checking everything
diff --git a/src/test/ui/break-while-condition.stderr b/src/test/ui/break-while-condition.stderr
index a08edee07ea0a..bae3b6765e21b 100644
--- a/src/test/ui/break-while-condition.stderr
+++ b/src/test/ui/break-while-condition.stderr
@@ -1,5 +1,5 @@
error[E0308]: mismatched types
- --> $DIR/break-while-condition.rs:9:20
+ --> $DIR/break-while-condition.rs:7:20
|
LL | let _: ! = {
| ____________________^
@@ -11,7 +11,7 @@ LL | | };
found type `()`
error[E0308]: mismatched types
- --> $DIR/break-while-condition.rs:16:13
+ --> $DIR/break-while-condition.rs:14:13
|
LL | / while false {
LL | | break
@@ -22,7 +22,7 @@ LL | | }
found type `()`
error[E0308]: mismatched types
- --> $DIR/break-while-condition.rs:24:13
+ --> $DIR/break-while-condition.rs:22:13
|
LL | / while false {
LL | | return
diff --git a/src/test/ui/coercion/coerce-issue-49593-box-never.rs b/src/test/ui/coercion/coerce-issue-49593-box-never.rs
index 5038eb3ebf458..55beb7c252895 100644
--- a/src/test/ui/coercion/coerce-issue-49593-box-never.rs
+++ b/src/test/ui/coercion/coerce-issue-49593-box-never.rs
@@ -1,6 +1,5 @@
// check-pass
-
-#![feature(never_type)]
+#![feature(never_type_fallback)]
#![allow(unreachable_code)]
use std::error::Error;
diff --git a/src/test/ui/coercion/coerce-to-bang-cast.rs b/src/test/ui/coercion/coerce-to-bang-cast.rs
index 8ef1948084654..ea1384a1dab55 100644
--- a/src/test/ui/coercion/coerce-to-bang-cast.rs
+++ b/src/test/ui/coercion/coerce-to-bang-cast.rs
@@ -1,5 +1,3 @@
-#![feature(never_type)]
-
fn foo(x: usize, y: !, z: usize) { }
fn cast_a() {
diff --git a/src/test/ui/coercion/coerce-to-bang-cast.stderr b/src/test/ui/coercion/coerce-to-bang-cast.stderr
index ff30ebc09c63a..0e17f32511f82 100644
--- a/src/test/ui/coercion/coerce-to-bang-cast.stderr
+++ b/src/test/ui/coercion/coerce-to-bang-cast.stderr
@@ -1,5 +1,5 @@
error[E0605]: non-primitive cast: `i32` as `!`
- --> $DIR/coerce-to-bang-cast.rs:6:13
+ --> $DIR/coerce-to-bang-cast.rs:4:13
|
LL | let y = {return; 22} as !;
| ^^^^^^^^^^^^^^^^^
@@ -7,7 +7,7 @@ LL | let y = {return; 22} as !;
= note: an `as` expression can only be used to convert between primitive types. Consider using the `From` trait
error[E0605]: non-primitive cast: `i32` as `!`
- --> $DIR/coerce-to-bang-cast.rs:11:13
+ --> $DIR/coerce-to-bang-cast.rs:9:13
|
LL | let y = 22 as !;
| ^^^^^^^
diff --git a/src/test/ui/coercion/coerce-to-bang.rs b/src/test/ui/coercion/coerce-to-bang.rs
index 1e06934d09f9e..d52f79fbb7a98 100644
--- a/src/test/ui/coercion/coerce-to-bang.rs
+++ b/src/test/ui/coercion/coerce-to-bang.rs
@@ -1,5 +1,3 @@
-#![feature(never_type)]
-
fn foo(x: usize, y: !, z: usize) { }
fn call_foo_a() {
diff --git a/src/test/ui/coercion/coerce-to-bang.stderr b/src/test/ui/coercion/coerce-to-bang.stderr
index a46e97da8159b..b6fd5bf43abf2 100644
--- a/src/test/ui/coercion/coerce-to-bang.stderr
+++ b/src/test/ui/coercion/coerce-to-bang.stderr
@@ -1,5 +1,5 @@
error[E0308]: mismatched types
- --> $DIR/coerce-to-bang.rs:6:17
+ --> $DIR/coerce-to-bang.rs:4:17
|
LL | foo(return, 22, 44);
| ^^ expected !, found integer
@@ -8,7 +8,7 @@ LL | foo(return, 22, 44);
found type `{integer}`
error[E0308]: mismatched types
- --> $DIR/coerce-to-bang.rs:18:13
+ --> $DIR/coerce-to-bang.rs:16:13
|
LL | foo(22, 44, return);
| ^^ expected !, found integer
@@ -17,7 +17,7 @@ LL | foo(22, 44, return);
found type `{integer}`
error[E0308]: mismatched types
- --> $DIR/coerce-to-bang.rs:26:12
+ --> $DIR/coerce-to-bang.rs:24:12
|
LL | foo(a, b, c); // ... and hence a reference to `a` is expected to diverge.
| ^ expected !, found integer
@@ -26,7 +26,7 @@ LL | foo(a, b, c); // ... and hence a reference to `a` is expected to diverg
found type `{integer}`
error[E0308]: mismatched types
- --> $DIR/coerce-to-bang.rs:36:12
+ --> $DIR/coerce-to-bang.rs:34:12
|
LL | foo(a, b, c);
| ^ expected !, found integer
@@ -35,7 +35,7 @@ LL | foo(a, b, c);
found type `{integer}`
error[E0308]: mismatched types
- --> $DIR/coerce-to-bang.rs:45:12
+ --> $DIR/coerce-to-bang.rs:43:12
|
LL | foo(a, b, c);
| ^ expected !, found integer
@@ -44,7 +44,7 @@ LL | foo(a, b, c);
found type `{integer}`
error[E0308]: mismatched types
- --> $DIR/coerce-to-bang.rs:50:21
+ --> $DIR/coerce-to-bang.rs:48:21
|
LL | let x: [!; 2] = [return, 22];
| ^^^^^^^^^^^^ expected !, found integer
@@ -53,7 +53,7 @@ LL | let x: [!; 2] = [return, 22];
found type `[{integer}; 2]`
error[E0308]: mismatched types
- --> $DIR/coerce-to-bang.rs:55:22
+ --> $DIR/coerce-to-bang.rs:53:22
|
LL | let x: [!; 2] = [22, return];
| ^^ expected !, found integer
@@ -62,7 +62,7 @@ LL | let x: [!; 2] = [22, return];
found type `{integer}`
error[E0308]: mismatched types
- --> $DIR/coerce-to-bang.rs:60:37
+ --> $DIR/coerce-to-bang.rs:58:37
|
LL | let x: (usize, !, usize) = (22, 44, 66);
| ^^ expected !, found integer
@@ -71,7 +71,7 @@ LL | let x: (usize, !, usize) = (22, 44, 66);
found type `{integer}`
error[E0308]: mismatched types
- --> $DIR/coerce-to-bang.rs:65:41
+ --> $DIR/coerce-to-bang.rs:63:41
|
LL | let x: (usize, !, usize) = (return, 44, 66);
| ^^ expected !, found integer
@@ -80,7 +80,7 @@ LL | let x: (usize, !, usize) = (return, 44, 66);
found type `{integer}`
error[E0308]: mismatched types
- --> $DIR/coerce-to-bang.rs:76:37
+ --> $DIR/coerce-to-bang.rs:74:37
|
LL | let x: (usize, !, usize) = (22, 44, return);
| ^^ expected !, found integer
diff --git a/src/test/ui/consts/validate_never_arrays.rs b/src/test/ui/consts/validate_never_arrays.rs
index 9610b7b22f161..1270dc4ee30e6 100644
--- a/src/test/ui/consts/validate_never_arrays.rs
+++ b/src/test/ui/consts/validate_never_arrays.rs
@@ -1,4 +1,4 @@
-#![feature(const_raw_ptr_deref, never_type)]
+#![feature(const_raw_ptr_deref)]
const FOO: &[!; 1] = unsafe { &*(1_usize as *const [!; 1]) }; //~ ERROR undefined behavior
diff --git a/src/test/ui/empty/empty-never-array.rs b/src/test/ui/empty/empty-never-array.rs
index f0ecea42f39c8..38702f8d28f90 100644
--- a/src/test/ui/empty/empty-never-array.rs
+++ b/src/test/ui/empty/empty-never-array.rs
@@ -1,5 +1,3 @@
-#![feature(never_type)]
-
enum Helper<T, U> {
T(T, [!; 0]),
#[allow(dead_code)]
diff --git a/src/test/ui/empty/empty-never-array.stderr b/src/test/ui/empty/empty-never-array.stderr
index d865b59f0b945..defcd256f7d98 100644
--- a/src/test/ui/empty/empty-never-array.stderr
+++ b/src/test/ui/empty/empty-never-array.stderr
@@ -1,5 +1,5 @@
error[E0005]: refutable pattern in local binding: `T(_, _)` not covered
- --> $DIR/empty-never-array.rs:10:9
+ --> $DIR/empty-never-array.rs:8:9
|
LL | / enum Helper<T, U> {
LL | | T(T, [!; 0]),
@@ -20,7 +20,7 @@ LL | if let Helper::U(u) = Helper::T(t, []) { /* */ }
|
error[E0381]: use of possibly-uninitialized variable: `u`
- --> $DIR/empty-never-array.rs:12:5
+ --> $DIR/empty-never-array.rs:10:5
|
LL | u
| ^ use of possibly-uninitialized `u`
diff --git a/src/test/ui/feature-gates/feature-gate-exhaustive-patterns.rs b/src/test/ui/feature-gates/feature-gate-exhaustive-patterns.rs
index f0cc9ea70550e..c27089d2a0590 100644
--- a/src/test/ui/feature-gates/feature-gate-exhaustive-patterns.rs
+++ b/src/test/ui/feature-gates/feature-gate-exhaustive-patterns.rs
@@ -1,5 +1,3 @@
-#![feature(never_type)]
-
fn foo() -> Result<u32, !> {
Ok(123)
}
diff --git a/src/test/ui/feature-gates/feature-gate-exhaustive-patterns.stderr b/src/test/ui/feature-gates/feature-gate-exhaustive-patterns.stderr
index 08c36cece4cf9..e599a9ee150f4 100644
--- a/src/test/ui/feature-gates/feature-gate-exhaustive-patterns.stderr
+++ b/src/test/ui/feature-gates/feature-gate-exhaustive-patterns.stderr
@@ -1,5 +1,5 @@
error[E0005]: refutable pattern in local binding: `Err(_)` not covered
- --> $DIR/feature-gate-exhaustive-patterns.rs:8:9
+ --> $DIR/feature-gate-exhaustive-patterns.rs:6:9
|
LL | let Ok(_x) = foo();
| ^^^^^^ pattern `Err(_)` not covered
diff --git a/src/test/ui/feature-gates/feature-gate-never_type.rs b/src/test/ui/feature-gates/feature-gate-never_type.rs
deleted file mode 100644
index be8c27dbb1b02..0000000000000
--- a/src/test/ui/feature-gates/feature-gate-never_type.rs
+++ /dev/null
@@ -1,17 +0,0 @@
-// Test that ! errors when used in illegal positions with feature(never_type) disabled
-
-trait Foo {
- type Wub;
-}
-
-type Ma = (u32, !, i32); //~ ERROR type is experimental
-type Meeshka = Vec<!>; //~ ERROR type is experimental
-type Mow = &'static fn(!) -> !; //~ ERROR type is experimental
-type Skwoz = &'static mut !; //~ ERROR type is experimental
-
-impl Foo for Meeshka {
- type Wub = !; //~ ERROR type is experimental
-}
-
-fn main() {
-}
diff --git a/src/test/ui/feature-gates/feature-gate-never_type.stderr b/src/test/ui/feature-gates/feature-gate-never_type.stderr
deleted file mode 100644
index d86ab99b82bd5..0000000000000
--- a/src/test/ui/feature-gates/feature-gate-never_type.stderr
+++ /dev/null
@@ -1,48 +0,0 @@
-error[E0658]: The `!` type is experimental
- --> $DIR/feature-gate-never_type.rs:7:17
- |
-LL | type Ma = (u32, !, i32);
- | ^
- |
- = note: for more information, see https://github.com/rust-lang/rust/issues/35121
- = help: add `#![feature(never_type)]` to the crate attributes to enable
-
-error[E0658]: The `!` type is experimental
- --> $DIR/feature-gate-never_type.rs:8:20
- |
-LL | type Meeshka = Vec<!>;
- | ^
- |
- = note: for more information, see https://github.com/rust-lang/rust/issues/35121
- = help: add `#![feature(never_type)]` to the crate attributes to enable
-
-error[E0658]: The `!` type is experimental
- --> $DIR/feature-gate-never_type.rs:9:24
- |
-LL | type Mow = &'static fn(!) -> !;
- | ^
- |
- = note: for more information, see https://github.com/rust-lang/rust/issues/35121
- = help: add `#![feature(never_type)]` to the crate attributes to enable
-
-error[E0658]: The `!` type is experimental
- --> $DIR/feature-gate-never_type.rs:10:27
- |
-LL | type Skwoz = &'static mut !;
- | ^
- |
- = note: for more information, see https://github.com/rust-lang/rust/issues/35121
- = help: add `#![feature(never_type)]` to the crate attributes to enable
-
-error[E0658]: The `!` type is experimental
- --> $DIR/feature-gate-never_type.rs:13:16
- |
-LL | type Wub = !;
- | ^
- |
- = note: for more information, see https://github.com/rust-lang/rust/issues/35121
- = help: add `#![feature(never_type)]` to the crate attributes to enable
-
-error: aborting due to 5 previous errors
-
-For more information about this error, try `rustc --explain E0658`.
diff --git a/src/test/ui/for-loop-while/loop-break-value.rs b/src/test/ui/for-loop-while/loop-break-value.rs
index d7209fc4de867..29848bb0cedaa 100644
--- a/src/test/ui/for-loop-while/loop-break-value.rs
+++ b/src/test/ui/for-loop-while/loop-break-value.rs
@@ -1,7 +1,6 @@
// run-pass
#![allow(unreachable_code)]
-#![feature(never_type)]
#[allow(unused)]
fn never_returns() {
diff --git a/src/test/ui/lint/must_use-unit.rs b/src/test/ui/lint/must_use-unit.rs
index 4dd4798abb7ce..8f59bab26d3ef 100644
--- a/src/test/ui/lint/must_use-unit.rs
+++ b/src/test/ui/lint/must_use-unit.rs
@@ -1,4 +1,3 @@
-#![feature(never_type)]
#![deny(unused_must_use)]
#[must_use]
diff --git a/src/test/ui/lint/must_use-unit.stderr b/src/test/ui/lint/must_use-unit.stderr
index 0a9939b2015b7..a6d0259a081af 100644
--- a/src/test/ui/lint/must_use-unit.stderr
+++ b/src/test/ui/lint/must_use-unit.stderr
@@ -1,17 +1,17 @@
error: unused return value of `foo` that must be used
- --> $DIR/must_use-unit.rs:13:5
+ --> $DIR/must_use-unit.rs:12:5
|
LL | foo();
| ^^^^^^
|
note: lint level defined here
- --> $DIR/must_use-unit.rs:2:9
+ --> $DIR/must_use-unit.rs:1:9
|
LL | #![deny(unused_must_use)]
| ^^^^^^^^^^^^^^^
error: unused return value of `bar` that must be used
- --> $DIR/must_use-unit.rs:15:5
+ --> $DIR/must_use-unit.rs:14:5
|
LL | bar();
| ^^^^^^
diff --git a/src/test/ui/lint/uninitialized-zeroed.rs b/src/test/ui/lint/uninitialized-zeroed.rs
index 473be434a7524..ed2369fd650b0 100644
--- a/src/test/ui/lint/uninitialized-zeroed.rs
+++ b/src/test/ui/lint/uninitialized-zeroed.rs
@@ -2,7 +2,7 @@
// This test checks that calling `mem::{uninitialized,zeroed}` with certain types results
// in a lint.
-#![feature(never_type, rustc_attrs)]
+#![feature(rustc_attrs)]
#![allow(deprecated)]
#![deny(invalid_value)]
diff --git a/src/test/ui/loops/loop-break-value.rs b/src/test/ui/loops/loop-break-value.rs
index 7c2f63ec51a79..8d88aefdb5185 100644
--- a/src/test/ui/loops/loop-break-value.rs
+++ b/src/test/ui/loops/loop-break-value.rs
@@ -1,5 +1,3 @@
-#![feature(never_type)]
-
fn main() {
let val: ! = loop { break break; };
//~^ ERROR mismatched types
diff --git a/src/test/ui/loops/loop-break-value.stderr b/src/test/ui/loops/loop-break-value.stderr
index b2e3ebc53ad8e..8c4bcd3a9b73c 100644
--- a/src/test/ui/loops/loop-break-value.stderr
+++ b/src/test/ui/loops/loop-break-value.stderr
@@ -1,5 +1,5 @@
warning: denote infinite loops with `loop { ... }`
- --> $DIR/loop-break-value.rs:26:5
+ --> $DIR/loop-break-value.rs:24:5
|
LL | 'while_loop: while true {
| ^^^^^^^^^^^^^^^^^^^^^^^ help: use `loop`
@@ -7,7 +7,7 @@ LL | 'while_loop: while true {
= note: `#[warn(while_true)]` on by default
error[E0571]: `break` with value from a `while` loop
- --> $DIR/loop-break-value.rs:28:9
+ --> $DIR/loop-break-value.rs:26:9
|
LL | break ();
| ^^^^^^^^ can only break with a value inside `loop` or breakable block
@@ -18,7 +18,7 @@ LL | break;
| ^^^^^
error[E0571]: `break` with value from a `while` loop
- --> $DIR/loop-break-value.rs:30:13
+ --> $DIR/loop-break-value.rs:28:13
|
LL | break 'while_loop 123;
| ^^^^^^^^^^^^^^^^^^^^^ can only break with a value inside `loop` or breakable block
@@ -29,7 +29,7 @@ LL | break;
| ^^^^^
error[E0571]: `break` with value from a `while let` loop
- --> $DIR/loop-break-value.rs:38:12
+ --> $DIR/loop-break-value.rs:36:12
|
LL | if break () {
| ^^^^^^^^ can only break with a value inside `loop` or breakable block
@@ -40,7 +40,7 @@ LL | if break {
| ^^^^^
error[E0571]: `break` with value from a `while let` loop
- --> $DIR/loop-break-value.rs:43:9
+ --> $DIR/loop-break-value.rs:41:9
|
LL | break None;
| ^^^^^^^^^^ can only break with a value inside `loop` or breakable block
@@ -51,7 +51,7 @@ LL | break;
| ^^^^^
error[E0571]: `break` with value from a `while let` loop
- --> $DIR/loop-break-value.rs:49:13
+ --> $DIR/loop-break-value.rs:47:13
|
LL | break 'while_let_loop "nope";
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ can only break with a value inside `loop` or breakable block
@@ -62,7 +62,7 @@ LL | break;
| ^^^^^
error[E0571]: `break` with value from a `for` loop
- --> $DIR/loop-break-value.rs:56:9
+ --> $DIR/loop-break-value.rs:54:9
|
LL | break ();
| ^^^^^^^^ can only break with a value inside `loop` or breakable block
@@ -73,7 +73,7 @@ LL | break;
| ^^^^^
error[E0571]: `break` with value from a `for` loop
- --> $DIR/loop-break-value.rs:57:9
+ --> $DIR/loop-break-value.rs:55:9
|
LL | break [()];
| ^^^^^^^^^^ can only break with a value inside `loop` or breakable block
@@ -84,7 +84,7 @@ LL | break;
| ^^^^^
error[E0571]: `break` with value from a `for` loop
- --> $DIR/loop-break-value.rs:64:13
+ --> $DIR/loop-break-value.rs:62:13
|
LL | break 'for_loop Some(17);
| ^^^^^^^^^^^^^^^^^^^^^^^^ can only break with a value inside `loop` or breakable block
@@ -95,7 +95,7 @@ LL | break;
| ^^^^^
error[E0308]: mismatched types
- --> $DIR/loop-break-value.rs:4:31
+ --> $DIR/loop-break-value.rs:2:31
|
LL | let val: ! = loop { break break; };
| ^^^^^ expected !, found ()
@@ -104,7 +104,7 @@ LL | let val: ! = loop { break break; };
found type `()`
error[E0308]: mismatched types
- --> $DIR/loop-break-value.rs:11:19
+ --> $DIR/loop-break-value.rs:9:19
|
LL | break 123;
| ^^^ expected &str, found integer
@@ -113,7 +113,7 @@ LL | break 123;
found type `{integer}`
error[E0308]: mismatched types
- --> $DIR/loop-break-value.rs:16:15
+ --> $DIR/loop-break-value.rs:14:15
|
LL | break "asdf";
| ^^^^^^ expected i32, found reference
@@ -122,7 +122,7 @@ LL | break "asdf";
found type `&'static str`
error[E0308]: mismatched types
- --> $DIR/loop-break-value.rs:21:31
+ --> $DIR/loop-break-value.rs:19:31
|
LL | break 'outer_loop "nope";
| ^^^^^^ expected i32, found reference
@@ -131,7 +131,7 @@ LL | break 'outer_loop "nope";
found type `&'static str`
error[E0308]: mismatched types
- --> $DIR/loop-break-value.rs:73:26
+ --> $DIR/loop-break-value.rs:71:26
|
LL | break 'c 123;
| ^^^ expected (), found integer
@@ -140,7 +140,7 @@ LL | break 'c 123;
found type `{integer}`
error[E0308]: mismatched types
- --> $DIR/loop-break-value.rs:80:15
+ --> $DIR/loop-break-value.rs:78:15
|
LL | break (break, break);
| ^^^^^^^^^^^^^^ expected (), found tuple
@@ -149,7 +149,7 @@ LL | break (break, break);
found type `(!, !)`
error[E0308]: mismatched types
- --> $DIR/loop-break-value.rs:85:15
+ --> $DIR/loop-break-value.rs:83:15
|
LL | break 2;
| ^ expected (), found integer
@@ -158,7 +158,7 @@ LL | break 2;
found type `{integer}`
error[E0308]: mismatched types
- --> $DIR/loop-break-value.rs:90:9
+ --> $DIR/loop-break-value.rs:88:9
|
LL | break;
| ^^^^^
diff --git a/src/test/ui/mir/mir_calls_to_shims.rs b/src/test/ui/mir/mir_calls_to_shims.rs
index 6f13d5612ce51..df7c45ad1d1c7 100644
--- a/src/test/ui/mir/mir_calls_to_shims.rs
+++ b/src/test/ui/mir/mir_calls_to_shims.rs
@@ -2,7 +2,6 @@
// ignore-wasm32-bare compiled with panic=abort by default
#![feature(fn_traits)]
-#![feature(never_type)]
use std::panic;
diff --git a/src/test/ui/never_type/adjust_never.rs b/src/test/ui/never_type/adjust_never.rs
index 0d7d2c0ed3fa9..e4d15c8a17dfa 100644
--- a/src/test/ui/never_type/adjust_never.rs
+++ b/src/test/ui/never_type/adjust_never.rs
@@ -2,8 +2,6 @@
// check-pass
-#![feature(never_type)]
-
fn main() {
let x: ! = panic!();
let y: u32 = x;
diff --git a/src/test/ui/never_type/auto-traits.rs b/src/test/ui/never_type/auto-traits.rs
new file mode 100644
index 0000000000000..8a02720ab27fd
--- /dev/null
+++ b/src/test/ui/never_type/auto-traits.rs
@@ -0,0 +1,16 @@
+// check-pass
+
+#![feature(optin_builtin_traits)]
+
+fn main() {
+ enum Void {}
+
+ auto trait Auto {}
+ fn assert_auto<T: Auto>() {}
+ assert_auto::<Void>();
+ assert_auto::<!>();
+
+ fn assert_send<T: Send>() {}
+ assert_send::<Void>();
+ assert_send::<!>();
+}
diff --git a/src/test/ui/never_type/call-fn-never-arg-wrong-type.rs b/src/test/ui/never_type/call-fn-never-arg-wrong-type.rs
index d06637e74a2f2..a2b44e91f1141 100644
--- a/src/test/ui/never_type/call-fn-never-arg-wrong-type.rs
+++ b/src/test/ui/never_type/call-fn-never-arg-wrong-type.rs
@@ -1,7 +1,5 @@
// Test that we can't pass other types for !
-#![feature(never_type)]
-
fn foo(x: !) -> ! {
x
}
diff --git a/src/test/ui/never_type/call-fn-never-arg-wrong-type.stderr b/src/test/ui/never_type/call-fn-never-arg-wrong-type.stderr
index 7a50fd367d2d5..e5cbdcbe73bde 100644
--- a/src/test/ui/never_type/call-fn-never-arg-wrong-type.stderr
+++ b/src/test/ui/never_type/call-fn-never-arg-wrong-type.stderr
@@ -1,5 +1,5 @@
error[E0308]: mismatched types
- --> $DIR/call-fn-never-arg-wrong-type.rs:10:9
+ --> $DIR/call-fn-never-arg-wrong-type.rs:8:9
|
LL | foo("wow");
| ^^^^^ expected !, found reference
diff --git a/src/test/ui/never_type/call-fn-never-arg.rs b/src/test/ui/never_type/call-fn-never-arg.rs
index 9d355817ee80d..55a7b79157a82 100644
--- a/src/test/ui/never_type/call-fn-never-arg.rs
+++ b/src/test/ui/never_type/call-fn-never-arg.rs
@@ -2,7 +2,6 @@
// check-pass
-#![feature(never_type)]
#![allow(unreachable_code)]
fn foo(x: !) -> ! {
diff --git a/src/test/ui/never_type/cast-never.rs b/src/test/ui/never_type/cast-never.rs
index 0139ebe4640be..fbba114ab3274 100644
--- a/src/test/ui/never_type/cast-never.rs
+++ b/src/test/ui/never_type/cast-never.rs
@@ -2,8 +2,6 @@
// check-pass
-#![feature(never_type)]
-
fn main() {
let x: ! = panic!();
let y: u32 = x as u32;
diff --git a/src/test/ui/never_type/defaulted-never-note.rs b/src/test/ui/never_type/defaulted-never-note.rs
index d3fb8a09414ce..c58b611748423 100644
--- a/src/test/ui/never_type/defaulted-never-note.rs
+++ b/src/test/ui/never_type/defaulted-never-note.rs
@@ -1,6 +1,6 @@
-// We need to opt into the `!` feature in order to trigger the
-// requirement that this is testing.
-#![feature(never_type)]
+// We need to opt into the `never_type_fallback` feature
+// to trigger the requirement that this is testing.
+#![feature(never_type_fallback)]
#![allow(unused)]
diff --git a/src/test/ui/never_type/dispatch_from_dyn_zst.rs b/src/test/ui/never_type/dispatch_from_dyn_zst.rs
index 764f58ce9e805..342d5e4791515 100644
--- a/src/test/ui/never_type/dispatch_from_dyn_zst.rs
+++ b/src/test/ui/never_type/dispatch_from_dyn_zst.rs
@@ -1,6 +1,6 @@
// run-pass
-#![feature(unsize, dispatch_from_dyn, never_type)]
+#![feature(unsize, dispatch_from_dyn)]
#![allow(dead_code)]
diff --git a/src/test/ui/never_type/diverging-fallback-control-flow.rs b/src/test/ui/never_type/diverging-fallback-control-flow.rs
index c68e6364ed406..df04437b1ae20 100644
--- a/src/test/ui/never_type/diverging-fallback-control-flow.rs
+++ b/src/test/ui/never_type/diverging-fallback-control-flow.rs
@@ -11,7 +11,7 @@
// These represent current behavior, but are pretty dubious. I would
// like to revisit these and potentially change them. --nmatsakis
-#![feature(never_type)]
+#![feature(never_type_fallback)]
trait BadDefault {
fn default() -> Self;
diff --git a/src/test/ui/never_type/feature-gate-never_type_fallback.rs b/src/test/ui/never_type/feature-gate-never_type_fallback.rs
new file mode 100644
index 0000000000000..3b896ec9d70c2
--- /dev/null
+++ b/src/test/ui/never_type/feature-gate-never_type_fallback.rs
@@ -0,0 +1,12 @@
+// This is a feature gate test for `never_type_fallback`.
+// It works by using a scenario where the type fall backs to `()` rather than ´!`
+// in the case where `#![feature(never_type_fallback)]` would change it to `!`.
+
+fn main() {}
+
+trait T {}
+
+fn should_ret_unit() -> impl T {
+ //~^ ERROR the trait bound `(): T` is not satisfied
+ panic!()
+}
diff --git a/src/test/ui/never_type/feature-gate-never_type_fallback.stderr b/src/test/ui/never_type/feature-gate-never_type_fallback.stderr
new file mode 100644
index 0000000000000..837e90d6ceb9b
--- /dev/null
+++ b/src/test/ui/never_type/feature-gate-never_type_fallback.stderr
@@ -0,0 +1,11 @@
+error[E0277]: the trait bound `(): T` is not satisfied
+ --> $DIR/feature-gate-never_type_fallback.rs:9:25
+ |
+LL | fn should_ret_unit() -> impl T {
+ | ^^^^^^ the trait `T` is not implemented for `()`
+ |
+ = note: the return type of a function must have a statically known size
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0277`.
diff --git a/src/test/ui/never_type/impl-for-never.rs b/src/test/ui/never_type/impl-for-never.rs
index 9423f08858b9b..cbfda9a2cc00a 100644
--- a/src/test/ui/never_type/impl-for-never.rs
+++ b/src/test/ui/never_type/impl-for-never.rs
@@ -1,7 +1,5 @@
// run-pass
-#![feature(never_type)]
-
// Test that we can call static methods on ! both directly and when it appears in a generic
trait StringifyType {
diff --git a/src/test/ui/never_type/issue-44402.rs b/src/test/ui/never_type/issue-44402.rs
index 699e480dfe7e5..0e6588bbe78ea 100644
--- a/src/test/ui/never_type/issue-44402.rs
+++ b/src/test/ui/never_type/issue-44402.rs
@@ -1,7 +1,6 @@
// check-pass
#![allow(dead_code)]
-#![feature(never_type)]
#![feature(exhaustive_patterns)]
// Regression test for inhabitedness check. The old
diff --git a/src/test/ui/never_type/never-assign-dead-code.rs b/src/test/ui/never_type/never-assign-dead-code.rs
index 7bb7c87097c50..5c1300c715128 100644
--- a/src/test/ui/never_type/never-assign-dead-code.rs
+++ b/src/test/ui/never_type/never-assign-dead-code.rs
@@ -2,7 +2,6 @@
// check-pass
-#![feature(never_type)]
#![warn(unused)]
fn main() {
diff --git a/src/test/ui/never_type/never-assign-dead-code.stderr b/src/test/ui/never_type/never-assign-dead-code.stderr
index 1860150fa8bc6..1dc15251d1aa1 100644
--- a/src/test/ui/never_type/never-assign-dead-code.stderr
+++ b/src/test/ui/never_type/never-assign-dead-code.stderr
@@ -1,5 +1,5 @@
warning: unreachable statement
- --> $DIR/never-assign-dead-code.rs:10:5
+ --> $DIR/never-assign-dead-code.rs:9:5
|
LL | let x: ! = panic!("aah");
| ------------- any code following this expression is unreachable
@@ -7,7 +7,7 @@ LL | drop(x);
| ^^^^^^^^ unreachable statement
|
note: lint level defined here
- --> $DIR/never-assign-dead-code.rs:6:9
+ --> $DIR/never-assign-dead-code.rs:5:9
|
LL | #![warn(unused)]
| ^^^^^^
@@ -15,7 +15,7 @@ LL | #![warn(unused)]
= note: this warning originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info)
warning: unreachable call
- --> $DIR/never-assign-dead-code.rs:10:5
+ --> $DIR/never-assign-dead-code.rs:9:5
|
LL | drop(x);
| ^^^^ - any code following this expression is unreachable
@@ -23,13 +23,13 @@ LL | drop(x);
| unreachable call
warning: unused variable: `x`
- --> $DIR/never-assign-dead-code.rs:9:9
+ --> $DIR/never-assign-dead-code.rs:8:9
|
LL | let x: ! = panic!("aah");
| ^ help: consider prefixing with an underscore: `_x`
|
note: lint level defined here
- --> $DIR/never-assign-dead-code.rs:6:9
+ --> $DIR/never-assign-dead-code.rs:5:9
|
LL | #![warn(unused)]
| ^^^^^^
diff --git a/src/test/ui/never_type/never-assign-wrong-type.rs b/src/test/ui/never_type/never-assign-wrong-type.rs
index 67e26f5663f41..9ca1ac7462d4d 100644
--- a/src/test/ui/never_type/never-assign-wrong-type.rs
+++ b/src/test/ui/never_type/never-assign-wrong-type.rs
@@ -1,6 +1,5 @@
// Test that we can't use another type in place of !
-#![feature(never_type)]
#![deny(warnings)]
fn main() {
diff --git a/src/test/ui/never_type/never-assign-wrong-type.stderr b/src/test/ui/never_type/never-assign-wrong-type.stderr
index da2e77d023d19..32c9fab6590df 100644
--- a/src/test/ui/never_type/never-assign-wrong-type.stderr
+++ b/src/test/ui/never_type/never-assign-wrong-type.stderr
@@ -1,5 +1,5 @@
error[E0308]: mismatched types
- --> $DIR/never-assign-wrong-type.rs:7:16
+ --> $DIR/never-assign-wrong-type.rs:6:16
|
LL | let x: ! = "hello";
| ^^^^^^^ expected !, found reference
diff --git a/src/test/ui/never_type/never-associated-type.rs b/src/test/ui/never_type/never-associated-type.rs
index 3bb917c931635..45e54b9bf7c18 100644
--- a/src/test/ui/never_type/never-associated-type.rs
+++ b/src/test/ui/never_type/never-associated-type.rs
@@ -2,8 +2,6 @@
// check-pass
-#![feature(never_type)]
-
trait Foo {
type Wow;
diff --git a/src/test/ui/never_type/never-from-impl-is-reserved.rs b/src/test/ui/never_type/never-from-impl-is-reserved.rs
index 9d16015bdc129..df74b6a53f888 100644
--- a/src/test/ui/never_type/never-from-impl-is-reserved.rs
+++ b/src/test/ui/never_type/never-from-impl-is-reserved.rs
@@ -1,7 +1,5 @@
// check that the `for<T> T: From<!>` impl is reserved
-#![feature(never_type)]
-
pub struct MyFoo;
pub trait MyTrait {}
diff --git a/src/test/ui/never_type/never-from-impl-is-reserved.stderr b/src/test/ui/never_type/never-from-impl-is-reserved.stderr
index 8b8d0f4ea73be..8b3155988ea95 100644
--- a/src/test/ui/never_type/never-from-impl-is-reserved.stderr
+++ b/src/test/ui/never_type/never-from-impl-is-reserved.stderr
@@ -1,5 +1,5 @@
error[E0119]: conflicting implementations of trait `MyTrait` for type `MyFoo`:
- --> $DIR/never-from-impl-is-reserved.rs:10:1
+ --> $DIR/never-from-impl-is-reserved.rs:8:1
|
LL | impl MyTrait for MyFoo {}
| ---------------------- first implementation here
diff --git a/src/test/ui/never_type/never-result.rs b/src/test/ui/never_type/never-result.rs
index 35af37910ef3e..800553fce874d 100644
--- a/src/test/ui/never_type/never-result.rs
+++ b/src/test/ui/never_type/never-result.rs
@@ -5,8 +5,6 @@
// Test that we can extract a ! through pattern matching then use it as several different types.
-#![feature(never_type)]
-
fn main() {
let x: Result<u32, !> = Ok(123);
match x {
diff --git a/src/test/ui/never_type/never-type-arg.rs b/src/test/ui/never_type/never-type-arg.rs
index 13cd59e6aa9f1..3cbb114f43b94 100644
--- a/src/test/ui/never_type/never-type-arg.rs
+++ b/src/test/ui/never_type/never-type-arg.rs
@@ -2,8 +2,6 @@
// check-pass
-#![feature(never_type)]
-
struct Wub;
impl PartialEq<!> for Wub {
diff --git a/src/test/ui/never_type/never-type-rvalues.rs b/src/test/ui/never_type/never-type-rvalues.rs
index 9ccc73dbf92d4..9bfc5572b9ee6 100644
--- a/src/test/ui/never_type/never-type-rvalues.rs
+++ b/src/test/ui/never_type/never-type-rvalues.rs
@@ -1,6 +1,5 @@
// run-pass
-#![feature(never_type)]
#![allow(dead_code)]
#![allow(path_statements)]
#![allow(unreachable_patterns)]
diff --git a/src/test/ui/never_type/never_transmute_never.rs b/src/test/ui/never_type/never_transmute_never.rs
index fce3ced9aac7f..cdf04de19e523 100644
--- a/src/test/ui/never_type/never_transmute_never.rs
+++ b/src/test/ui/never_type/never_transmute_never.rs
@@ -2,7 +2,6 @@
#![crate_type="lib"]
-#![feature(never_type)]
#![allow(dead_code)]
#![allow(unreachable_code)]
#![allow(unused_variables)]
diff --git a/src/test/ui/never_type/panic-uninitialized-zeroed.rs b/src/test/ui/never_type/panic-uninitialized-zeroed.rs
index e0c30160b9e94..e5e0e188de63c 100644
--- a/src/test/ui/never_type/panic-uninitialized-zeroed.rs
+++ b/src/test/ui/never_type/panic-uninitialized-zeroed.rs
@@ -3,7 +3,6 @@
// This test checks that instantiating an uninhabited type via `mem::{uninitialized,zeroed}` results
// in a runtime panic.
-#![feature(never_type)]
#![allow(deprecated, invalid_value)]
use std::{mem, panic};
diff --git a/src/test/ui/never_type/try_from.rs b/src/test/ui/never_type/try_from.rs
index 50451576f9c97..977ea3656b3dd 100644
--- a/src/test/ui/never_type/try_from.rs
+++ b/src/test/ui/never_type/try_from.rs
@@ -5,8 +5,6 @@
// This test was added to show the motivation for doing this
// over `TryFrom` being blanket impl for all `T: From`
-#![feature(never_type)]
-
use std::convert::{TryInto, Infallible};
struct Foo<T> {
diff --git a/src/test/ui/pattern/usefulness/match-privately-empty.rs b/src/test/ui/pattern/usefulness/match-privately-empty.rs
index 315eb03d16564..ea608651387b7 100644
--- a/src/test/ui/pattern/usefulness/match-privately-empty.rs
+++ b/src/test/ui/pattern/usefulness/match-privately-empty.rs
@@ -1,4 +1,3 @@
-#![feature(never_type)]
#![feature(exhaustive_patterns)]
mod private {
diff --git a/src/test/ui/pattern/usefulness/match-privately-empty.stderr b/src/test/ui/pattern/usefulness/match-privately-empty.stderr
index f79d180a1b8b5..66d0d9587741b 100644
--- a/src/test/ui/pattern/usefulness/match-privately-empty.stderr
+++ b/src/test/ui/pattern/usefulness/match-privately-empty.stderr
@@ -1,5 +1,5 @@
error[E0004]: non-exhaustive patterns: `Some(Private { misc: true, .. })` not covered
- --> $DIR/match-privately-empty.rs:13:11
+ --> $DIR/match-privately-empty.rs:12:11
|
LL | match private::DATA {
| ^^^^^^^^^^^^^ pattern `Some(Private { misc: true, .. })` not covered
diff --git a/src/test/ui/print_type_sizes/uninhabited.rs b/src/test/ui/print_type_sizes/uninhabited.rs
index ae4e492456af9..3a2ca19d8e0c3 100644
--- a/src/test/ui/print_type_sizes/uninhabited.rs
+++ b/src/test/ui/print_type_sizes/uninhabited.rs
@@ -4,7 +4,6 @@
// ^-- needed because `--pass check` does not emit the output needed.
// FIXME: consider using an attribute instead of side-effects.
-#![feature(never_type)]
#![feature(start)]
#[start]
diff --git a/src/test/ui/reachable/expr_add.rs b/src/test/ui/reachable/expr_add.rs
index b45e5daf42c8d..640c2a2cf8fcc 100644
--- a/src/test/ui/reachable/expr_add.rs
+++ b/src/test/ui/reachable/expr_add.rs
@@ -1,4 +1,3 @@
-#![feature(never_type)]
#![allow(unused_variables)]
#![deny(unreachable_code)]
diff --git a/src/test/ui/reachable/expr_add.stderr b/src/test/ui/reachable/expr_add.stderr
index 880dea1cc3516..11c41fdc3946b 100644
--- a/src/test/ui/reachable/expr_add.stderr
+++ b/src/test/ui/reachable/expr_add.stderr
@@ -1,5 +1,5 @@
error: unreachable expression
- --> $DIR/expr_add.rs:17:13
+ --> $DIR/expr_add.rs:16:13
|
LL | let x = Foo + return;
| ^^^^^^------
@@ -8,7 +8,7 @@ LL | let x = Foo + return;
| unreachable expression
|
note: lint level defined here
- --> $DIR/expr_add.rs:3:9
+ --> $DIR/expr_add.rs:2:9
|
LL | #![deny(unreachable_code)]
| ^^^^^^^^^^^^^^^^
diff --git a/src/test/ui/reachable/expr_assign.rs b/src/test/ui/reachable/expr_assign.rs
index e547f75e2697b..3914fb32432ef 100644
--- a/src/test/ui/reachable/expr_assign.rs
+++ b/src/test/ui/reachable/expr_assign.rs
@@ -1,4 +1,3 @@
-#![feature(never_type)]
#![allow(unused_variables)]
#![allow(unused_assignments)]
#![allow(dead_code)]
diff --git a/src/test/ui/reachable/expr_assign.stderr b/src/test/ui/reachable/expr_assign.stderr
index 3004da0406328..90aec15e3be1e 100644
--- a/src/test/ui/reachable/expr_assign.stderr
+++ b/src/test/ui/reachable/expr_assign.stderr
@@ -1,5 +1,5 @@
error: unreachable expression
- --> $DIR/expr_assign.rs:10:5
+ --> $DIR/expr_assign.rs:9:5
|
LL | x = return;
| ^^^^------
@@ -8,13 +8,13 @@ LL | x = return;
| unreachable expression
|
note: lint level defined here
- --> $DIR/expr_assign.rs:5:9
+ --> $DIR/expr_assign.rs:4:9
|
LL | #![deny(unreachable_code)]
| ^^^^^^^^^^^^^^^^
error: unreachable expression
- --> $DIR/expr_assign.rs:20:14
+ --> $DIR/expr_assign.rs:19:14
|
LL | *p = return;
| -- ^^^^^^ unreachable expression
@@ -22,7 +22,7 @@ LL | *p = return;
| any code following this expression is unreachable
error: unreachable expression
- --> $DIR/expr_assign.rs:26:15
+ --> $DIR/expr_assign.rs:25:15
|
LL | *{return; &mut i} = 22;
| ------ ^^^^^^ unreachable expression
diff --git a/src/test/ui/reachable/expr_call.rs b/src/test/ui/reachable/expr_call.rs
index 1eaa96c3ce773..ce1a94e3c4a25 100644
--- a/src/test/ui/reachable/expr_call.rs
+++ b/src/test/ui/reachable/expr_call.rs
@@ -1,4 +1,3 @@
-#![feature(never_type)]
#![allow(unused_variables)]
#![allow(unused_assignments)]
#![allow(dead_code)]
diff --git a/src/test/ui/reachable/expr_call.stderr b/src/test/ui/reachable/expr_call.stderr
index ae8b4dd87b5b9..613fc31b8613e 100644
--- a/src/test/ui/reachable/expr_call.stderr
+++ b/src/test/ui/reachable/expr_call.stderr
@@ -1,5 +1,5 @@
error: unreachable expression
- --> $DIR/expr_call.rs:13:17
+ --> $DIR/expr_call.rs:12:17
|
LL | foo(return, 22);
| ------ ^^ unreachable expression
@@ -7,13 +7,13 @@ LL | foo(return, 22);
| any code following this expression is unreachable
|
note: lint level defined here
- --> $DIR/expr_call.rs:5:9
+ --> $DIR/expr_call.rs:4:9
|
LL | #![deny(unreachable_code)]
| ^^^^^^^^^^^^^^^^
error: unreachable call
- --> $DIR/expr_call.rs:18:5
+ --> $DIR/expr_call.rs:17:5
|
LL | bar(return);
| ^^^ ------ any code following this expression is unreachable
diff --git a/src/test/ui/reachable/expr_cast.rs b/src/test/ui/reachable/expr_cast.rs
index f53bcb97e6972..76a7306b9d9e0 100644
--- a/src/test/ui/reachable/expr_cast.rs
+++ b/src/test/ui/reachable/expr_cast.rs
@@ -2,7 +2,7 @@
#![allow(unused_assignments)]
#![allow(dead_code)]
#![deny(unreachable_code)]
-#![feature(never_type, type_ascription)]
+#![feature(type_ascription)]
fn a() {
// the cast is unreachable:
diff --git a/src/test/ui/reachable/expr_method.rs b/src/test/ui/reachable/expr_method.rs
index d917df05b3c3d..e74a7daec8828 100644
--- a/src/test/ui/reachable/expr_method.rs
+++ b/src/test/ui/reachable/expr_method.rs
@@ -1,4 +1,3 @@
-#![feature(never_type)]
#![allow(unused_variables)]
#![allow(unused_assignments)]
#![allow(dead_code)]
diff --git a/src/test/ui/reachable/expr_method.stderr b/src/test/ui/reachable/expr_method.stderr
index 82a0745f0629f..7475cf7a365b5 100644
--- a/src/test/ui/reachable/expr_method.stderr
+++ b/src/test/ui/reachable/expr_method.stderr
@@ -1,5 +1,5 @@
error: unreachable expression
- --> $DIR/expr_method.rs:16:21
+ --> $DIR/expr_method.rs:15:21
|
LL | Foo.foo(return, 22);
| ------ ^^ unreachable expression
@@ -7,13 +7,13 @@ LL | Foo.foo(return, 22);
| any code following this expression is unreachable
|
note: lint level defined here
- --> $DIR/expr_method.rs:5:9
+ --> $DIR/expr_method.rs:4:9
|
LL | #![deny(unreachable_code)]
| ^^^^^^^^^^^^^^^^
error: unreachable call
- --> $DIR/expr_method.rs:21:9
+ --> $DIR/expr_method.rs:20:9
|
LL | Foo.bar(return);
| ^^^ ------ any code following this expression is unreachable
diff --git a/src/test/ui/reachable/expr_type.rs b/src/test/ui/reachable/expr_type.rs
index 8d32397b54248..ff647bda0e87e 100644
--- a/src/test/ui/reachable/expr_type.rs
+++ b/src/test/ui/reachable/expr_type.rs
@@ -2,7 +2,7 @@
#![allow(unused_assignments)]
#![allow(dead_code)]
#![deny(unreachable_code)]
-#![feature(never_type, type_ascription)]
+#![feature(type_ascription)]
fn a() {
// the cast is unreachable:
diff --git a/src/test/ui/reachable/expr_unary.rs b/src/test/ui/reachable/expr_unary.rs
index e229d22ebc798..6f221c360cb17 100644
--- a/src/test/ui/reachable/expr_unary.rs
+++ b/src/test/ui/reachable/expr_unary.rs
@@ -1,4 +1,3 @@
-#![feature(never_type)]
#![allow(unused_variables)]
#![allow(unused_assignments)]
#![allow(dead_code)]
diff --git a/src/test/ui/reachable/expr_unary.stderr b/src/test/ui/reachable/expr_unary.stderr
index f5c3564217bba..a576f92092335 100644
--- a/src/test/ui/reachable/expr_unary.stderr
+++ b/src/test/ui/reachable/expr_unary.stderr
@@ -1,11 +1,11 @@
error[E0600]: cannot apply unary operator `!` to type `!`
- --> $DIR/expr_unary.rs:8:16
+ --> $DIR/expr_unary.rs:7:16
|
LL | let x: ! = ! { return; };
| ^^^^^^^^^^^^^ cannot apply unary operator `!`
error: unreachable expression
- --> $DIR/expr_unary.rs:8:16
+ --> $DIR/expr_unary.rs:7:16
|
LL | let x: ! = ! { return; };
| ^^^^------^^^
@@ -14,7 +14,7 @@ LL | let x: ! = ! { return; };
| unreachable expression
|
note: lint level defined here
- --> $DIR/expr_unary.rs:5:9
+ --> $DIR/expr_unary.rs:4:9
|
LL | #![deny(unreachable_code)]
| ^^^^^^^^^^^^^^^^
diff --git a/src/test/ui/reachable/unreachable-loop-patterns.rs b/src/test/ui/reachable/unreachable-loop-patterns.rs
index 6f1d2efa1b200..c8ff56539116f 100644
--- a/src/test/ui/reachable/unreachable-loop-patterns.rs
+++ b/src/test/ui/reachable/unreachable-loop-patterns.rs
@@ -1,4 +1,4 @@
-#![feature(never_type)]
+#![feature(never_type_fallback)]
#![feature(exhaustive_patterns)]
#![allow(unreachable_code)]
diff --git a/src/test/ui/reachable/unreachable-try-pattern.rs b/src/test/ui/reachable/unreachable-try-pattern.rs
index 23360e73f4a3a..e2d89e93a2aa0 100644
--- a/src/test/ui/reachable/unreachable-try-pattern.rs
+++ b/src/test/ui/reachable/unreachable-try-pattern.rs
@@ -1,5 +1,5 @@
// check-pass
-#![feature(never_type, exhaustive_patterns)]
+#![feature(exhaustive_patterns)]
#![warn(unreachable_code)]
#![warn(unreachable_patterns)]
diff --git a/src/test/ui/reachable/unwarned-match-on-never.rs b/src/test/ui/reachable/unwarned-match-on-never.rs
index 71f8fe3a783e2..c38ea6ab9ad01 100644
--- a/src/test/ui/reachable/unwarned-match-on-never.rs
+++ b/src/test/ui/reachable/unwarned-match-on-never.rs
@@ -1,8 +1,6 @@
#![deny(unreachable_code)]
#![allow(dead_code)]
-#![feature(never_type)]
-
fn foo(x: !) -> bool {
// Explicit matches on the never type are unwarned.
match x {}
diff --git a/src/test/ui/reachable/unwarned-match-on-never.stderr b/src/test/ui/reachable/unwarned-match-on-never.stderr
index 6b2fb4a33c1e8..6710fcb777f7a 100644
--- a/src/test/ui/reachable/unwarned-match-on-never.stderr
+++ b/src/test/ui/reachable/unwarned-match-on-never.stderr
@@ -1,5 +1,5 @@
error: unreachable expression
- --> $DIR/unwarned-match-on-never.rs:10:5
+ --> $DIR/unwarned-match-on-never.rs:8:5
|
LL | match x {}
| - any code following this expression is unreachable
@@ -14,7 +14,7 @@ LL | #![deny(unreachable_code)]
| ^^^^^^^^^^^^^^^^
error: unreachable arm
- --> $DIR/unwarned-match-on-never.rs:15:15
+ --> $DIR/unwarned-match-on-never.rs:13:15
|
LL | match (return) {
| -------- any code following this expression is unreachable
@@ -22,7 +22,7 @@ LL | () => ()
| ^^ unreachable arm
error: unreachable expression
- --> $DIR/unwarned-match-on-never.rs:21:5
+ --> $DIR/unwarned-match-on-never.rs:19:5
|
LL | return;
| ------ any code following this expression is unreachable
diff --git a/src/test/ui/rfc-2008-non-exhaustive/uninhabited/auxiliary/uninhabited.rs b/src/test/ui/rfc-2008-non-exhaustive/uninhabited/auxiliary/uninhabited.rs
index a2735d4cbfb29..e074183a0490c 100644
--- a/src/test/ui/rfc-2008-non-exhaustive/uninhabited/auxiliary/uninhabited.rs
+++ b/src/test/ui/rfc-2008-non-exhaustive/uninhabited/auxiliary/uninhabited.rs
@@ -1,5 +1,4 @@
#![crate_type = "rlib"]
-#![feature(never_type)]
#[non_exhaustive]
pub enum UninhabitedEnum {
diff --git a/src/test/ui/rfc-2008-non-exhaustive/uninhabited/coercions.rs b/src/test/ui/rfc-2008-non-exhaustive/uninhabited/coercions.rs
index 80b9dc4c1c338..5684ee6b7bf86 100644
--- a/src/test/ui/rfc-2008-non-exhaustive/uninhabited/coercions.rs
+++ b/src/test/ui/rfc-2008-non-exhaustive/uninhabited/coercions.rs
@@ -1,5 +1,4 @@
// aux-build:uninhabited.rs
-#![feature(never_type)]
extern crate uninhabited;
diff --git a/src/test/ui/rfc-2008-non-exhaustive/uninhabited/coercions.stderr b/src/test/ui/rfc-2008-non-exhaustive/uninhabited/coercions.stderr
index d05ee1d39ec35..dd4b0cd1e87e2 100644
--- a/src/test/ui/rfc-2008-non-exhaustive/uninhabited/coercions.stderr
+++ b/src/test/ui/rfc-2008-non-exhaustive/uninhabited/coercions.stderr
@@ -1,5 +1,5 @@
error[E0308]: mismatched types
- --> $DIR/coercions.rs:23:5
+ --> $DIR/coercions.rs:22:5
|
LL | fn cannot_coerce_empty_enum_to_anything(x: UninhabitedEnum) -> A {
| - expected `A` because of return type
@@ -10,7 +10,7 @@ LL | x
found type `uninhabited::UninhabitedEnum`
error[E0308]: mismatched types
- --> $DIR/coercions.rs:27:5
+ --> $DIR/coercions.rs:26:5
|
LL | fn cannot_coerce_empty_tuple_struct_to_anything(x: UninhabitedTupleStruct) -> A {
| - expected `A` because of return type
@@ -21,7 +21,7 @@ LL | x
found type `uninhabited::UninhabitedTupleStruct`
error[E0308]: mismatched types
- --> $DIR/coercions.rs:31:5
+ --> $DIR/coercions.rs:30:5
|
LL | fn cannot_coerce_empty_struct_to_anything(x: UninhabitedStruct) -> A {
| - expected `A` because of return type
@@ -32,7 +32,7 @@ LL | x
found type `uninhabited::UninhabitedStruct`
error[E0308]: mismatched types
- --> $DIR/coercions.rs:35:5
+ --> $DIR/coercions.rs:34:5
|
LL | fn cannot_coerce_enum_with_empty_variants_to_anything(x: UninhabitedVariants) -> A {
| - expected `A` because of return type
diff --git a/src/test/ui/rfc-2008-non-exhaustive/uninhabited/coercions_same_crate.rs b/src/test/ui/rfc-2008-non-exhaustive/uninhabited/coercions_same_crate.rs
index 6b911dd989cc5..c3c0ce650d73e 100644
--- a/src/test/ui/rfc-2008-non-exhaustive/uninhabited/coercions_same_crate.rs
+++ b/src/test/ui/rfc-2008-non-exhaustive/uninhabited/coercions_same_crate.rs
@@ -1,5 +1,3 @@
-#![feature(never_type)]
-
#[non_exhaustive]
pub enum UninhabitedEnum {
}
diff --git a/src/test/ui/rfc-2008-non-exhaustive/uninhabited/coercions_same_crate.stderr b/src/test/ui/rfc-2008-non-exhaustive/uninhabited/coercions_same_crate.stderr
index a07473dade22c..fd49c6823988a 100644
--- a/src/test/ui/rfc-2008-non-exhaustive/uninhabited/coercions_same_crate.stderr
+++ b/src/test/ui/rfc-2008-non-exhaustive/uninhabited/coercions_same_crate.stderr
@@ -1,5 +1,5 @@
error[E0308]: mismatched types
- --> $DIR/coercions_same_crate.rs:30:5
+ --> $DIR/coercions_same_crate.rs:28:5
|
LL | fn cannot_coerce_empty_enum_to_anything(x: UninhabitedEnum) -> A {
| - expected `A` because of return type
@@ -10,7 +10,7 @@ LL | x
found type `UninhabitedEnum`
error[E0308]: mismatched types
- --> $DIR/coercions_same_crate.rs:34:5
+ --> $DIR/coercions_same_crate.rs:32:5
|
LL | fn cannot_coerce_empty_tuple_struct_to_anything(x: UninhabitedTupleStruct) -> A {
| - expected `A` because of return type
@@ -21,7 +21,7 @@ LL | x
found type `UninhabitedTupleStruct`
error[E0308]: mismatched types
- --> $DIR/coercions_same_crate.rs:38:5
+ --> $DIR/coercions_same_crate.rs:36:5
|
LL | fn cannot_coerce_empty_struct_to_anything(x: UninhabitedStruct) -> A {
| - expected `A` because of return type
@@ -32,7 +32,7 @@ LL | x
found type `UninhabitedStruct`
error[E0308]: mismatched types
- --> $DIR/coercions_same_crate.rs:42:5
+ --> $DIR/coercions_same_crate.rs:40:5
|
LL | fn cannot_coerce_enum_with_empty_variants_to_anything(x: UninhabitedVariants) -> A {
| - expected `A` because of return type
diff --git a/src/test/ui/rfc-2008-non-exhaustive/uninhabited/indirect_match.rs b/src/test/ui/rfc-2008-non-exhaustive/uninhabited/indirect_match.rs
index 98a7fdbc5049a..511b6b1bf8f6c 100644
--- a/src/test/ui/rfc-2008-non-exhaustive/uninhabited/indirect_match.rs
+++ b/src/test/ui/rfc-2008-non-exhaustive/uninhabited/indirect_match.rs
@@ -1,5 +1,4 @@
// aux-build:uninhabited.rs
-#![feature(never_type)]
extern crate uninhabited;
diff --git a/src/test/ui/rfc-2008-non-exhaustive/uninhabited/indirect_match.stderr b/src/test/ui/rfc-2008-non-exhaustive/uninhabited/indirect_match.stderr
index af82022e1da99..b903e9b288ef7 100644
--- a/src/test/ui/rfc-2008-non-exhaustive/uninhabited/indirect_match.stderr
+++ b/src/test/ui/rfc-2008-non-exhaustive/uninhabited/indirect_match.stderr
@@ -1,5 +1,5 @@
error[E0004]: non-exhaustive patterns: pattern `IndirectUninhabitedEnum` of type `uninhabited::IndirectUninhabitedEnum` is not handled
- --> $DIR/indirect_match.rs:19:11
+ --> $DIR/indirect_match.rs:18:11
|
LL | match x {}
| ^
@@ -7,7 +7,7 @@ LL | match x {}
= help: ensure that all possible cases are being handled, possibly by adding wildcards or more match arms
error[E0004]: non-exhaustive patterns: pattern `IndirectUninhabitedStruct` of type `uninhabited::IndirectUninhabitedStruct` is not handled
- --> $DIR/indirect_match.rs:23:11
+ --> $DIR/indirect_match.rs:22:11
|
LL | match x {}
| ^
@@ -15,7 +15,7 @@ LL | match x {}
= help: ensure that all possible cases are being handled, possibly by adding wildcards or more match arms
error[E0004]: non-exhaustive patterns: pattern `IndirectUninhabitedTupleStruct` of type `uninhabited::IndirectUninhabitedTupleStruct` is not handled
- --> $DIR/indirect_match.rs:27:11
+ --> $DIR/indirect_match.rs:26:11
|
LL | match x {}
| ^
@@ -23,7 +23,7 @@ LL | match x {}
= help: ensure that all possible cases are being handled, possibly by adding wildcards or more match arms
error[E0004]: non-exhaustive patterns: pattern `IndirectUninhabitedVariants` of type `uninhabited::IndirectUninhabitedVariants` is not handled
- --> $DIR/indirect_match.rs:33:11
+ --> $DIR/indirect_match.rs:32:11
|
LL | match x {}
| ^
diff --git a/src/test/ui/rfc-2008-non-exhaustive/uninhabited/indirect_match_same_crate.rs b/src/test/ui/rfc-2008-non-exhaustive/uninhabited/indirect_match_same_crate.rs
index 8f090fe886a00..9c3ec4240a5fd 100644
--- a/src/test/ui/rfc-2008-non-exhaustive/uninhabited/indirect_match_same_crate.rs
+++ b/src/test/ui/rfc-2008-non-exhaustive/uninhabited/indirect_match_same_crate.rs
@@ -1,5 +1,3 @@
-#![feature(never_type)]
-
#[non_exhaustive]
pub enum UninhabitedEnum {
}
diff --git a/src/test/ui/rfc-2008-non-exhaustive/uninhabited/indirect_match_same_crate.stderr b/src/test/ui/rfc-2008-non-exhaustive/uninhabited/indirect_match_same_crate.stderr
index c03018a523647..f94616dc64b1b 100644
--- a/src/test/ui/rfc-2008-non-exhaustive/uninhabited/indirect_match_same_crate.stderr
+++ b/src/test/ui/rfc-2008-non-exhaustive/uninhabited/indirect_match_same_crate.stderr
@@ -1,5 +1,5 @@
error[E0004]: non-exhaustive patterns: pattern `IndirectUninhabitedEnum` of type `IndirectUninhabitedEnum` is not handled
- --> $DIR/indirect_match_same_crate.rs:34:11
+ --> $DIR/indirect_match_same_crate.rs:32:11
|
LL | pub struct IndirectUninhabitedEnum(UninhabitedEnum);
| ----------------------------------------------------
@@ -13,7 +13,7 @@ LL | match x {}
= help: ensure that all possible cases are being handled, possibly by adding wildcards or more match arms
error[E0004]: non-exhaustive patterns: pattern `IndirectUninhabitedStruct` of type `IndirectUninhabitedStruct` is not handled
- --> $DIR/indirect_match_same_crate.rs:38:11
+ --> $DIR/indirect_match_same_crate.rs:36:11
|
LL | pub struct IndirectUninhabitedStruct(UninhabitedStruct);
| --------------------------------------------------------
@@ -27,7 +27,7 @@ LL | match x {}
= help: ensure that all possible cases are being handled, possibly by adding wildcards or more match arms
error[E0004]: non-exhaustive patterns: pattern `IndirectUninhabitedTupleStruct` of type `IndirectUninhabitedTupleStruct` is not handled
- --> $DIR/indirect_match_same_crate.rs:42:11
+ --> $DIR/indirect_match_same_crate.rs:40:11
|
LL | pub struct IndirectUninhabitedTupleStruct(UninhabitedTupleStruct);
| ------------------------------------------------------------------
@@ -41,7 +41,7 @@ LL | match x {}
= help: ensure that all possible cases are being handled, possibly by adding wildcards or more match arms
error[E0004]: non-exhaustive patterns: pattern `IndirectUninhabitedVariants` of type `IndirectUninhabitedVariants` is not handled
- --> $DIR/indirect_match_same_crate.rs:48:11
+ --> $DIR/indirect_match_same_crate.rs:46:11
|
LL | pub struct IndirectUninhabitedVariants(UninhabitedVariants);
| ------------------------------------------------------------
diff --git a/src/test/ui/rfc-2008-non-exhaustive/uninhabited/indirect_match_with_exhaustive_patterns.rs b/src/test/ui/rfc-2008-non-exhaustive/uninhabited/indirect_match_with_exhaustive_patterns.rs
index be86519ecb159..68ac42ef5878d 100644
--- a/src/test/ui/rfc-2008-non-exhaustive/uninhabited/indirect_match_with_exhaustive_patterns.rs
+++ b/src/test/ui/rfc-2008-non-exhaustive/uninhabited/indirect_match_with_exhaustive_patterns.rs
@@ -1,7 +1,6 @@
// aux-build:uninhabited.rs
#![deny(unreachable_patterns)]
#![feature(exhaustive_patterns)]
-#![feature(never_type)]
extern crate uninhabited;
diff --git a/src/test/ui/rfc-2008-non-exhaustive/uninhabited/indirect_match_with_exhaustive_patterns.stderr b/src/test/ui/rfc-2008-non-exhaustive/uninhabited/indirect_match_with_exhaustive_patterns.stderr
index 17a8d01007205..2c2e542934177 100644
--- a/src/test/ui/rfc-2008-non-exhaustive/uninhabited/indirect_match_with_exhaustive_patterns.stderr
+++ b/src/test/ui/rfc-2008-non-exhaustive/uninhabited/indirect_match_with_exhaustive_patterns.stderr
@@ -1,5 +1,5 @@
error[E0004]: non-exhaustive patterns: type `uninhabited::IndirectUninhabitedEnum` is non-empty
- --> $DIR/indirect_match_with_exhaustive_patterns.rs:23:11
+ --> $DIR/indirect_match_with_exhaustive_patterns.rs:22:11
|
LL | match x {}
| ^
@@ -7,7 +7,7 @@ LL | match x {}
= help: ensure that all possible cases are being handled, possibly by adding wildcards or more match arms
error[E0004]: non-exhaustive patterns: type `uninhabited::IndirectUninhabitedStruct` is non-empty
- --> $DIR/indirect_match_with_exhaustive_patterns.rs:27:11
+ --> $DIR/indirect_match_with_exhaustive_patterns.rs:26:11
|
LL | match x {}
| ^
@@ -15,7 +15,7 @@ LL | match x {}
= help: ensure that all possible cases are being handled, possibly by adding wildcards or more match arms
error[E0004]: non-exhaustive patterns: type `uninhabited::IndirectUninhabitedTupleStruct` is non-empty
- --> $DIR/indirect_match_with_exhaustive_patterns.rs:31:11
+ --> $DIR/indirect_match_with_exhaustive_patterns.rs:30:11
|
LL | match x {}
| ^
@@ -23,7 +23,7 @@ LL | match x {}
= help: ensure that all possible cases are being handled, possibly by adding wildcards or more match arms
error[E0004]: non-exhaustive patterns: type `uninhabited::IndirectUninhabitedVariants` is non-empty
- --> $DIR/indirect_match_with_exhaustive_patterns.rs:37:11
+ --> $DIR/indirect_match_with_exhaustive_patterns.rs:36:11
|
LL | match x {}
| ^
diff --git a/src/test/ui/rfc-2008-non-exhaustive/uninhabited/indirect_match_with_exhaustive_patterns_same_crate.rs b/src/test/ui/rfc-2008-non-exhaustive/uninhabited/indirect_match_with_exhaustive_patterns_same_crate.rs
index 60289aa780378..06c318414f03f 100644
--- a/src/test/ui/rfc-2008-non-exhaustive/uninhabited/indirect_match_with_exhaustive_patterns_same_crate.rs
+++ b/src/test/ui/rfc-2008-non-exhaustive/uninhabited/indirect_match_with_exhaustive_patterns_same_crate.rs
@@ -2,7 +2,6 @@
#![deny(unreachable_patterns)]
#![feature(exhaustive_patterns)]
-#![feature(never_type)]
#[non_exhaustive]
pub enum UninhabitedEnum {
diff --git a/src/test/ui/rfc-2008-non-exhaustive/uninhabited/match.rs b/src/test/ui/rfc-2008-non-exhaustive/uninhabited/match.rs
index e54098d4d48b9..fd3dbca04c00f 100644
--- a/src/test/ui/rfc-2008-non-exhaustive/uninhabited/match.rs
+++ b/src/test/ui/rfc-2008-non-exhaustive/uninhabited/match.rs
@@ -1,5 +1,4 @@
// aux-build:uninhabited.rs
-#![feature(never_type)]
extern crate uninhabited;
diff --git a/src/test/ui/rfc-2008-non-exhaustive/uninhabited/match.stderr b/src/test/ui/rfc-2008-non-exhaustive/uninhabited/match.stderr
index de39688f45a4d..de3fa900cd622 100644
--- a/src/test/ui/rfc-2008-non-exhaustive/uninhabited/match.stderr
+++ b/src/test/ui/rfc-2008-non-exhaustive/uninhabited/match.stderr
@@ -1,5 +1,5 @@
error[E0004]: non-exhaustive patterns: type `uninhabited::UninhabitedEnum` is non-empty
- --> $DIR/match.rs:19:11
+ --> $DIR/match.rs:18:11
|
LL | match x {}
| ^
@@ -7,7 +7,7 @@ LL | match x {}
= help: ensure that all possible cases are being handled, possibly by adding wildcards or more match arms
error[E0004]: non-exhaustive patterns: pattern `UninhabitedStruct` of type `uninhabited::UninhabitedStruct` is not handled
- --> $DIR/match.rs:23:11
+ --> $DIR/match.rs:22:11
|
LL | match x {}
| ^
@@ -15,7 +15,7 @@ LL | match x {}
= help: ensure that all possible cases are being handled, possibly by adding wildcards or more match arms
error[E0004]: non-exhaustive patterns: pattern `UninhabitedTupleStruct` of type `uninhabited::UninhabitedTupleStruct` is not handled
- --> $DIR/match.rs:27:11
+ --> $DIR/match.rs:26:11
|
LL | match x {}
| ^
@@ -23,7 +23,7 @@ LL | match x {}
= help: ensure that all possible cases are being handled, possibly by adding wildcards or more match arms
error[E0004]: non-exhaustive patterns: multiple patterns of type `uninhabited::UninhabitedVariants` are not handled
- --> $DIR/match.rs:31:11
+ --> $DIR/match.rs:30:11
|
LL | match x {}
| ^
diff --git a/src/test/ui/rfc-2008-non-exhaustive/uninhabited/match_same_crate.rs b/src/test/ui/rfc-2008-non-exhaustive/uninhabited/match_same_crate.rs
index ebbdfba15f3a3..c31688add91b2 100644
--- a/src/test/ui/rfc-2008-non-exhaustive/uninhabited/match_same_crate.rs
+++ b/src/test/ui/rfc-2008-non-exhaustive/uninhabited/match_same_crate.rs
@@ -1,5 +1,3 @@
-#![feature(never_type)]
-
#[non_exhaustive]
pub enum UninhabitedEnum {
}
diff --git a/src/test/ui/rfc-2008-non-exhaustive/uninhabited/match_same_crate.stderr b/src/test/ui/rfc-2008-non-exhaustive/uninhabited/match_same_crate.stderr
index c39df05a8f74e..3dd1a914d5542 100644
--- a/src/test/ui/rfc-2008-non-exhaustive/uninhabited/match_same_crate.stderr
+++ b/src/test/ui/rfc-2008-non-exhaustive/uninhabited/match_same_crate.stderr
@@ -1,5 +1,5 @@
error[E0004]: non-exhaustive patterns: pattern `UninhabitedStruct` of type `UninhabitedStruct` is not handled
- --> $DIR/match_same_crate.rs:30:11
+ --> $DIR/match_same_crate.rs:28:11
|
LL | pub struct UninhabitedStruct {
| - ----------------- variant not covered
@@ -15,7 +15,7 @@ LL | match x {}
= help: ensure that all possible cases are being handled, possibly by adding wildcards or more match arms
error[E0004]: non-exhaustive patterns: pattern `UninhabitedTupleStruct` of type `UninhabitedTupleStruct` is not handled
- --> $DIR/match_same_crate.rs:34:11
+ --> $DIR/match_same_crate.rs:32:11
|
LL | pub struct UninhabitedTupleStruct(!);
| -------------------------------------
@@ -29,7 +29,7 @@ LL | match x {}
= help: ensure that all possible cases are being handled, possibly by adding wildcards or more match arms
error[E0004]: non-exhaustive patterns: multiple patterns of type `UninhabitedVariants` are not handled
- --> $DIR/match_same_crate.rs:38:11
+ --> $DIR/match_same_crate.rs:36:11
|
LL | / pub enum UninhabitedVariants {
LL | | #[non_exhaustive] Tuple(!),
diff --git a/src/test/ui/rfc-2008-non-exhaustive/uninhabited/match_with_exhaustive_patterns.rs b/src/test/ui/rfc-2008-non-exhaustive/uninhabited/match_with_exhaustive_patterns.rs
index 900dfff652ea6..37d739834d20c 100644
--- a/src/test/ui/rfc-2008-non-exhaustive/uninhabited/match_with_exhaustive_patterns.rs
+++ b/src/test/ui/rfc-2008-non-exhaustive/uninhabited/match_with_exhaustive_patterns.rs
@@ -1,7 +1,6 @@
// aux-build:uninhabited.rs
#![deny(unreachable_patterns)]
#![feature(exhaustive_patterns)]
-#![feature(never_type)]
extern crate uninhabited;
diff --git a/src/test/ui/rfc-2008-non-exhaustive/uninhabited/match_with_exhaustive_patterns.stderr b/src/test/ui/rfc-2008-non-exhaustive/uninhabited/match_with_exhaustive_patterns.stderr
index 48a888bc50be0..3b56c6890710d 100644
--- a/src/test/ui/rfc-2008-non-exhaustive/uninhabited/match_with_exhaustive_patterns.stderr
+++ b/src/test/ui/rfc-2008-non-exhaustive/uninhabited/match_with_exhaustive_patterns.stderr
@@ -1,5 +1,5 @@
error[E0004]: non-exhaustive patterns: type `uninhabited::UninhabitedEnum` is non-empty
- --> $DIR/match_with_exhaustive_patterns.rs:22:11
+ --> $DIR/match_with_exhaustive_patterns.rs:21:11
|
LL | match x {}
| ^
@@ -7,7 +7,7 @@ LL | match x {}
= help: ensure that all possible cases are being handled, possibly by adding wildcards or more match arms
error[E0004]: non-exhaustive patterns: type `uninhabited::UninhabitedStruct` is non-empty
- --> $DIR/match_with_exhaustive_patterns.rs:26:11
+ --> $DIR/match_with_exhaustive_patterns.rs:25:11
|
LL | match x {}
| ^
@@ -15,7 +15,7 @@ LL | match x {}
= help: ensure that all possible cases are being handled, possibly by adding wildcards or more match arms
error[E0004]: non-exhaustive patterns: type `uninhabited::UninhabitedTupleStruct` is non-empty
- --> $DIR/match_with_exhaustive_patterns.rs:30:11
+ --> $DIR/match_with_exhaustive_patterns.rs:29:11
|
LL | match x {}
| ^
@@ -23,7 +23,7 @@ LL | match x {}
= help: ensure that all possible cases are being handled, possibly by adding wildcards or more match arms
error[E0004]: non-exhaustive patterns: type `uninhabited::UninhabitedVariants` is non-empty
- --> $DIR/match_with_exhaustive_patterns.rs:34:11
+ --> $DIR/match_with_exhaustive_patterns.rs:33:11
|
LL | match x {}
| ^
diff --git a/src/test/ui/rfc-2008-non-exhaustive/uninhabited/match_with_exhaustive_patterns_same_crate.rs b/src/test/ui/rfc-2008-non-exhaustive/uninhabited/match_with_exhaustive_patterns_same_crate.rs
index de5530485f3e6..2b2e4b6e77d87 100644
--- a/src/test/ui/rfc-2008-non-exhaustive/uninhabited/match_with_exhaustive_patterns_same_crate.rs
+++ b/src/test/ui/rfc-2008-non-exhaustive/uninhabited/match_with_exhaustive_patterns_same_crate.rs
@@ -2,7 +2,6 @@
#![deny(unreachable_patterns)]
#![feature(exhaustive_patterns)]
-#![feature(never_type)]
#[non_exhaustive]
pub enum UninhabitedEnum {
diff --git a/src/test/ui/rfc-2008-non-exhaustive/uninhabited/patterns_same_crate.rs b/src/test/ui/rfc-2008-non-exhaustive/uninhabited/patterns_same_crate.rs
index ffc496a975ecf..3d4cca4505ef1 100644
--- a/src/test/ui/rfc-2008-non-exhaustive/uninhabited/patterns_same_crate.rs
+++ b/src/test/ui/rfc-2008-non-exhaustive/uninhabited/patterns_same_crate.rs
@@ -1,6 +1,5 @@
#![deny(unreachable_patterns)]
#![feature(exhaustive_patterns)]
-#![feature(never_type)]
#[non_exhaustive]
pub enum UninhabitedEnum {
diff --git a/src/test/ui/rfc-2008-non-exhaustive/uninhabited/patterns_same_crate.stderr b/src/test/ui/rfc-2008-non-exhaustive/uninhabited/patterns_same_crate.stderr
index e3de94be1282e..fea883f891200 100644
--- a/src/test/ui/rfc-2008-non-exhaustive/uninhabited/patterns_same_crate.stderr
+++ b/src/test/ui/rfc-2008-non-exhaustive/uninhabited/patterns_same_crate.stderr
@@ -1,5 +1,5 @@
error: unreachable pattern
- --> $DIR/patterns_same_crate.rs:52:9
+ --> $DIR/patterns_same_crate.rs:51:9
|
LL | Some(_x) => (),
| ^^^^^^^^
@@ -11,25 +11,25 @@ LL | #![deny(unreachable_patterns)]
| ^^^^^^^^^^^^^^^^^^^^
error: unreachable pattern
- --> $DIR/patterns_same_crate.rs:57:9
+ --> $DIR/patterns_same_crate.rs:56:9
|
LL | Some(_x) => (),
| ^^^^^^^^
error: unreachable pattern
- --> $DIR/patterns_same_crate.rs:61:15
+ --> $DIR/patterns_same_crate.rs:60:15
|
LL | while let PartiallyInhabitedVariants::Struct { x } = partially_inhabited_variant() {
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
error: unreachable pattern
- --> $DIR/patterns_same_crate.rs:65:15
+ --> $DIR/patterns_same_crate.rs:64:15
|
LL | while let Some(_x) = uninhabited_struct() {
| ^^^^^^^^
error: unreachable pattern
- --> $DIR/patterns_same_crate.rs:68:15
+ --> $DIR/patterns_same_crate.rs:67:15
|
LL | while let Some(_x) = uninhabited_tuple_struct() {
| ^^^^^^^^
diff --git a/src/test/ui/traits/reservation-impls/reservation-impl-non-lattice-ok.rs b/src/test/ui/traits/reservation-impls/reservation-impl-non-lattice-ok.rs
index f14589ccf846d..0e0197803b761 100644
--- a/src/test/ui/traits/reservation-impls/reservation-impl-non-lattice-ok.rs
+++ b/src/test/ui/traits/reservation-impls/reservation-impl-non-lattice-ok.rs
@@ -30,7 +30,7 @@
//
// [ii]: http://smallcultfollowing.com/babysteps/blog/2016/09/24/intersection-impls/
-#![feature(rustc_attrs, never_type)]
+#![feature(rustc_attrs)]
trait MyTrait {}
diff --git a/src/test/ui/type-sizes.rs b/src/test/ui/type-sizes.rs
index 27433fd770b05..3dfe0ad7f72c1 100644
--- a/src/test/ui/type-sizes.rs
+++ b/src/test/ui/type-sizes.rs
@@ -2,7 +2,6 @@
#![allow(non_camel_case_types)]
#![allow(dead_code)]
-#![feature(never_type)]
use std::mem::size_of;
diff --git a/src/test/ui/uninhabited/uninhabited-irrefutable.rs b/src/test/ui/uninhabited/uninhabited-irrefutable.rs
index 48cd92719b49a..84daa35484f81 100644
--- a/src/test/ui/uninhabited/uninhabited-irrefutable.rs
+++ b/src/test/ui/uninhabited/uninhabited-irrefutable.rs
@@ -1,4 +1,3 @@
-#![feature(never_type)]
#![feature(exhaustive_patterns)]
mod foo {
diff --git a/src/test/ui/uninhabited/uninhabited-irrefutable.stderr b/src/test/ui/uninhabited/uninhabited-irrefutable.stderr
index 26e1be34ea75d..6ba03ee508316 100644
--- a/src/test/ui/uninhabited/uninhabited-irrefutable.stderr
+++ b/src/test/ui/uninhabited/uninhabited-irrefutable.stderr
@@ -1,5 +1,5 @@
error[E0005]: refutable pattern in local binding: `A(_)` not covered
- --> $DIR/uninhabited-irrefutable.rs:27:9
+ --> $DIR/uninhabited-irrefutable.rs:26:9
|
LL | / enum Foo {
LL | | A(foo::SecretlyEmpty),
diff --git a/src/test/ui/uninhabited/uninhabited-patterns.rs b/src/test/ui/uninhabited/uninhabited-patterns.rs
index 1bf01184a08e7..66a1a7f7735eb 100644
--- a/src/test/ui/uninhabited/uninhabited-patterns.rs
+++ b/src/test/ui/uninhabited/uninhabited-patterns.rs
@@ -1,6 +1,5 @@
#![feature(box_patterns)]
#![feature(box_syntax)]
-#![feature(never_type)]
#![feature(exhaustive_patterns)]
#![feature(slice_patterns)]
#![deny(unreachable_patterns)]
diff --git a/src/test/ui/uninhabited/uninhabited-patterns.stderr b/src/test/ui/uninhabited/uninhabited-patterns.stderr
index 3e5329cfb3011..4a793c4510ec1 100644
--- a/src/test/ui/uninhabited/uninhabited-patterns.stderr
+++ b/src/test/ui/uninhabited/uninhabited-patterns.stderr
@@ -1,35 +1,35 @@
error: unreachable pattern
- --> $DIR/uninhabited-patterns.rs:27:9
+ --> $DIR/uninhabited-patterns.rs:26:9
|
LL | &[..] => (),
| ^^^^^
|
note: lint level defined here
- --> $DIR/uninhabited-patterns.rs:6:9
+ --> $DIR/uninhabited-patterns.rs:5:9
|
LL | #![deny(unreachable_patterns)]
| ^^^^^^^^^^^^^^^^^^^^
error: unreachable pattern
- --> $DIR/uninhabited-patterns.rs:32:9
+ --> $DIR/uninhabited-patterns.rs:31:9
|
LL | Ok(box _) => (),
| ^^^^^^^^^
error: unreachable pattern
- --> $DIR/uninhabited-patterns.rs:34:9
+ --> $DIR/uninhabited-patterns.rs:33:9
|
LL | Err(&[..]) => (),
| ^^^^^^^^^^
error: unreachable pattern
- --> $DIR/uninhabited-patterns.rs:41:9
+ --> $DIR/uninhabited-patterns.rs:40:9
|
LL | Err(Ok(_y)) => (),
| ^^^^^^^^^^^
error: unreachable pattern
- --> $DIR/uninhabited-patterns.rs:44:15
+ --> $DIR/uninhabited-patterns.rs:43:15
|
LL | while let Some(_y) = foo() {
| ^^^^^^^^