diff options
| author | kennytm <kennytm@gmail.com> | 2018-03-28 03:03:39 +0800 |
|---|---|---|
| committer | kennytm <kennytm@gmail.com> | 2018-03-28 03:03:39 +0800 |
| commit | 605ea7c31f7341995c2d1ae12b4b33fe6bd908b5 (patch) | |
| tree | 19b13ac2494f1e1b347ee8aae9c48150677434f3 /src/libstd_unicode | |
| parent | 19fe9d1181bb15f76cdf2b5335edff5a82c5152b (diff) | |
| parent | f513fbdf36ad0708fb222b8d55bc086dd4be18cf (diff) | |
| download | rust-605ea7c31f7341995c2d1ae12b4b33fe6bd908b5.tar.gz rust-605ea7c31f7341995c2d1ae12b4b33fe6bd908b5.zip | |
Rollup merge of #49426 - lukaslueg:patch-1, r=kennytm
Update CONTRIBUTING.md The current link is a 404, just link to the main repo page
Diffstat (limited to 'src/libstd_unicode')
| -rw-r--r-- | src/libstd_unicode/char.rs | 2 | ||||
| -rw-r--r-- | src/libstd_unicode/lib.rs | 1 |
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; |