diff options
Diffstat (limited to 'src/libcore')
| -rw-r--r-- | src/libcore/char.rs | 12 | ||||
| -rw-r--r-- | src/libcore/ops.rs | 50 | ||||
| -rw-r--r-- | src/libcore/option.rs | 3 | ||||
| -rw-r--r-- | src/libcore/result.rs | 1 | ||||
| -rw-r--r-- | src/libcore/str.rs | 12 |
5 files changed, 12 insertions, 66 deletions
diff --git a/src/libcore/char.rs b/src/libcore/char.rs index 8485e40819b..671b4ccb9e4 100644 --- a/src/libcore/char.rs +++ b/src/libcore/char.rs @@ -65,7 +65,7 @@ static MAX_THREE_B: u32 = 0x10000u32; /// The highest valid code point #[stable] -pub const MAX: char = '\U0010ffff'; +pub const MAX: char = '\u{10ffff}'; /// Converts from `u32` to a `char` #[inline] @@ -161,8 +161,8 @@ pub fn from_digit(num: uint, radix: uint) -> Option<char> { /// The rules are as follows: /// /// - chars in [0,0xff] get 2-digit escapes: `\\xNN` -/// - chars in [0x100,0xffff] get 4-digit escapes: `\\uNNNN` -/// - chars above 0x10000 get 8-digit escapes: `\\UNNNNNNNN` +/// - chars in [0x100,0xffff] get 4-digit escapes: `\\u{NNNN}` +/// - chars above 0x10000 get 8-digit escapes: `\\u{{NNN}NNNNN}` /// #[deprecated = "use the Char::escape_unicode method"] pub fn escape_unicode(c: char, f: |char|) { @@ -269,8 +269,8 @@ pub trait Char { /// The rules are as follows: /// /// * Characters in [0,0xff] get 2-digit escapes: `\\xNN` - /// * Characters in [0x100,0xffff] get 4-digit escapes: `\\uNNNN`. - /// * Characters above 0x10000 get 8-digit escapes: `\\UNNNNNNNN`. + /// * Characters in [0x100,0xffff] get 4-digit escapes: `\\u{NNNN}`. + /// * Characters above 0x10000 get 8-digit escapes: `\\u{{NNN}NNNNN}`. #[unstable = "pending error conventions, trait organization"] fn escape_unicode(self) -> UnicodeEscapedChars; @@ -470,7 +470,7 @@ impl Iterator<char> for UnicodeEscapedChars { } UnicodeEscapedCharsState::Type => { let (typechar, pad) = if self.c <= '\x7f' { ('x', 2) } - else if self.c <= '\uffff' { ('u', 4) } + else if self.c <= '\u{ffff}' { ('u', 4) } else { ('U', 8) }; self.state = UnicodeEscapedCharsState::Value(range_step(4 * (pad - 1), -1, -4i32)); Some(typechar) diff --git a/src/libcore/ops.rs b/src/libcore/ops.rs index d71c7e3b339..e16b24923a8 100644 --- a/src/libcore/ops.rs +++ b/src/libcore/ops.rs @@ -864,53 +864,3 @@ impl<F,A,R> FnOnce<A,R> for F self.call_mut(args) } } - -#[cfg(stage0)] -mod fn_impls { - use super::Fn; - - impl<Result> Fn<(),Result> for extern "Rust" fn() -> Result { - #[allow(non_snake_case)] - extern "rust-call" fn call(&self, _args: ()) -> Result { - (*self)() - } - } - - impl<Result,A0> Fn<(A0,),Result> for extern "Rust" fn(A0) -> Result { - #[allow(non_snake_case)] - extern "rust-call" fn call(&self, args: (A0,)) -> Result { - let (a0,) = args; - (*self)(a0) - } - } - - macro_rules! def_fn( - ($($args:ident)*) => ( - impl<Result$(,$args)*> - Fn<($($args,)*),Result> - for extern "Rust" fn($($args: $args,)*) -> Result { - #[allow(non_snake_case)] - extern "rust-call" fn call(&self, args: ($($args,)*)) -> Result { - let ($($args,)*) = args; - (*self)($($args,)*) - } - } - ) - ) - - def_fn!(A0 A1) - def_fn!(A0 A1 A2) - def_fn!(A0 A1 A2 A3) - def_fn!(A0 A1 A2 A3 A4) - def_fn!(A0 A1 A2 A3 A4 A5) - def_fn!(A0 A1 A2 A3 A4 A5 A6) - def_fn!(A0 A1 A2 A3 A4 A5 A6 A7) - def_fn!(A0 A1 A2 A3 A4 A5 A6 A7 A8) - def_fn!(A0 A1 A2 A3 A4 A5 A6 A7 A8 A9) - def_fn!(A0 A1 A2 A3 A4 A5 A6 A7 A8 A9 A10) - def_fn!(A0 A1 A2 A3 A4 A5 A6 A7 A8 A9 A10 A11) - def_fn!(A0 A1 A2 A3 A4 A5 A6 A7 A8 A9 A10 A11 A12) - def_fn!(A0 A1 A2 A3 A4 A5 A6 A7 A8 A9 A10 A11 A12 A13) - def_fn!(A0 A1 A2 A3 A4 A5 A6 A7 A8 A9 A10 A11 A12 A13 A14) - def_fn!(A0 A1 A2 A3 A4 A5 A6 A7 A8 A9 A10 A11 A12 A13 A14 A15) -} diff --git a/src/libcore/option.rs b/src/libcore/option.rs index 0697dfbb0f2..5e2d6266f0e 100644 --- a/src/libcore/option.rs +++ b/src/libcore/option.rs @@ -143,9 +143,6 @@ #![stable] -#[cfg(stage0)] -pub use self::Option::*; -#[cfg(not(stage0))] use self::Option::*; use cmp::{Eq, Ord}; diff --git a/src/libcore/result.rs b/src/libcore/result.rs index 8125afee13f..9d1ffa78911 100644 --- a/src/libcore/result.rs +++ b/src/libcore/result.rs @@ -918,6 +918,5 @@ pub fn fold<T, Ok(init) } -#[cfg(not(stage0))] impl<T:Copy,U:Copy> Copy for Result<T,U> {} diff --git a/src/libcore/str.rs b/src/libcore/str.rs index baa739b0683..d0c8558b55d 100644 --- a/src/libcore/str.rs +++ b/src/libcore/str.rs @@ -914,13 +914,13 @@ fn run_utf8_validation_iterator(iter: &mut slice::Items<u8>) -> bool { if first >= 128 { let w = utf8_char_width(first); let second = next!(); - // 2-byte encoding is for codepoints \u0080 to \u07ff + // 2-byte encoding is for codepoints \u{0080} to \u{07ff} // first C2 80 last DF BF - // 3-byte encoding is for codepoints \u0800 to \uffff + // 3-byte encoding is for codepoints \u{0800} to \u{ffff} // first E0 A0 80 last EF BF BF - // excluding surrogates codepoints \ud800 to \udfff + // excluding surrogates codepoints \u{d800} to \u{dfff} // ED A0 80 to ED BF BF - // 4-byte encoding is for codepoints \u10000 to \u10ffff + // 4-byte encoding is for codepoints \u{1000}0 to \u{10ff}ff // first F0 90 80 80 last F4 8F BF BF // // Use the UTF-8 syntax from the RFC @@ -1007,7 +1007,7 @@ impl Utf16Item { pub fn to_char_lossy(&self) -> char { match *self { ScalarValue(c) => c, - LoneSurrogate(_) => '\uFFFD' + LoneSurrogate(_) => '\u{FFFD}' } } } @@ -1523,7 +1523,7 @@ pub trait StrPrelude for Sized? { /// // composed forms of `ö` and `é` /// let c = "Löwe 老虎 Léopard"; // German, Simplified Chinese, French /// // decomposed forms of `ö` and `é` - /// let d = "Lo\u0308we 老虎 Le\u0301opard"; + /// let d = "Lo\u{0308}we 老虎 Le\u{0301}opard"; /// /// assert_eq!(c.char_len(), 15); /// assert_eq!(d.char_len(), 17); |