diff options
| author | bors <bors@rust-lang.org> | 2015-01-05 06:45:39 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2015-01-05 06:45:39 +0000 |
| commit | 1f732ef53d54ccfc3e7728390ffbcea8a696ecee (patch) | |
| tree | 29ced952bc9e6f49640ccc33974209afc805ff91 /src/libcollections | |
| parent | ed22606c8382822efc555f72f895c560289a5c70 (diff) | |
| parent | 990a79f097e8e74308bfec6d72dcdbb769a7973b (diff) | |
| download | rust-1f732ef53d54ccfc3e7728390ffbcea8a696ecee.tar.gz rust-1f732ef53d54ccfc3e7728390ffbcea8a696ecee.zip | |
auto merge of #20395 : huonw/rust/char-stab-2, r=aturon
cc #19260 The casing transformations are left unstable (it is highly likely to be better to adopt the proper non-1-to-1 case mappings, per #20333) as are `is_xid_*`. I've got a little todo list in the last commit of things I thought about/was told about that I haven't yet handled (I'd also like some feedback).
Diffstat (limited to 'src/libcollections')
| -rw-r--r-- | src/libcollections/lib.rs | 3 | ||||
| -rw-r--r-- | src/libcollections/str.rs | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/libcollections/lib.rs b/src/libcollections/lib.rs index 944b224fed8..db236795038 100644 --- a/src/libcollections/lib.rs +++ b/src/libcollections/lib.rs @@ -103,7 +103,6 @@ mod std { mod prelude { // from core. pub use core::borrow::IntoCow; - pub use core::char::Char; pub use core::clone::Clone; pub use core::cmp::{PartialEq, Eq, PartialOrd, Ord}; pub use core::cmp::Ordering::{Less, Equal, Greater}; @@ -127,7 +126,7 @@ mod prelude { // from other crates. pub use alloc::boxed::Box; - pub use unicode::char::UnicodeChar; + pub use unicode::char::CharExt; // from collections. pub use slice::SliceConcatExt; diff --git a/src/libcollections/str.rs b/src/libcollections/str.rs index ed6a957d2ac..ecf17820d2d 100644 --- a/src/libcollections/str.rs +++ b/src/libcollections/str.rs @@ -55,7 +55,7 @@ use self::RecompositionState::*; use self::DecompositionType::*; use core::borrow::{BorrowFrom, ToOwned}; -use core::char::Char; +use core::char::CharExt; use core::clone::Clone; use core::iter::AdditiveIterator; use core::iter::{range, Iterator, IteratorExt}; |