Skip to content

Commit 4e96502

Browse files
committed
---
yaml --- r: 139382 b: refs/heads/try2 c: c317d3f h: refs/heads/master v: v3
1 parent 5f07c92 commit 4e96502

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
55
refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
8-
refs/heads/try2: 83e831bc229c2346e2322aaad1fdaa219325a4b3
8+
refs/heads/try2: c317d3f6fa9475e65b6276743c09444441059ca7
99
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
1010
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1111
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/src/libstd/json.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -827,15 +827,15 @@ impl<'self> serialize::Decoder for Decoder<'self> {
827827
debug!("read_owned_str");
828828
match *self.pop() {
829829
String(ref s) => copy *s,
830-
_ => fail!(~"not a string")
830+
ref json => fail!(fmt!("not a string: %?", *json))
831831
}
832832
}
833833
834834
fn read_managed_str(&self) -> @str {
835835
debug!("read_managed_str");
836836
match *self.pop() {
837837
String(ref s) => s.to_managed(),
838-
_ => fail!(~"not a string")
838+
ref json => fail!(fmt!("not a string: %?", *json))
839839
}
840840
}
841841
@@ -872,7 +872,7 @@ impl<'self> serialize::Decoder for Decoder<'self> {
872872
let name = match *self.peek() {
873873
String(ref s) => s,
874874
List([String(ref s), .. _]) => s,
875-
json => fail!(fmt!("invalid variant: %?", json)),
875+
ref json => fail!(fmt!("invalid variant: %?", *json)),
876876
};
877877
let idx = match vec::position(names, |n| str::eq_slice(*n, *name)) {
878878
Some(idx) => idx,

0 commit comments

Comments
 (0)