Skip to content

Commit 77ef4e7

Browse files
ericktgraydon
authored andcommitted
change json::Deserializer to take a json enum
This allows the deserializer to be used on an already parsed json object.
1 parent 2d4c217 commit 77ef4e7

File tree

1 file changed

+2
-8
lines changed

1 file changed

+2
-8
lines changed

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)