rollup merge of #23738: alexcrichton/snapshots

Conflicts:
	src/libcollections/vec.rs

1 files changed, 0 insertions, 23 deletions

diff --git a/src/libserialize/json.rs b/src/libserialize/json.rs
index acd27161064..eef7cdd380f 100644
--- a/src/libserialize/json.rs
+++ b/src/libserialize/json.rs
@@ -1218,16 +1218,6 @@ impl Json {
     }
 }
 
-#[cfg(stage0)]
-impl<'a> Index<&'a str>  for Json {
-    type Output = Json;
-
-    fn index(&self, idx: & &str) -> &Json {
-        self.find(*idx).unwrap()
-    }
-}
-
-#[cfg(not(stage0))]
 impl<'a> Index<&'a str>  for Json {
     type Output = Json;
 
@@ -1236,19 +1226,6 @@ impl<'a> Index<&'a str>  for Json {
     }
 }
 
-#[cfg(stage0)]
-impl Index<uint> for Json {
-    type Output = Json;
-
-    fn index<'a>(&'a self, idx: &uint) -> &'a Json {
-        match self {
-            &Json::Array(ref v) => &v[*idx],
-            _ => panic!("can only index Json with uint if it is an array")
-        }
-    }
-}
-
-#[cfg(not(stage0))]
 impl Index<uint> for Json {
     type Output = Json;