Skip to content

Commit 4c2819d

Browse files
committed
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 #43089.
2 parents 3ece2d9 + b9df045 commit 4c2819d

File tree

4 files changed

+8
-8
lines changed

4 files changed

+8
-8
lines changed

src/libcore/cmp.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -880,24 +880,24 @@ mod impls {
880880

881881
ord_impl! { char usize u8 u16 u32 u64 u128 isize i8 i16 i32 i64 i128 }
882882

883-
#[unstable(feature = "never_type_impls", issue = "35121")]
883+
#[unstable(feature = "never_type", issue = "35121")]
884884
impl PartialEq for ! {
885885
fn eq(&self, _: &!) -> bool {
886886
*self
887887
}
888888
}
889889

890-
#[unstable(feature = "never_type_impls", issue = "35121")]
890+
#[unstable(feature = "never_type", issue = "35121")]
891891
impl Eq for ! {}
892892

893-
#[unstable(feature = "never_type_impls", issue = "35121")]
893+
#[unstable(feature = "never_type", issue = "35121")]
894894
impl PartialOrd for ! {
895895
fn partial_cmp(&self, _: &!) -> Option<Ordering> {
896896
*self
897897
}
898898
}
899899

900-
#[unstable(feature = "never_type_impls", issue = "35121")]
900+
#[unstable(feature = "never_type", issue = "35121")]
901901
impl Ord for ! {
902902
fn cmp(&self, _: &!) -> Ordering {
903903
*self

src/libcore/fmt/mod.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1546,14 +1546,14 @@ macro_rules! fmt_refs {
15461546

15471547
fmt_refs! { Debug, Display, Octal, Binary, LowerHex, UpperHex, LowerExp, UpperExp }
15481548

1549-
#[unstable(feature = "never_type_impls", issue = "35121")]
1549+
#[unstable(feature = "never_type", issue = "35121")]
15501550
impl Debug for ! {
15511551
fn fmt(&self, _: &mut Formatter) -> Result {
15521552
*self
15531553
}
15541554
}
15551555

1556-
#[unstable(feature = "never_type_impls", issue = "35121")]
1556+
#[unstable(feature = "never_type", issue = "35121")]
15571557
impl Display for ! {
15581558
fn fmt(&self, _: &mut Formatter) -> Result {
15591559
*self

src/libstd/error.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,7 @@ impl<'a> From<Cow<'a, str>> for Box<Error> {
234234
}
235235
}
236236

237-
#[unstable(feature = "never_type_impls", issue = "35121")]
237+
#[unstable(feature = "never_type", issue = "35121")]
238238
impl Error for ! {
239239
fn description(&self) -> &str { *self }
240240
}

src/libstd/primitive_docs.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ mod prim_bool { }
192192
/// [`Default`]: default/trait.Default.html
193193
/// [`default()`]: default/trait.Default.html#tymethod.default
194194
///
195-
#[unstable(feature = "never_type_impls", issue = "35121")]
195+
#[unstable(feature = "never_type", issue = "35121")]
196196
mod prim_never { }
197197

198198
#[doc(primitive = "char")]

0 commit comments

Comments
 (0)