about summary refs log tree commit diff
path: root/src/libcollections
diff options
context:
space:
mode:
authorHuon Wilson <dbau.pp+github@gmail.com>2014-12-30 13:58:31 +1100
committerHuon Wilson <dbau.pp+github@gmail.com>2015-01-05 12:30:51 +1100
commit0302d379776fca82d3eb693046239dc66998f691 (patch)
treeee410f469e5a025f09d1eca774ca3aa71f9d519e /src/libcollections
parent19120209d8e532514203d16a2cff0ad3b44de3bb (diff)
downloadrust-0302d379776fca82d3eb693046239dc66998f691.tar.gz
rust-0302d379776fca82d3eb693046239dc66998f691.zip
Merge `UnicodeChar` and `CharExt`.
This "reexports" all the functionality of `core::char::CharExt` as
methods on `unicode::u_char::UnicodeChar` (renamed to `CharExt`).

Imports may need to be updated (one now just imports
`unicode::CharExt`, or `std::char::CharExt` rather than two traits from
either), so this is a

[breaking-change]
Diffstat (limited to 'src/libcollections')
-rw-r--r--src/libcollections/lib.rs3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/libcollections/lib.rs b/src/libcollections/lib.rs
index bf3b35b4f68..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::CharExt;
     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;