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/libstd | |
| 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/libstd')
| -rw-r--r-- | src/libstd/error.rs | 6 | ||||
| -rw-r--r-- | src/libstd/lib.rs | 1 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/libstd/error.rs b/src/libstd/error.rs index 6c149b2e0f1..749b8ccc13d 100644 --- a/src/libstd/error.rs +++ b/src/libstd/error.rs @@ -284,14 +284,14 @@ impl Error for num::ParseIntError { } } -#[stable(feature = "try_from", since = "1.26.0")] +#[unstable(feature = "try_from", issue = "33417")] impl Error for num::TryFromIntError { fn description(&self) -> &str { self.__description() } } -#[stable(feature = "try_from", since = "1.26.0")] +#[unstable(feature = "try_from", issue = "33417")] impl Error for array::TryFromSliceError { fn description(&self) -> &str { self.__description() @@ -365,7 +365,7 @@ impl Error for cell::BorrowMutError { } } -#[stable(feature = "try_from", since = "1.26.0")] +#[unstable(feature = "try_from", issue = "33417")] impl Error for char::CharTryFromError { fn description(&self) -> &str { "converted integer out of range for `char`" diff --git a/src/libstd/lib.rs b/src/libstd/lib.rs index 8980cd8c6a4..e53e009678c 100644 --- a/src/libstd/lib.rs +++ b/src/libstd/lib.rs @@ -307,6 +307,7 @@ #![feature(test, rustc_private)] #![feature(thread_local)] #![feature(toowned_clone_into)] +#![feature(try_from)] #![feature(try_reserve)] #![feature(unboxed_closures)] #![feature(untagged_unions)] |