about summary refs log tree commit diff
path: root/src/libcore
diff options
context:
space:
mode:
authorHuon Wilson <dbau.pp+github@gmail.com>2014-12-30 13:53:20 +1100
committerHuon Wilson <dbau.pp+github@gmail.com>2015-01-05 12:30:30 +1100
commit19120209d8e532514203d16a2cff0ad3b44de3bb (patch)
treedbfa9a8814fa0c10078ed4fa1b8668343d468ea8 /src/libcore
parent01417f245cad2dc7dcafcf285ed6c1be163ac3a5 (diff)
Rename `core::char::Char` to `CharExt` to match prelude guidelines.
Imports may need to be updated so this is a

[breaking-change]
Diffstat (limited to 'src/libcore')
-rw-r--r--src/libcore/char.rs2
-rw-r--r--src/libcore/fmt/float.rs2
-rw-r--r--src/libcore/fmt/mod.rs6
-rw-r--r--src/libcore/num/mod.rs2
-rw-r--r--src/libcore/prelude.rs2
5 files changed, 7 insertions, 7 deletions
diff --git a/src/libcore/char.rs b/src/libcore/char.rs
index 708b0bf8637..ce530ae1d32 100644
--- a/src/libcore/char.rs
+++ b/src/libcore/char.rs
@@ -112,7 +112,7 @@ pub fn from_digit(num: uint, radix: uint) -> Option<char> {
 
 /// Basic `char` manipulations.
 #[stable]
-pub trait Char {
+pub trait CharExt {
     /// Checks if a `char` parses as a numeric digit in the given radix.
     ///
     /// Compared to `is_numeric()`, this function only recognizes the characters
diff --git a/src/libcore/fmt/float.rs b/src/libcore/fmt/float.rs
index 9e62226220c..f63242b4f85 100644
--- a/src/libcore/fmt/float.rs
+++ b/src/libcore/fmt/float.rs
@@ -15,7 +15,7 @@ pub use self::SignificantDigits::*;
 pub use self::SignFormat::*;
 
 use char;
-use char::Char;
+use char::CharExt;
 use fmt;
 use iter::{IteratorExt, range};
 use num::{cast, Float, ToPrimitive};
diff --git a/src/libcore/fmt/mod.rs b/src/libcore/fmt/mod.rs
index f49f87ff329..102836f8d30 100644
--- a/src/libcore/fmt/mod.rs
+++ b/src/libcore/fmt/mod.rs
@@ -388,7 +388,7 @@ impl<'a> Formatter<'a> {
                         prefix: &str,
                         buf: &str)
                         -> Result {
-        use char::Char;
+        use char::CharExt;
         use fmt::rt::{FlagAlternate, FlagSignPlus, FlagSignAwareZeroPad};
 
         let mut width = buf.len();
@@ -504,7 +504,7 @@ impl<'a> Formatter<'a> {
     fn with_padding<F>(&mut self, padding: uint, default: rt::Alignment, f: F) -> Result where
         F: FnOnce(&mut Formatter) -> Result,
     {
-        use char::Char;
+        use char::CharExt;
         let align = match self.align {
             rt::AlignUnknown => default,
             _ => self.align
@@ -613,7 +613,7 @@ impl Show for str {
 
 impl Show for char {
     fn fmt(&self, f: &mut Formatter) -> Result {
-        use char::Char;
+        use char::CharExt;
 
         let mut utf8 = [0u8; 4];
         let amt = self.encode_utf8(&mut utf8).unwrap_or(0);
diff --git a/src/libcore/num/mod.rs b/src/libcore/num/mod.rs
index 6c3b153c000..426c858d408 100644
--- a/src/libcore/num/mod.rs
+++ b/src/libcore/num/mod.rs
@@ -15,7 +15,7 @@
 #![stable]
 #![allow(missing_docs)]
 
-use char::Char;
+use char::CharExt;
 use clone::Clone;
 use cmp::{PartialEq, Eq};
 use cmp::{PartialOrd, Ord};
diff --git a/src/libcore/prelude.rs b/src/libcore/prelude.rs
index 64f13a8f123..d4aca1bb73c 100644
--- a/src/libcore/prelude.rs
+++ b/src/libcore/prelude.rs
@@ -38,7 +38,7 @@ pub use mem::drop;
 
 // Reexported types and traits
 
-pub use char::Char;
+pub use char::CharExt;
 pub use clone::Clone;
 pub use cmp::{PartialEq, PartialOrd, Eq, Ord};
 pub use iter::{Extend, IteratorExt};