diff options
| author | Felix S. Klock II <pnkfelix@pnkfx.org> | 2018-04-20 17:07:58 +0200 |
|---|---|---|
| committer | Felix S. Klock II <pnkfelix@pnkfx.org> | 2018-04-20 18:09:28 +0200 |
| commit | fadabd6fbbfe1a401bbdd4ba0919b21ba4f7c5d2 (patch) | |
| tree | 271fba7df00efddcfaec54a88dabbcf038158046 /src/libstd | |
| parent | 1a4443995c91648460a5483ca8b7886cd04197e2 (diff) | |
| download | rust-fadabd6fbbfe1a401bbdd4ba0919b21ba4f7c5d2.tar.gz rust-fadabd6fbbfe1a401bbdd4ba0919b21ba4f7c5d2.zip | |
Revert stabilization of `feature(never_type)`.
This commit is just covering the feature gate itself and the tests that made direct use of `!` and thus need to opt back into the feature. A follow on commit brings back the other change that motivates the revert: Namely, going back to the old rules for falling back to `()`.
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/error.rs | 2 | ||||
| -rw-r--r-- | src/libstd/lib.rs | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/libstd/error.rs b/src/libstd/error.rs index 3c209928d43..6c149b2e0f1 100644 --- a/src/libstd/error.rs +++ b/src/libstd/error.rs @@ -233,7 +233,7 @@ impl<'a> From<Cow<'a, str>> for Box<Error> { } } -#[stable(feature = "never_type", since = "1.26.0")] +#[unstable(feature = "never_type", issue = "35121")] impl Error for ! { fn description(&self) -> &str { *self } } diff --git a/src/libstd/lib.rs b/src/libstd/lib.rs index 7d896695311..8980cd8c6a4 100644 --- a/src/libstd/lib.rs +++ b/src/libstd/lib.rs @@ -275,6 +275,7 @@ #![feature(macro_reexport)] #![feature(macro_vis_matcher)] #![feature(needs_panic_runtime)] +#![feature(never_type)] #![feature(exhaustive_patterns)] #![feature(nonzero)] #![feature(num_bits_bytes)] |