Skip to content

Commit aa7ce89

Browse files
committedApr 21, 2018
Auto merge of #50121 - pnkfelix:revert-stabilization-of-never-type-et-al, r=alexcrichton
Revert stabilization of never_type (!) et al Fix #49691 I *think* this correctly adopts @nikomatsakis 's desired fix of: * reverting stabilization of `!` and `TryFrom`, and * returning to the previous fallback semantics (i.e. it is once again dependent on whether the crate has opted into `#[feature(never_type)]`, * **without** attempting to put back in the previous future-proofing warnings regarding the change in fallback semantics. (I'll be away from computers for a week starting now, so any updates to this PR should be either pushed into it, or someone else should adopt the task of polishing this fix and put up their own PR.)
2 parents 699eb95 + 42b6d46 commit aa7ce89

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+188
-49
lines changed
 

‎src/libcore/array.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ unsafe impl<T, A: Unsize<[T]>> FixedSizeArray<T> for A {
5959
}
6060

6161
/// The error type returned when a conversion from a slice to an array fails.
62-
#[stable(feature = "try_from", since = "1.26.0")]
62+
#[unstable(feature = "try_from", issue = "33417")]
6363
#[derive(Debug, Copy, Clone)]
6464
pub struct TryFromSliceError(());
6565

@@ -148,7 +148,7 @@ macro_rules! array_impls {
148148
}
149149
}
150150

151-
#[stable(feature = "try_from", since = "1.26.0")]
151+
#[unstable(feature = "try_from", issue = "33417")]
152152
impl<'a, T> TryFrom<&'a [T]> for &'a [T; $N] {
153153
type Error = TryFromSliceError;
154154

@@ -162,7 +162,7 @@ macro_rules! array_impls {
162162
}
163163
}
164164

165-
#[stable(feature = "try_from", since = "1.26.0")]
165+
#[unstable(feature = "try_from", issue = "33417")]
166166
impl<'a, T> TryFrom<&'a mut [T]> for &'a mut [T; $N] {
167167
type Error = TryFromSliceError;
168168

‎src/libcore/char/convert.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ impl FromStr for char {
204204
}
205205

206206

207-
#[stable(feature = "try_from", since = "1.26.0")]
207+
#[unstable(feature = "try_from", issue = "33417")]
208208
impl TryFrom<u32> for char {
209209
type Error = CharTryFromError;
210210

@@ -219,11 +219,11 @@ impl TryFrom<u32> for char {
219219
}
220220

221221
/// The error type returned when a conversion from u32 to char fails.
222-
#[stable(feature = "try_from", since = "1.26.0")]
222+
#[unstable(feature = "try_from", issue = "33417")]
223223
#[derive(Copy, Clone, Debug, PartialEq, Eq)]
224224
pub struct CharTryFromError(());
225225

226-
#[stable(feature = "try_from", since = "1.26.0")]
226+
#[unstable(feature = "try_from", issue = "33417")]
227227
impl fmt::Display for CharTryFromError {
228228
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
229229
"converted integer out of range for `char`".fmt(f)

0 commit comments

Comments
 (0)