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/libserialize | |
| parent | b25e100173effba685d076cee16f8af150078617 (diff) | |
| download | rust-52edb2ecc9530264dc75babe477fd75c64feac04.tar.gz rust-52edb2ecc9530264dc75babe477fd75c64feac04.zip | |
Register new snapshots
Diffstat (limited to 'src/libserialize')
| -rw-r--r-- | src/libserialize/json.rs | 12 | ||||
| -rw-r--r-- | src/libserialize/lib.rs | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/libserialize/json.rs b/src/libserialize/json.rs index d28bd1b9df0..7919ac0eff1 100644 --- a/src/libserialize/json.rs +++ b/src/libserialize/json.rs @@ -284,8 +284,8 @@ pub fn error_str(error: ErrorCode) -> &'static str { TrailingCharacters => "trailing characters", TrailingComma => "trailing comma", InvalidEscape => "invalid escape", - UnrecognizedHex => "invalid \\u escape (unrecognized hex)", - NotFourDigit => "invalid \\u escape (not four digits)", + UnrecognizedHex => "invalid \\u{ esc}ape (unrecognized hex)", + NotFourDigit => "invalid \\u{ esc}ape (not four digits)", NotUtf8 => "contents not utf-8", InvalidUnicodeCodePoint => "invalid Unicode code point", LoneLeadingSurrogateInHexEscape => "lone leading surrogate in hex escape", @@ -2846,8 +2846,8 @@ mod tests { assert_eq!(from_str("\"\\r\""), Ok(String("\r".into_string()))); assert_eq!(from_str("\"\\t\""), Ok(String("\t".into_string()))); assert_eq!(from_str(" \"foo\" "), Ok(String("foo".into_string()))); - assert_eq!(from_str("\"\\u12ab\""), Ok(String("\u12ab".into_string()))); - assert_eq!(from_str("\"\\uAB12\""), Ok(String("\uAB12".into_string()))); + assert_eq!(from_str("\"\\u12ab\""), Ok(String("\u{12ab}".into_string()))); + assert_eq!(from_str("\"\\uAB12\""), Ok(String("\u{AB12}".into_string()))); } #[test] @@ -2859,8 +2859,8 @@ mod tests { ("\"\\n\"", "\n"), ("\"\\r\"", "\r"), ("\"\\t\"", "\t"), - ("\"\\u12ab\"", "\u12ab"), - ("\"\\uAB12\"", "\uAB12")]; + ("\"\\u12ab\"", "\u{12ab}"), + ("\"\\uAB12\"", "\u{AB12}")]; for &(i, o) in s.iter() { let v: string::String = super::decode(i).unwrap(); diff --git a/src/libserialize/lib.rs b/src/libserialize/lib.rs index 1cff4c334e7..9711d5c7209 100644 --- a/src/libserialize/lib.rs +++ b/src/libserialize/lib.rs @@ -23,7 +23,7 @@ Core encoding and decoding interfaces. html_root_url = "http://doc.rust-lang.org/nightly/", html_playground_url = "http://play.rust-lang.org/")] #![allow(unknown_features)] -#![feature(macro_rules, default_type_params, phase, slicing_syntax, globs, if_let)] +#![feature(macro_rules, default_type_params, phase, slicing_syntax, globs)] // test harness access #[cfg(test)] |