---

yaml
---
r: 54219
b: refs/heads/dist-snap
c: c317d3f
h: refs/heads/master
i:
  54217: dd3f9bf
  54215: f0e49a7
v: v3

Author: erickt

[refs]

@@ -7,7 +7,7 @@ refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
 refs/heads/incoming: 44d4d6de762f3f9aae1fedcf454c66b79b3ad58d
-refs/heads/dist-snap: 83e831bc229c2346e2322aaad1fdaa219325a4b3
+refs/heads/dist-snap: c317d3f6fa9475e65b6276743c09444441059ca7
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0

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

@@ -827,15 +827,15 @@ impl<'self> serialize::Decoder for Decoder<'self> {
         debug!("read_owned_str");
         match *self.pop() {
             String(ref s) => copy *s,
-            _ => fail!(~"not a string")
+            ref json => fail!(fmt!("not a string: %?", *json))
         }
     }
 
     fn read_managed_str(&self) -> @str {
         debug!("read_managed_str");
         match *self.pop() {
             String(ref s) => s.to_managed(),
-            _ => fail!(~"not a string")
+            ref json => fail!(fmt!("not a string: %?", *json))
         }
     }
 
@@ -872,7 +872,7 @@ impl<'self> serialize::Decoder for Decoder<'self> {
         let name = match *self.peek() {
             String(ref s) => s,
             List([String(ref s), .. _]) => s,
-            json => fail!(fmt!("invalid variant: %?", json)),
+            ref json => fail!(fmt!("invalid variant: %?", *json)),
         };
         let idx = match vec::position(names, |n| str::eq_slice(*n, *name)) {
             Some(idx) => idx,