about summary refs log tree commit diff
path: root/src/libstd_unicode
diff options
context:
space:
mode:
authorCorey Farwell <coreyf@rwell.org>2017-06-20 16:28:25 -0400
committerGitHub <noreply@github.com>2017-06-20 16:28:25 -0400
commit4c43bc32b723f0727456e7d40fb5feeeb1c4d448 (patch)
treea5718919322009fbdddaca0ff3d955c2292e3470 /src/libstd_unicode
parent29bce6e220f6fd2292d13d65fe503af7bf4852b7 (diff)
parentfd9d7aa2cf76c949633cb4156642654238c03921 (diff)
downloadrust-4c43bc32b723f0727456e7d40fb5feeeb1c4d448.tar.gz
rust-4c43bc32b723f0727456e7d40fb5feeeb1c4d448.zip
Rollup merge of #42271 - tinaun:charfromstr, r=alexcrichton
add `FromStr` Impl for `char`

fixes #24939.

is it possible to use pub(restricted) instead of using a stability attribute for the internal error representation? is it needed at all?
Diffstat (limited to 'src/libstd_unicode')
-rw-r--r--src/libstd_unicode/char.rs2
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")]