Skip to content

Commit b9d5b24

Browse files
ericktgraydon
authored andcommitted
---
yaml --- r: 36407 b: refs/heads/try2 c: 77ef4e7 h: refs/heads/master i: 36405: 3063205 36403: fade222 36399: f6a52ad v: v3
1 parent 9731488 commit b9d5b24

File tree

2 files changed

+3
-9
lines changed

2 files changed

+3
-9
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: eb8fd119c65c67f3b1b8268cc7341c22d39b7b61
55
refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
8-
refs/heads/try2: 2d4c21718614020c8f28fb5e14dae25552833ac7
8+
refs/heads/try2: 77ef4e717667ddbe925a81efc85994662183a445
99
refs/heads/incoming: d9317a174e434d4c99fc1a37fd7dc0d2f5328d37
1010
refs/heads/dist-snap: 22efa39382d41b084fde1719df7ae8ce5697d8c9
1111
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596

branches/try2/src/libstd/json.rs

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -702,14 +702,8 @@ pub struct Deserializer {
702702
priv mut stack: ~[&Json],
703703
}
704704

705-
pub fn Deserializer(rdr: io::Reader) -> Result<Deserializer, Error> {
706-
match move from_reader(rdr) {
707-
Ok(move json) => {
708-
let des = Deserializer { json: move json, stack: ~[] };
709-
Ok(move des)
710-
}
711-
Err(move e) => Err(e)
712-
}
705+
pub fn Deserializer(json: Json) -> Deserializer {
706+
Deserializer { json: move json, stack: ~[] }
713707
}
714708

715709
priv impl Deserializer {

0 commit comments

Comments
 (0)