---

yaml
---
r: 21509
b: refs/heads/snap-stage3
c: 4fb675b
h: refs/heads/master
i:
  21507: 69115c6
v: v3

Author: killerswan

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: e430a699f2c60890d9b86069fd0c68a70ece7120
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: 272c5ab0e9573e6e85a1d576a3c95b5213cf5c61
+refs/heads/snap-stage3: 4fb675be2f42a828fb5a6570b9aad2c65f4598b9
 refs/heads/try: ffbe0e0e00374358b789b0037bcb3a577cd218be
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/src/libstd/json.rs

@@ -428,17 +428,25 @@ impl Parser {
                       while i < 4u {
                           match self.next_char() {
                             '0' to '9' => {
-                              n = n * 10u +
-                                  (self.ch as uint) - ('0' as uint);
-                            }
-                            _ => return self.error(~"invalid \\u escape")
+                              n = n * 16u + (self.ch as uint)
+                                          - ('0'     as uint);
+                            },
+                            'a' | 'A' => n = n * 16u + 10u,
+                            'b' | 'B' => n = n * 16u + 11u,
+                            'c' | 'C' => n = n * 16u + 12u,
+                            'd' | 'D' => n = n * 16u + 13u,
+                            'e' | 'E' => n = n * 16u + 14u,
+                            'f' | 'F' => n = n * 16u + 15u,
+                            _ => return self.error(
+                                   ~"invalid \\u escape (unrecognized hex)")
                           }
                           i += 1u;
                       }
 
                       // Error out if we didn't parse 4 digits.
                       if i != 4u {
-                          return self.error(~"invalid \\u escape");
+                          return self.error(
+                            ~"invalid \\u escape (not four digits)");
                       }
 
                       str::push_char(res, n as char);