diff options
| author | Felix S. Klock II <pnkfelix@pnkfx.org> | 2018-04-20 17:41:31 +0200 |
|---|---|---|
| committer | Felix S. Klock II <pnkfelix@pnkfx.org> | 2018-04-20 18:10:00 +0200 |
| commit | d141fdc3bfce5ab675a0c74b2fd6cf89ac4ef3f8 (patch) | |
| tree | 125d6981205fb48744f95640e23a1d8dd14748b3 /src/libcore/char | |
| parent | aaefa947ac507ff77049d27f927ddffe1b73cb18 (diff) | |
| download | rust-d141fdc3bfce5ab675a0c74b2fd6cf89ac4ef3f8.tar.gz rust-d141fdc3bfce5ab675a0c74b2fd6cf89ac4ef3f8.zip | |
Revert "Stabilize the TryFrom and TryInto traits"
This reverts commit e53a2a72743810e05f58c61c9d8a4c89b712ad2e.
Diffstat (limited to 'src/libcore/char')
| -rw-r--r-- | src/libcore/char/convert.rs | 6 | ||||
| -rw-r--r-- | src/libcore/char/mod.rs | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/libcore/char/convert.rs b/src/libcore/char/convert.rs index 150562a4a9b..803a924eb3a 100644 --- a/src/libcore/char/convert.rs +++ b/src/libcore/char/convert.rs @@ -204,7 +204,7 @@ impl FromStr for char { } -#[stable(feature = "try_from", since = "1.26.0")] +#[unstable(feature = "try_from", issue = "33417")] impl TryFrom<u32> for char { type Error = CharTryFromError; @@ -219,11 +219,11 @@ impl TryFrom<u32> for char { } /// The error type returned when a conversion from u32 to char fails. -#[stable(feature = "try_from", since = "1.26.0")] +#[unstable(feature = "try_from", issue = "33417")] #[derive(Copy, Clone, Debug, PartialEq, Eq)] pub struct CharTryFromError(()); -#[stable(feature = "try_from", since = "1.26.0")] +#[unstable(feature = "try_from", issue = "33417")] impl fmt::Display for CharTryFromError { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { "converted integer out of range for `char`".fmt(f) diff --git a/src/libcore/char/mod.rs b/src/libcore/char/mod.rs index 9edc0c88756..210eceebc51 100644 --- a/src/libcore/char/mod.rs +++ b/src/libcore/char/mod.rs @@ -40,7 +40,7 @@ pub use self::convert::{from_u32, from_digit}; pub use self::convert::from_u32_unchecked; #[stable(feature = "char_from_str", since = "1.20.0")] pub use self::convert::ParseCharError; -#[stable(feature = "try_from", since = "1.26.0")] +#[unstable(feature = "try_from", issue = "33417")] pub use self::convert::CharTryFromError; #[stable(feature = "decode_utf16", since = "1.9.0")] pub use self::decode::{decode_utf16, DecodeUtf16, DecodeUtf16Error}; |
