diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2014-12-09 14:08:10 -0800 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2014-12-11 11:30:38 -0800 |
| commit | 52edb2ecc9530264dc75babe477fd75c64feac04 (patch) | |
| tree | 7110ee1e9e8b123ffdd8be4dd1e9b6213b9cb08c /src/libcollections/string.rs | |
| parent | b25e100173effba685d076cee16f8af150078617 (diff) | |
| download | rust-52edb2ecc9530264dc75babe477fd75c64feac04.tar.gz rust-52edb2ecc9530264dc75babe477fd75c64feac04.zip | |
Register new snapshots
Diffstat (limited to 'src/libcollections/string.rs')
| -rw-r--r-- | src/libcollections/string.rs | 35 |
1 files changed, 18 insertions, 17 deletions
diff --git a/src/libcollections/string.rs b/src/libcollections/string.rs index 6943ec69359..564189bfc4f 100644 --- a/src/libcollections/string.rs +++ b/src/libcollections/string.rs @@ -118,7 +118,7 @@ impl String { /// ```rust /// let input = b"Hello \xF0\x90\x80World"; /// let output = String::from_utf8_lossy(input); - /// assert_eq!(output.as_slice(), "Hello \uFFFDWorld"); + /// assert_eq!(output.as_slice(), "Hello \u{FFFD}World"); /// ``` #[unstable = "return type may change"] pub fn from_utf8_lossy<'a>(v: &'a [u8]) -> CowString<'a> { @@ -275,7 +275,7 @@ impl String { /// 0xD834]; /// /// assert_eq!(String::from_utf16_lossy(v), - /// "𝄞mus\uFFFDic\uFFFD".to_string()); + /// "𝄞mus\u{FFFD}ic\u{FFFD}".to_string()); /// ``` #[stable] pub fn from_utf16_lossy(v: &[u16]) -> String { @@ -1043,32 +1043,32 @@ mod tests { let xs = b"Hello\xC2 There\xFF Goodbye"; assert_eq!(String::from_utf8_lossy(xs), - String::from_str("Hello\uFFFD There\uFFFD Goodbye").into_cow()); + String::from_str("Hello\u{FFFD} There\u{FFFD} Goodbye").into_cow()); let xs = b"Hello\xC0\x80 There\xE6\x83 Goodbye"; assert_eq!(String::from_utf8_lossy(xs), - String::from_str("Hello\uFFFD\uFFFD There\uFFFD Goodbye").into_cow()); + String::from_str("Hello\u{FFFD}\u{FFFD} There\u{FFFD} Goodbye").into_cow()); let xs = b"\xF5foo\xF5\x80bar"; assert_eq!(String::from_utf8_lossy(xs), - String::from_str("\uFFFDfoo\uFFFD\uFFFDbar").into_cow()); + String::from_str("\u{FFFD}foo\u{FFFD}\u{FFFD}bar").into_cow()); let xs = b"\xF1foo\xF1\x80bar\xF1\x80\x80baz"; assert_eq!(String::from_utf8_lossy(xs), - String::from_str("\uFFFDfoo\uFFFDbar\uFFFDbaz").into_cow()); + String::from_str("\u{FFFD}foo\u{FFFD}bar\u{FFFD}baz").into_cow()); let xs = b"\xF4foo\xF4\x80bar\xF4\xBFbaz"; assert_eq!(String::from_utf8_lossy(xs), - String::from_str("\uFFFDfoo\uFFFDbar\uFFFD\uFFFDbaz").into_cow()); + String::from_str("\u{FFFD}foo\u{FFFD}bar\u{FFFD}\u{FFFD}baz").into_cow()); let xs = b"\xF0\x80\x80\x80foo\xF0\x90\x80\x80bar"; - assert_eq!(String::from_utf8_lossy(xs), String::from_str("\uFFFD\uFFFD\uFFFD\uFFFD\ - foo\U00010000bar").into_cow()); + assert_eq!(String::from_utf8_lossy(xs), String::from_str("\u{FFFD}\u{FFFD}\u{FFFD}\u{FFFD}\ + foo\u{10000}bar").into_cow()); // surrogates let xs = b"\xED\xA0\x80foo\xED\xBF\xBFbar"; - assert_eq!(String::from_utf8_lossy(xs), String::from_str("\uFFFD\uFFFD\uFFFDfoo\ - \uFFFD\uFFFD\uFFFDbar").into_cow()); + assert_eq!(String::from_utf8_lossy(xs), String::from_str("\u{FFFD}\u{FFFD}\u{FFFD}foo\ + \u{FFFD}\u{FFFD}\u{FFFD}bar").into_cow()); } #[test] @@ -1110,7 +1110,7 @@ mod tests { 0xd801_u16, 0xdc95_u16, 0xd801_u16, 0xdc86_u16, 0x000a_u16 ]), // Issue #12318, even-numbered non-BMP planes - (String::from_str("\U00020000"), + (String::from_str("\u{20000}"), vec![0xD840, 0xDC00])]; for p in pairs.iter() { @@ -1148,16 +1148,17 @@ mod tests { fn test_from_utf16_lossy() { // completely positive cases tested above. // lead + eof - assert_eq!(String::from_utf16_lossy(&[0xD800]), String::from_str("\uFFFD")); + assert_eq!(String::from_utf16_lossy(&[0xD800]), String::from_str("\u{FFFD}")); // lead + lead - assert_eq!(String::from_utf16_lossy(&[0xD800, 0xD800]), String::from_str("\uFFFD\uFFFD")); + assert_eq!(String::from_utf16_lossy(&[0xD800, 0xD800]), + String::from_str("\u{FFFD}\u{FFFD}")); // isolated trail - assert_eq!(String::from_utf16_lossy(&[0x0061, 0xDC00]), String::from_str("a\uFFFD")); + assert_eq!(String::from_utf16_lossy(&[0x0061, 0xDC00]), String::from_str("a\u{FFFD}")); // general assert_eq!(String::from_utf16_lossy(&[0xD800, 0xd801, 0xdc8b, 0xD800]), - String::from_str("\uFFFD𐒋\uFFFD")); + String::from_str("\u{FFFD}𐒋\u{FFFD}")); } #[test] @@ -1249,7 +1250,7 @@ mod tests { #[test] #[should_fail] fn test_str_truncate_split_codepoint() { - let mut s = String::from_str("\u00FC"); // ü + let mut s = String::from_str("\u{FC}"); // ü s.truncate(1); } |
