Skip to content

Commit d01a664

Browse files
committed
---
yaml --- r: 50291 b: refs/heads/auto c: c317d3f h: refs/heads/master i: 50289: feecee0 50287: aa4c186 v: v3
1 parent 5b47027 commit d01a664

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
@@ -14,5 +14,5 @@ refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0
1414
refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
1515
refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
1616
refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
17-
refs/heads/auto: 83e831bc229c2346e2322aaad1fdaa219325a4b3
17+
refs/heads/auto: c317d3f6fa9475e65b6276743c09444441059ca7
1818
refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167

branches/auto/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)