diff options
| author | bors <bors@rust-lang.org> | 2017-07-12 17:04:14 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2017-07-12 17:04:14 +0000 |
| commit | f85579d4a2c342654f9b158fafd565eb159fdb59 (patch) | |
| tree | e0ab8d41914e967769ee6422ad434d85c9fbcc31 /src/libstd_unicode | |
| parent | b2b19ec92e233b7f91617e4cc2130e70d6e7a5fd (diff) | |
| parent | 388fce9dab429e2cc90588727ae07a4c878bd7b3 (diff) | |
| download | rust-f85579d4a2c342654f9b158fafd565eb159fdb59.tar.gz rust-f85579d4a2c342654f9b158fafd565eb159fdb59.zip | |
Auto merge of #43181 - Mark-Simulacrum:rollup, r=Mark-Simulacrum
Rollup of 8 pull requests - Successful merges: #42670, #42826, #43000, #43011, #43098, #43100, #43136, #43137 - Failed merges:
Diffstat (limited to 'src/libstd_unicode')
| -rw-r--r-- | src/libstd_unicode/char.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libstd_unicode/char.rs b/src/libstd_unicode/char.rs index d4d8993efb3..d6836418b4b 100644 --- a/src/libstd_unicode/char.rs +++ b/src/libstd_unicode/char.rs @@ -38,7 +38,7 @@ use tables::{conversions, derived_property, general_category, property}; pub use core::char::{MAX, from_digit, from_u32, from_u32_unchecked}; #[stable(feature = "rust1", since = "1.0.0")] pub use core::char::{EscapeDebug, EscapeDefault, EscapeUnicode}; -#[stable(feature = "char_from_str", since = "1.19.0")] +#[stable(feature = "char_from_str", since = "1.20.0")] pub use core::char::ParseCharError; // unstable reexports |