diff options
| author | bors <bors@rust-lang.org> | 2018-01-17 18:38:34 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2018-01-17 18:38:34 +0000 |
| commit | 0f9c784751434c70ddd6719ccda6817c819126f9 (patch) | |
| tree | 7c0645a6d63a20eeb7c2c3f2a0f81405f30b7b92 /src/libstd_unicode | |
| parent | 3e49ada7528bf664b2ccc8516a9ef7d21849a70b (diff) | |
| parent | 5fade39c8811c04efd4e4b3783f8587a1cca9700 (diff) | |
| download | rust-0f9c784751434c70ddd6719ccda6817c819126f9.tar.gz rust-0f9c784751434c70ddd6719ccda6817c819126f9.zip | |
Auto merge of #47522 - kennytm:rollup, r=kennytm
Rollup of 21 pull requests - Successful merges: #47302, #47333, #47387, #47404, #47407, #47426, #47427, #47436, #47444, #47456, #47458, #47467, #47479, #47481, #47483, #47487, #47497, #47498, #47505, #47509, #47514 - Failed merges:
Diffstat (limited to 'src/libstd_unicode')
| -rw-r--r-- | src/libstd_unicode/char.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libstd_unicode/char.rs b/src/libstd_unicode/char.rs index c1daf643986..b4be4a96911 100644 --- a/src/libstd_unicode/char.rs +++ b/src/libstd_unicode/char.rs @@ -33,7 +33,7 @@ use core::iter::FusedIterator; use core::fmt::{self, Write}; use tables::{conversions, derived_property, general_category, property}; -// stable reexports +// stable re-exports #[stable(feature = "rust1", since = "1.0.0")] pub use core::char::{MAX, from_digit, from_u32, from_u32_unchecked}; #[stable(feature = "rust1", since = "1.0.0")] @@ -41,7 +41,7 @@ pub use core::char::{EscapeDebug, EscapeDefault, EscapeUnicode}; #[stable(feature = "char_from_str", since = "1.20.0")] pub use core::char::ParseCharError; -// unstable reexports +// unstable re-exports #[unstable(feature = "try_from", issue = "33417")] pub use core::char::CharTryFromError; #[unstable(feature = "decode_utf8", issue = "33906")] |