Skip to content

Commit 2352282

Browse files
author
Jorge Aparicio
committed
---
yaml --- r: 171255 b: refs/heads/batch c: eb2506c h: refs/heads/master i: 171253: e70fc1b 171251: 9638cbf 171247: 4e116a6 v: v3
1 parent 0906dec commit 2352282

File tree

2 files changed

+1
-22
lines changed

2 files changed

+1
-22
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ refs/tags/0.12.0: f0c419429ef30723ceaf6b42f9b5a2aeb5d2e2d1
2929
refs/heads/issue-18208-method-dispatch-2: 9e1eae4fb9b6527315b4441cf8a0f5ca911d1671
3030
refs/heads/automation-fail: 1bf06495443584539b958873e04cc2f864ab10e4
3131
refs/heads/issue-18208-method-dispatch-3-quick-reject: 2009f85b9f99dedcec4404418eda9ddba90258a2
32-
refs/heads/batch: 97f870a1fc24ecf3a432170c7040863d0399eb85
32+
refs/heads/batch: eb2506cc1bcf2011d4e8ce99ff7cf74c2c1d1493
3333
refs/heads/building: 126db549b038c84269a1e4fe46f051b2c15d6970
3434
refs/heads/beta: 496dc4eae7de9d14cd49511a9acfbf5f11ae6c3f
3535
refs/heads/windistfix: 7608dbad651f02e837ed05eef3d74a6662a6e928

branches/batch/src/libserialize/json_stage0.rs

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1123,15 +1123,6 @@ impl Json {
11231123
}
11241124
}
11251125

1126-
// NOTE(stage0): remove impl after a snapshot
1127-
#[cfg(stage0)]
1128-
impl<'a> ops::Index<&'a str, Json> for Json {
1129-
fn index(&self, idx: & &str) -> &Json {
1130-
self.find(*idx).unwrap()
1131-
}
1132-
}
1133-
1134-
#[cfg(not(stage0))] // NOTE(stage0): remove cfg after a snapshot
11351126
impl<'a> ops::Index<&'a str> for Json {
11361127
type Output = Json;
11371128

@@ -1140,18 +1131,6 @@ impl<'a> ops::Index<&'a str> for Json {
11401131
}
11411132
}
11421133

1143-
// NOTE(stage0): remove impl after a snapshot
1144-
#[cfg(stage0)]
1145-
impl ops::Index<uint, Json> for Json {
1146-
fn index<'a>(&'a self, idx: &uint) -> &'a Json {
1147-
match self {
1148-
&Json::Array(ref v) => v.index(idx),
1149-
_ => panic!("can only index Json with uint if it is an array")
1150-
}
1151-
}
1152-
}
1153-
1154-
#[cfg(not(stage0))] // NOTE(stage0): remove cfg after a snapshot
11551134
impl ops::Index<uint> for Json {
11561135
type Output = Json;
11571136

0 commit comments

Comments
 (0)