Permalink
Browse files

Auto merge of #46250 - canndrew:rename-never-type-impl-gate, r=petroc…

…henkov

Rename never_type_impls gate

We no longer need a separately-named `never_type_impls` gate thanks to #43089.
  • Loading branch information...
2 parents 3ece2d9 + b9df045 commit 4c2819d32604c2c5817d0d2639363aa47e80fd7a @bors bors committed Dec 12, 2017
Showing with 8 additions and 8 deletions.
  1. +4 −4 src/libcore/cmp.rs
  2. +2 −2 src/libcore/fmt/mod.rs
  3. +1 −1 src/libstd/error.rs
  4. +1 −1 src/libstd/primitive_docs.rs
View
@@ -880,24 +880,24 @@ mod impls {
ord_impl! { char usize u8 u16 u32 u64 u128 isize i8 i16 i32 i64 i128 }
- #[unstable(feature = "never_type_impls", issue = "35121")]
+ #[unstable(feature = "never_type", issue = "35121")]
impl PartialEq for ! {
fn eq(&self, _: &!) -> bool {
*self
}
}
- #[unstable(feature = "never_type_impls", issue = "35121")]
+ #[unstable(feature = "never_type", issue = "35121")]
impl Eq for ! {}
- #[unstable(feature = "never_type_impls", issue = "35121")]
+ #[unstable(feature = "never_type", issue = "35121")]
impl PartialOrd for ! {
fn partial_cmp(&self, _: &!) -> Option<Ordering> {
*self
}
}
- #[unstable(feature = "never_type_impls", issue = "35121")]
+ #[unstable(feature = "never_type", issue = "35121")]
impl Ord for ! {
fn cmp(&self, _: &!) -> Ordering {
*self
View
@@ -1546,14 +1546,14 @@ macro_rules! fmt_refs {
fmt_refs! { Debug, Display, Octal, Binary, LowerHex, UpperHex, LowerExp, UpperExp }
-#[unstable(feature = "never_type_impls", issue = "35121")]
+#[unstable(feature = "never_type", issue = "35121")]
impl Debug for ! {
fn fmt(&self, _: &mut Formatter) -> Result {
*self
}
}
-#[unstable(feature = "never_type_impls", issue = "35121")]
+#[unstable(feature = "never_type", issue = "35121")]
impl Display for ! {
fn fmt(&self, _: &mut Formatter) -> Result {
*self
View
@@ -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 }
}
@@ -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")]

0 comments on commit 4c2819d

Please sign in to comment.