Skip to content

Commit 32ca0d4

Browse files
ericktgraydon
authored andcommitted
---
yaml --- r: 40502 b: refs/heads/dist-snap c: 77ef4e7 h: refs/heads/master v: v3
1 parent 08b6d17 commit 32ca0d4

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
@@ -7,7 +7,7 @@ refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
88
refs/heads/try2: a810c03263670238bccd64cabb12a23a46e3a278
99
refs/heads/incoming: e90142e536c150df0d9b4b2f11352152177509b5
10-
refs/heads/dist-snap: 2d4c21718614020c8f28fb5e14dae25552833ac7
10+
refs/heads/dist-snap: 77ef4e717667ddbe925a81efc85994662183a445
1111
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1212
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
1313
refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0

branches/dist-snap/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)