---

yaml
---
r: 169855
b: refs/heads/auto
c: 0cb7a40
h: refs/heads/master
i:
  169853: 4f5685f
  169851: 2b577c7
  169847: 9562b02
  169839: 60889f7
  169823: e9463a8
  169791: fa57186
  169727: 358fb26
v: v3

Author: alexcrichton

[refs]

@@ -10,7 +10,7 @@ refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
 refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
 refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
-refs/heads/auto: 8e83af6e879535c33fd83d247d16619e39e0b951
+refs/heads/auto: 0cb7a4062a3c69bb0c54f0c9136889a1006e4f62
 refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
 refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
 refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336

branches/auto/src/libcollections/lib.rs

@@ -103,6 +103,7 @@ 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};
@@ -126,7 +127,7 @@ mod prelude {
 
     // from other crates.
     pub use alloc::boxed::Box;
-    pub use unicode::char::CharExt;
+    pub use unicode::char::UnicodeChar;
 
     // from collections.
     pub use slice::SliceConcatExt;

branches/auto/src/libcollections/str.rs

@@ -55,7 +55,7 @@ use self::RecompositionState::*;
 use self::DecompositionType::*;
 
 use core::borrow::{BorrowFrom, ToOwned};
-use core::char::CharExt;
+use core::char::Char;
 use core::clone::Clone;
 use core::iter::AdditiveIterator;
 use core::iter::{range, Iterator, IteratorExt};

branches/auto/src/libcore/char.rs

@@ -69,7 +69,7 @@ pub const MAX: char = '\u{10ffff}';
 
 /// Converts from `u32` to a `char`
 #[inline]
-#[stable]
+#[unstable = "pending decisions about costructors for primitives"]
 pub fn from_u32(i: u32) -> Option<char> {
     // catch out-of-bounds and surrogates
     if (i > MAX as u32) || (i >= 0xD800 && i <= 0xDFFF) {
@@ -92,7 +92,7 @@ pub fn from_u32(i: u32) -> Option<char> {
 /// Panics if given an `radix` > 36.
 ///
 #[inline]
-#[unstable = "pending integer conventions"]
+#[unstable = "pending decisions about costructors for primitives"]
 pub fn from_digit(num: uint, radix: uint) -> Option<char> {
     if radix > 36 {
         panic!("from_digit: radix is too high (maximum 36)");
@@ -111,8 +111,8 @@ pub fn from_digit(num: uint, radix: uint) -> Option<char> {
 }
 
 /// Basic `char` manipulations.
-#[stable]
-pub trait CharExt {
+#[experimental = "trait organization may change"]
+pub trait Char {
     /// Checks if a `char` parses as a numeric digit in the given radix.
     ///
     /// Compared to `is_numeric()`, this function only recognizes the characters
@@ -126,7 +126,7 @@ pub trait CharExt {
     /// # Panics
     ///
     /// Panics if given a radix > 36.
-    #[unstable = "pending integer conventions"]
+    #[unstable = "pending error conventions"]
     fn is_digit(self, radix: uint) -> bool;
 
     /// Converts a character to the corresponding digit.
@@ -140,7 +140,7 @@ pub trait CharExt {
     /// # Panics
     ///
     /// Panics if given a radix outside the range [0..36].
-    #[unstable = "pending integer conventions"]
+    #[unstable = "pending error conventions, trait organization"]
     fn to_digit(self, radix: uint) -> Option<uint>;
 
     /// Returns an iterator that yields the hexadecimal Unicode escape
@@ -149,7 +149,7 @@ pub trait CharExt {
     /// All characters are escaped with Rust syntax of the form `\\u{NNNN}`
     /// where `NNNN` is the shortest hexadecimal representation of the code
     /// point.
-    #[stable]
+    #[unstable = "pending error conventions, trait organization"]
     fn escape_unicode(self) -> EscapeUnicode;
 
     /// Returns an iterator that yields the 'default' ASCII and
@@ -164,44 +164,47 @@ pub trait CharExt {
     ///   escaped.
     /// * Any other chars in the range [0x20,0x7e] are not escaped.
     /// * Any other chars are given hex Unicode escapes; see `escape_unicode`.
-    #[stable]
+    #[unstable = "pending error conventions, trait organization"]
     fn escape_default(self) -> EscapeDefault;
 
     /// Returns the amount of bytes this character would need if encoded in
     /// UTF-8.
-    #[stable]
+    #[unstable = "pending trait organization"]
     fn len_utf8(self) -> uint;
 
     /// Returns the amount of bytes this character would need if encoded in
     /// UTF-16.
-    #[stable]
+    #[unstable = "pending trait organization"]
     fn len_utf16(self) -> uint;
 
     /// Encodes this character as UTF-8 into the provided byte buffer,
     /// and then returns the number of bytes written.
     ///
     /// If the buffer is not large enough, nothing will be written into it
     /// and a `None` will be returned.
-    #[stable]
-    fn encode_utf8(self, dst: &mut [u8]) -> Option<uint>;
+    #[unstable = "pending trait organization"]
+    fn encode_utf8(&self, dst: &mut [u8]) -> Option<uint>;
 
     /// Encodes this character as UTF-16 into the provided `u16` buffer,
     /// and then returns the number of `u16`s written.
     ///
     /// If the buffer is not large enough, nothing will be written into it
     /// and a `None` will be returned.
-    #[stable]
-    fn encode_utf16(self, dst: &mut [u16]) -> Option<uint>;
+    #[unstable = "pending trait organization"]
+    fn encode_utf16(&self, dst: &mut [u16]) -> Option<uint>;
 }
 
-#[stable]
-impl CharExt for char {
-    #[unstable = "pending integer conventions"]
+#[experimental = "trait is experimental"]
+impl Char for char {
+    #[unstable = "pending trait organization"]
     fn is_digit(self, radix: uint) -> bool {
-        self.to_digit(radix).is_some()
+        match self.to_digit(radix) {
+            Some(_) => true,
+            None    => false,
+        }
     }
 
-    #[unstable = "pending integer conventions"]
+    #[unstable = "pending trait organization"]
     fn to_digit(self, radix: uint) -> Option<uint> {
         if radix > 36 {
             panic!("to_digit: radix is too high (maximum 36)");
@@ -216,12 +219,12 @@ impl CharExt for char {
         else { None }
     }
 
-    #[stable]
+    #[unstable = "pending error conventions, trait organization"]
     fn escape_unicode(self) -> EscapeUnicode {
         EscapeUnicode { c: self, state: EscapeUnicodeState::Backslash }
     }
 
-    #[stable]
+    #[unstable = "pending error conventions, trait organization"]
     fn escape_default(self) -> EscapeDefault {
         let init_state = match self {
             '\t' => EscapeDefaultState::Backslash('t'),
@@ -237,7 +240,7 @@ impl CharExt for char {
     }
 
     #[inline]
-    #[stable]
+    #[unstable = "pending trait organization"]
     fn len_utf8(self) -> uint {
         let code = self as u32;
         match () {
@@ -249,17 +252,17 @@ impl CharExt for char {
     }
 
     #[inline]
-    #[stable]
+    #[unstable = "pending trait organization"]
     fn len_utf16(self) -> uint {
         let ch = self as u32;
         if (ch & 0xFFFF_u32) == ch { 1 } else { 2 }
     }
 
     #[inline]
-    #[unstable = "pending decision about Iterator/Writer/Reader"]
-    fn encode_utf8(self, dst: &mut [u8]) -> Option<uint> {
+    #[unstable = "pending error conventions, trait organization"]
+    fn encode_utf8<'a>(&self, dst: &'a mut [u8]) -> Option<uint> {
         // Marked #[inline] to allow llvm optimizing it away
-        let code = self as u32;
+        let code = *self as u32;
         if code < MAX_ONE_B && dst.len() >= 1 {
             dst[0] = code as u8;
             Some(1)
@@ -284,10 +287,10 @@ impl CharExt for char {
     }
 
     #[inline]
-    #[unstable = "pending decision about Iterator/Writer/Reader"]
-    fn encode_utf16(self, dst: &mut [u16]) -> Option<uint> {
+    #[unstable = "pending error conventions, trait organization"]
+    fn encode_utf16(&self, dst: &mut [u16]) -> Option<uint> {
         // Marked #[inline] to allow llvm optimizing it away
-        let mut ch = self as u32;
+        let mut ch = *self as u32;
         if (ch & 0xFFFF_u32) == ch  && dst.len() >= 1 {
             // The BMP falls through (assuming non-surrogate, as it should)
             dst[0] = ch as u16;
@@ -307,7 +310,6 @@ impl CharExt for char {
 /// An iterator over the characters that represent a `char`, as escaped by
 /// Rust's unicode escaping rules.
 #[derive(Clone)]
-#[stable]
 pub struct EscapeUnicode {
     c: char,
     state: EscapeUnicodeState
@@ -323,7 +325,6 @@ enum EscapeUnicodeState {
     Done,
 }
 
-#[stable]
 impl Iterator for EscapeUnicode {
     type Item = char;
 
@@ -369,7 +370,6 @@ impl Iterator for EscapeUnicode {
 /// An iterator over the characters that represent a `char`, escaped
 /// for maximum portability.
 #[derive(Clone)]
-#[stable]
 pub struct EscapeDefault {
     state: EscapeDefaultState
 }
@@ -382,7 +382,6 @@ enum EscapeDefaultState {
     Unicode(EscapeUnicode),
 }
 
-#[stable]
 impl Iterator for EscapeDefault {
     type Item = char;
 

branches/auto/src/libcore/fmt/float.rs

@@ -15,7 +15,7 @@ pub use self::SignificantDigits::*;
 pub use self::SignFormat::*;
 
 use char;
-use char::CharExt;
+use char::Char;
 use fmt;
 use iter::{IteratorExt, range};
 use num::{cast, Float, ToPrimitive};

branches/auto/src/libcore/fmt/mod.rs

@@ -388,7 +388,7 @@ impl<'a> Formatter<'a> {
                         prefix: &str,
                         buf: &str)
                         -> Result {
-        use char::CharExt;
+        use char::Char;
         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::CharExt;
+        use char::Char;
         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::CharExt;
+        use char::Char;
 
         let mut utf8 = [0u8; 4];
         let amt = self.encode_utf8(&mut utf8).unwrap_or(0);

branches/auto/src/libcore/num/mod.rs

@@ -15,7 +15,7 @@
 #![stable]
 #![allow(missing_docs)]
 
-use char::CharExt;
+use char::Char;
 use clone::Clone;
 use cmp::{PartialEq, Eq};
 use cmp::{PartialOrd, Ord};

branches/auto/src/libcore/prelude.rs

@@ -38,7 +38,7 @@ pub use mem::drop;
 
 // Reexported types and traits
 
-pub use char::CharExt;
+pub use char::Char;
 pub use clone::Clone;
 pub use cmp::{PartialEq, PartialOrd, Eq, Ord};
 pub use iter::{Extend, IteratorExt};