Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 7 additions & 10 deletions src/libcore/iter.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2646,13 +2646,7 @@ impl<A: Int> Iterator for RangeStepInclusive<A> {
macro_rules! range_exact_iter_impl {
($($t:ty)*) => ($(
#[stable(feature = "rust1", since = "1.0.0")]
impl ExactSizeIterator for ::ops::Range<$t> {
#[inline]
fn len(&self) -> usize {
debug_assert!(self.end >= self.start);
(self.end - self.start) as usize
}
}
impl ExactSizeIterator for ::ops::Range<$t> { }
)*)
}

Expand All @@ -2673,9 +2667,12 @@ impl<A: Int> Iterator for ::ops::Range<A> {

#[inline]
fn size_hint(&self) -> (usize, Option<usize>) {
debug_assert!(self.end >= self.start);
let hint = (self.end - self.start).to_uint();
(hint.unwrap_or(0), hint)
if self.start >= self.end {
(0, Some(0))
} else {
let length = (self.end - self.start).to_uint();
(length.unwrap_or(0), length)
}
}
}

Expand Down
1 change: 1 addition & 0 deletions src/libcoretest/iter.rs
Original file line number Diff line number Diff line change
Expand Up @@ -756,6 +756,7 @@ fn test_range() {
// this test is only meaningful when sizeof uint < sizeof u64
assert_eq!((uint::MAX - 1..uint::MAX).size_hint(), (1, Some(1)));
assert_eq!((-10..-1).size_hint(), (9, Some(9)));
assert_eq!((-1..-10).size_hint(), (0, Some(0)));
}

#[test]
Expand Down