diff options
| author | bors <bors@rust-lang.org> | 2019-02-25 20:24:10 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-02-25 20:24:10 +0000 |
| commit | 00aae71f503b1ab592f48de47dd30912f3858748 (patch) | |
| tree | 6a467dcb6c86ff08496ce29b1da9eaabc92538ac /src/libcore/array.rs | |
| parent | b57fe74a27590289fd657614b8ad1f3eac8a7ad2 (diff) | |
| parent | cf267540ebabdeac1f2045819cd6bac561017e29 (diff) | |
| download | rust-00aae71f503b1ab592f48de47dd30912f3858748.tar.gz rust-00aae71f503b1ab592f48de47dd30912f3858748.zip | |
Auto merge of #58302 - SimonSapin:tryfrom, r=alexcrichton
Stabilize TryFrom and TryInto with a convert::Infallible empty enum This is the plan proposed in https://github.com/rust-lang/rust/issues/33417#issuecomment-423073898
Diffstat (limited to 'src/libcore/array.rs')
| -rw-r--r-- | src/libcore/array.rs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/libcore/array.rs b/src/libcore/array.rs index 3a27a39af4a..9c6ecc43502 100644 --- a/src/libcore/array.rs +++ b/src/libcore/array.rs @@ -49,7 +49,7 @@ unsafe impl<T, A: Unsize<[T]>> FixedSizeArray<T> for A { } /// The error type returned when a conversion from a slice to an array fails. -#[unstable(feature = "try_from", issue = "33417")] +#[stable(feature = "try_from", since = "1.34.0")] #[derive(Debug, Copy, Clone)] pub struct TryFromSliceError(()); @@ -138,7 +138,7 @@ macro_rules! array_impls { } } - #[unstable(feature = "try_from", issue = "33417")] + #[stable(feature = "try_from", since = "1.34.0")] impl<'a, T> TryFrom<&'a [T]> for [T; $N] where T: Copy { type Error = TryFromSliceError; @@ -147,7 +147,7 @@ macro_rules! array_impls { } } - #[unstable(feature = "try_from", issue = "33417")] + #[stable(feature = "try_from", since = "1.34.0")] impl<'a, T> TryFrom<&'a [T]> for &'a [T; $N] { type Error = TryFromSliceError; @@ -161,7 +161,7 @@ macro_rules! array_impls { } } - #[unstable(feature = "try_from", issue = "33417")] + #[stable(feature = "try_from", since = "1.34.0")] impl<'a, T> TryFrom<&'a mut [T]> for &'a mut [T; $N] { type Error = TryFromSliceError; |
