From 77ef4e717667ddbe925a81efc85994662183a445 Mon Sep 17 00:00:00 2001
From: Erick Tryzelaar <erick.tryzelaar@gmail.com>
Date: Sat, 17 Nov 2012 17:38:58 -0800
Subject: [PATCH] change json::Deserializer to take a json enum

This allows the deserializer to be used on an already
parsed json object.
---
 src/libstd/json.rs | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/src/libstd/json.rs b/src/libstd/json.rs
index d65a8d816e1..e638fc79746 100644
--- a/src/libstd/json.rs
+++ b/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 {