---

blake2-ppc · blake2-ppc · commit d2f8d1977ad8 · 2013-07-30T01:48:17.000+02:00
yaml --- r: 64839 b: refs/heads/snap-stage3 c: 5d4af58 h: refs/heads/master i: 64837: 67f733a 64835: bb75fe9 64831: 6f2e4d6 v: v3
diff --git a/[refs] b/[refs]
@@ -1,7 +1,7 @@
 ---
 refs/heads/master: 2d28d645422c1617be58c8ca7ad9a457264ca850
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: 4b2931c90fbe152ca1dd3111985057778dad1ba9
+refs/heads/snap-stage3: 5d4af58c1d2abc0895d170185796e837f37b16cb
 refs/heads/try: 7b78b52e602bb3ea8174f9b2006bff3315f03ef9
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
diff --git a/branches/snap-stage3/src/libstd/iterator.rs b/branches/snap-stage3/src/libstd/iterator.rs
@@ -1271,6 +1271,16 @@ impl<'self, A, T: Iterator<A>, B, U: Iterator<B>> Iterator<B> for
             }
         }
     }
+
+    #[inline]
+    fn size_hint(&self) -> (uint, Option<uint>) {
+        let (flo, fhi) = self.frontiter.map_default((0, Some(0)), |it| it.size_hint());
+        let (blo, bhi) = self.backiter.map_default((0, Some(0)), |it| it.size_hint());
+        match (self.iter.size_hint(), fhi, bhi) {
+            ((0, Some(0)), Some(a), Some(b)) => (flo + blo, Some(a + b)),
+            _ => (flo + blo, None)
+        }
+    }
 }
 
 impl<'self,

Original file line number	Diff line number	Diff line change
`@@ -1271,6 +1271,16 @@ impl<'self, A, T: Iterator<A>, B, U: Iterator<B>> Iterator<B> for`
`1271`	`1271`	`}`
`1272`	`1272`	`}`
`1273`	`1273`	`}`
	`1274`	`+`
	`1275`	`+ #[inline]`
	`1276`	`+ fn size_hint(&self) -> (uint, Option<uint>) {`
	`1277`	`+ let (flo, fhi) = self.frontiter.map_default((0, Some(0)), \|it\| it.size_hint());`
	`1278`	`+ let (blo, bhi) = self.backiter.map_default((0, Some(0)), \|it\| it.size_hint());`
	`1279`	`+ match (self.iter.size_hint(), fhi, bhi) {`
	`1280`	`+ ((0, Some(0)), Some(a), Some(b)) => (flo + blo, Some(a + b)),`
	`1281`	`+ _ => (flo + blo, None)`
	`1282`	`+ }`
	`1283`	`+ }`
`1274`	`1284`	`}`
`1275`	`1285`
`1276`	`1286`	`impl<'self,`