---

pnkfelix · pnkfelix · commit 92ffb842526a · 2015-03-03T12:10:57.000+01:00
yaml --- r: 193383 b: refs/heads/beta c: f0404c3 h: refs/heads/master i: 193381: a0a2dd4 193379: 47c17e3 193375: 43b32cb v: v3
diff --git a/[refs] b/[refs]
@@ -31,7 +31,7 @@ refs/heads/automation-fail: 1bf06495443584539b958873e04cc2f864ab10e4
 refs/heads/issue-18208-method-dispatch-3-quick-reject: 2009f85b9f99dedcec4404418eda9ddba90258a2
 refs/heads/batch: b7fd822592a4fb577552d93010c4a4e14f314346
 refs/heads/building: 126db549b038c84269a1e4fe46f051b2c15d6970
-refs/heads/beta: 6189e99c8605578aae841be6fba9e27bfbad97fc
+refs/heads/beta: f0404c39f272868c1dedc7cda7b0b6dffcb5713d
 refs/heads/windistfix: 7608dbad651f02e837ed05eef3d74a6662a6e928
 refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
 refs/heads/tmp: de8a23bbc3a7b9cbd7574b5b91a34af59bf030e6
diff --git a/branches/beta/src/libcore/iter.rs b/branches/beta/src/libcore/iter.rs
@@ -1130,7 +1130,11 @@ impl<I> RandomAccessIterator for Rev<I> where I: DoubleEndedIterator + RandomAcc
     #[inline]
     fn idx(&mut self, index: usize) -> Option<<I as Iterator>::Item> {
         let amt = self.indexable();
-        self.iter.idx(amt - index - 1)
+        if amt > index {
+            self.iter.idx(amt - index - 1)
+        } else {
+            None
+        }
     }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -1130,7 +1130,11 @@ impl<I> RandomAccessIterator for Rev<I> where I: DoubleEndedIterator + RandomAcc`
`1130`	`1130`	`#[inline]`
`1131`	`1131`	`fn idx(&mut self, index: usize) -> Option<<I as Iterator>::Item> {`
`1132`	`1132`	`let amt = self.indexable();`
`1133`		`- self.iter.idx(amt - index - 1)`
	`1133`	`+ if amt > index {`
	`1134`	`+ self.iter.idx(amt - index - 1)`
	`1135`	`+ } else {`
	`1136`	`+ None`
	`1137`	`+ }`
`1134`	`1138`	`}`
`1135`	`1139`	`}`
`1136`	`1140`