---

bors · bors · commit 17ce847c2860 · 2013-08-22T22:31:27.000-07:00
yaml --- r: 85708 b: refs/heads/dist-snap c: 0688bde h: refs/heads/master v: v3
diff --git a/[refs] b/[refs]
@@ -6,7 +6,7 @@ refs/heads/try: 0983ebe5310d4eb6d289f636f7ed0536c08bbc0e
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
-refs/heads/dist-snap: 9e1e15209129dad9d3bba90450a43ffb2505df14
+refs/heads/dist-snap: 0688bde47f1288eec730a3e01dcbf825900db3c0
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0
diff --git a/branches/dist-snap/src/libstd/iterator.rs b/branches/dist-snap/src/libstd/iterator.rs
@@ -1592,6 +1592,21 @@ impl<A: Add<A, A> + Ord + Clone> Iterator<A> for RangeInclusive<A> {
             }
         }
     }
+
+    #[inline]
+    fn size_hint(&self) -> (uint, Option<uint>) {
+        let (lo, hi) = self.range.size_hint();
+        if self.done {
+            (lo, hi)
+        } else {
+            let lo = lo.saturating_add(1);
+            let hi = match hi {
+                Some(x) => x.checked_add(&1),
+                None => None
+            };
+            (lo, hi)
+        }
+    }
 }
 
 impl<A: Sub<A, A> + Integer + Ord + Clone> DoubleEndedIterator<A> for RangeInclusive<A> {

Original file line number	Diff line number	Diff line change
`@@ -1592,6 +1592,21 @@ impl<A: Add<A, A> + Ord + Clone> Iterator<A> for RangeInclusive<A> {`
`1592`	`1592`	`}`
`1593`	`1593`	`}`
`1594`	`1594`	`}`
	`1595`	`+`
	`1596`	`+ #[inline]`
	`1597`	`+ fn size_hint(&self) -> (uint, Option<uint>) {`
	`1598`	`+ let (lo, hi) = self.range.size_hint();`
	`1599`	`+ if self.done {`
	`1600`	`+ (lo, hi)`
	`1601`	`+ } else {`
	`1602`	`+ let lo = lo.saturating_add(1);`
	`1603`	`+ let hi = match hi {`
	`1604`	`+ Some(x) => x.checked_add(&1),`
	`1605`	`+ None => None`
	`1606`	`+ };`
	`1607`	`+ (lo, hi)`
	`1608`	`+ }`
	`1609`	`+ }`
`1595`	`1610`	`}`
`1596`	`1611`
`1597`	`1612`	`impl<A: Sub<A, A> + Integer + Ord + Clone> DoubleEndedIterator<A> for RangeInclusive<A> {`