Remove the CharExt trait, now that libcore has inherent methods for char

3 files changed, 3 insertions, 6 deletions

diff --git a/src/libcore/unicode/str.rs b/src/libcore/unicode/str.rs
index 18581bf4d58..0882984e077 100644
--- a/src/libcore/unicode/str.rs
+++ b/src/libcore/unicode/str.rs
@@ -9,9 +9,6 @@
 // except according to those terms.
 
 //! Unicode-intensive string manipulations.
-//!
-//! This module provides functionality to `str` that requires the Unicode
-//! methods provided by the unicode parts of the CharExt trait.
 
 use char;
 use iter::{Filter, FusedIterator};
@@ -109,7 +106,7 @@ impl<I> Iterator for Utf16Encoder<I>
 
         let mut buf = [0; 2];
         self.chars.next().map(|ch| {
-            let n = CharExt::encode_utf16(ch, &mut buf).len();
+            let n = ch.encode_utf16(&mut buf).len();
             if n == 2 {
                 self.extra = buf[1];
             }
diff --git a/src/libcore/unicode/tables.rs b/src/libcore/unicode/tables.rs
index 7e8e925bda3..1f7b1bde914 100644
--- a/src/libcore/unicode/tables.rs
+++ b/src/libcore/unicode/tables.rs
@@ -16,7 +16,7 @@ use unicode::version::UnicodeVersion;
 use unicode::bool_trie::{BoolTrie, SmallBoolTrie};
 
 /// The version of [Unicode](http://www.unicode.org/) that the Unicode parts of
-/// `CharExt` and `UnicodeStrPrelude` traits are based on.
+/// `char` and `str` methods are based on.
 pub const UNICODE_VERSION: UnicodeVersion = UnicodeVersion {
     major: 10,
     minor: 0,
diff --git a/src/libcore/unicode/unicode.py b/src/libcore/unicode/unicode.py
index 39b68dc7d9b..82262cc7662 100755
--- a/src/libcore/unicode/unicode.py
+++ b/src/libcore/unicode/unicode.py
@@ -470,7 +470,7 @@ if __name__ == "__main__":
             unicode_version = re.search(pattern, readme.read()).groups()
         rf.write("""
 /// The version of [Unicode](http://www.unicode.org/) that the Unicode parts of
-/// `CharExt` and `UnicodeStrPrelude` traits are based on.
+/// `char` and `str` methods are based on.
 pub const UNICODE_VERSION: UnicodeVersion = UnicodeVersion {
     major: %s,
     minor: %s,