diff options
| author | bors <bors@rust-lang.org> | 2017-12-12 13:16:30 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2017-12-12 13:16:30 +0000 |
| commit | 4c2819d32604c2c5817d0d2639363aa47e80fd7a (patch) | |
| tree | bafe1b525d71164afee03e35ad6afe393534c913 /src/libstd | |
| parent | 3ece2d94d3144cd41c8a3fe5ce4cfdb06967ab0a (diff) | |
| parent | b9df045b7955eef6dd28290497df941036cfbeab (diff) | |
| download | rust-4c2819d32604c2c5817d0d2639363aa47e80fd7a.tar.gz rust-4c2819d32604c2c5817d0d2639363aa47e80fd7a.zip | |
Auto merge of #46250 - canndrew:rename-never-type-impl-gate, r=petrochenkov
Rename never_type_impls gate We no longer need a separately-named `never_type_impls` gate thanks to https://github.com/rust-lang/rust/issues/43089.
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/error.rs | 2 | ||||
| -rw-r--r-- | src/libstd/primitive_docs.rs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/libstd/error.rs b/src/libstd/error.rs index 231b0be9276..eb5022ad577 100644 --- a/src/libstd/error.rs +++ b/src/libstd/error.rs @@ -234,7 +234,7 @@ impl<'a> From<Cow<'a, str>> for Box<Error> { } } -#[unstable(feature = "never_type_impls", issue = "35121")] +#[unstable(feature = "never_type", issue = "35121")] impl Error for ! { fn description(&self) -> &str { *self } } diff --git a/src/libstd/primitive_docs.rs b/src/libstd/primitive_docs.rs index a456e466341..a2caf47e8cc 100644 --- a/src/libstd/primitive_docs.rs +++ b/src/libstd/primitive_docs.rs @@ -192,7 +192,7 @@ mod prim_bool { } /// [`Default`]: default/trait.Default.html /// [`default()`]: default/trait.Default.html#tymethod.default /// -#[unstable(feature = "never_type_impls", issue = "35121")] +#[unstable(feature = "never_type", issue = "35121")] mod prim_never { } #[doc(primitive = "char")] |