summary refs log tree commit diff
path: root/src/libstd_unicode
diff options
context:
space:
mode:
authorSimon Sapin <simon.sapin@exyr.org>2018-03-23 13:52:54 +0100
committerSimon Sapin <simon.sapin@exyr.org>2018-03-26 23:36:02 +0200
commite53a2a72743810e05f58c61c9d8a4c89b712ad2e (patch)
tree035dc95928e7d3d92478f463f2353763c0b15fc5 /src/libstd_unicode
parent9fd399feb149bb7b58f21c54fc8c9358fea487a2 (diff)
downloadrust-e53a2a72743810e05f58c61c9d8a4c89b712ad2e.tar.gz
rust-e53a2a72743810e05f58c61c9d8a4c89b712ad2e.zip
Stabilize the TryFrom and TryInto traits
Tracking issue: https://github.com/rust-lang/rust/issues/33417
Diffstat (limited to 'src/libstd_unicode')
-rw-r--r--src/libstd_unicode/char.rs2
-rw-r--r--src/libstd_unicode/lib.rs1
2 files changed, 1 insertions, 2 deletions
diff --git a/src/libstd_unicode/char.rs b/src/libstd_unicode/char.rs
index de8b46d5f1b..33e47ade8cb 100644
--- a/src/libstd_unicode/char.rs
+++ b/src/libstd_unicode/char.rs
@@ -42,7 +42,7 @@ pub use core::char::{EscapeDebug, EscapeDefault, EscapeUnicode};
 pub use core::char::ParseCharError;
 
 // unstable re-exports
-#[unstable(feature = "try_from", issue = "33417")]
+#[stable(feature = "try_from", since = "1.26.0")]
 pub use core::char::CharTryFromError;
 #[unstable(feature = "decode_utf8", issue = "33906")]
 pub use core::char::{DecodeUtf8, decode_utf8};
diff --git a/src/libstd_unicode/lib.rs b/src/libstd_unicode/lib.rs
index f155b62e3cc..c22ea1671fa 100644
--- a/src/libstd_unicode/lib.rs
+++ b/src/libstd_unicode/lib.rs
@@ -39,7 +39,6 @@
 #![feature(lang_items)]
 #![feature(non_exhaustive)]
 #![feature(staged_api)]
-#![feature(try_from)]
 #![feature(unboxed_closures)]
 
 mod bool_trie;