---

yaml
---
r: 167887
b: refs/heads/master
c: 6fc9257
h: refs/heads/master
i:
  167885: 797d4f8
  167883: 20577b3
  167879: 92ecfc1
  167871: 7d6b6c4
v: v3

Author: Jorge Aparicio

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 4bfaa9397857b5b49657e3596e33800dbf35ade4
+refs/heads/master: 6fc92578fee125615b4357bdd3142a8f07b20b54
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: c89417130f042c58adc60012e7cddc4ef70b70b9
 refs/heads/try: 5204084bd2e46af7cc6e0147430e44dd0d657bbb

trunk/src/libserialize/json.rs

@@ -1123,12 +1123,25 @@ impl Json {
     }
 }
 
+// NOTE(stage0): remove impl after a snapshot
+#[cfg(stage0)]
 impl<'a> ops::Index<&'a str, Json>  for Json {
     fn index(&self, idx: & &str) -> &Json {
         self.find(*idx).unwrap()
     }
 }
 
+#[cfg(not(stage0))]  // NOTE(stage0): remove cfg after a snapshot
+impl<'a> ops::Index<&'a str>  for Json {
+    type Output = Json;
+
+    fn index(&self, idx: & &str) -> &Json {
+        self.find(*idx).unwrap()
+    }
+}
+
+// NOTE(stage0): remove impl after a snapshot
+#[cfg(stage0)]
 impl ops::Index<uint, Json> for Json {
     fn index<'a>(&'a self, idx: &uint) -> &'a Json {
         match self {
@@ -1138,6 +1151,18 @@ impl ops::Index<uint, Json> for Json {
     }
 }
 
+#[cfg(not(stage0))]  // NOTE(stage0): remove cfg after a snapshot
+impl ops::Index<uint> for Json {
+    type Output = Json;
+
+    fn index<'a>(&'a self, idx: &uint) -> &'a Json {
+        match self {
+            &Json::Array(ref v) => v.index(idx),
+            _ => panic!("can only index Json with uint if it is an array")
+        }
+    }
+}
+
 /// The output of the streaming parser.
 #[deriving(PartialEq, Clone, Show)]
 pub enum JsonEvent {