diff options
| author | bors <bors@rust-lang.org> | 2017-06-20 21:08:28 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2017-06-20 21:08:28 +0000 |
| commit | 445077963c55297ef1e196a3525723090fe80b22 (patch) | |
| tree | 19b62bba2839c59b1e36f3998dff94997a2df797 /src/libstd_unicode | |
| parent | 29bce6e220f6fd2292d13d65fe503af7bf4852b7 (diff) | |
| parent | 58425ef71dd80c9e91adb359085473d66cd7e155 (diff) | |
Auto merge of #42780 - frewsxcv:rollup, r=frewsxcv
Rollup of 6 pull requests - Successful merges: #42271, #42717, #42728, #42749, #42756, #42772 - Failed merges:
Diffstat (limited to 'src/libstd_unicode')
| -rw-r--r-- | src/libstd_unicode/char.rs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/libstd_unicode/char.rs b/src/libstd_unicode/char.rs index eb36cbe3b1f..d4d8993efb3 100644 --- a/src/libstd_unicode/char.rs +++ b/src/libstd_unicode/char.rs @@ -38,6 +38,8 @@ 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")] +pub use core::char::ParseCharError; // unstable reexports #[unstable(feature = "try_from", issue = "33417")] |