---

yaml
---
r: 35214
b: refs/heads/master
c: 77ef4e7
h: refs/heads/master
v: v3

Author: erickt

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 2d4c21718614020c8f28fb5e14dae25552833ac7
+refs/heads/master: 77ef4e717667ddbe925a81efc85994662183a445
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: eb8fd119c65c67f3b1b8268cc7341c22d39b7b61
 refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024

trunk/src/libstd/json.rs

@@ -702,14 +702,8 @@ pub struct Deserializer {
     priv mut stack: ~[&Json],
 }
 
-pub fn Deserializer(rdr: io::Reader) -> Result<Deserializer, Error> {
-    match move from_reader(rdr) {
-        Ok(move json) => {
-            let des = Deserializer { json: move json, stack: ~[] };
-            Ok(move des)
-        }
-        Err(move e) => Err(e)
-    }
+pub fn Deserializer(json: Json) -> Deserializer {
+    Deserializer { json: move json, stack: ~[] }
 }
 
 priv impl Deserializer {