1
Fork 0

Return a correct size_hint for degenerate inclusive ranges

Fixes https://github.com/rust-lang/rust/issues/42135

Found while fixing run-pass/range_inclusive test failure.
This commit is contained in:
Scott McMurray 2017-05-21 05:03:49 -07:00
parent f166bd9857
commit 7eaca60f3b
3 changed files with 16 additions and 7 deletions

View file

@ -575,6 +575,10 @@ impl<A: Step> Iterator for ops::RangeInclusive<A> where
#[inline] #[inline]
fn size_hint(&self) -> (usize, Option<usize>) { fn size_hint(&self) -> (usize, Option<usize>) {
if !(self.start <= self.end) {
return (0, Some(0));
}
match Step::steps_between_by_one(&self.start, &self.end) { match Step::steps_between_by_one(&self.start, &self.end) {
Some(hint) => (hint.saturating_add(1), hint.checked_add(1)), Some(hint) => (hint.saturating_add(1), hint.checked_add(1)),
None => (0, None), None => (0, None),

View file

@ -62,4 +62,9 @@ fn test_range_inclusive() {
r = RangeInclusive { start: -128i8, end: -128 }; r = RangeInclusive { start: -128i8, end: -128 };
assert_eq!(r.next_back(), Some(-128)); assert_eq!(r.next_back(), Some(-128));
assert_eq!(r.next_back(), None); assert_eq!(r.next_back(), None);
// degenerate
r = RangeInclusive { start: 1, end: -1 };
assert_eq!(r.size_hint(), (0, Some(0)));
assert_eq!(r.next(), None);
} }

View file

@ -82,7 +82,7 @@ pub fn main() {
short.next(); short.next();
assert_eq!(long.size_hint(), (255, Some(255))); assert_eq!(long.size_hint(), (255, Some(255)));
assert_eq!(short.size_hint(), (0, Some(0))); assert_eq!(short.size_hint(), (0, Some(0)));
assert_eq!(short, RangeInclusive::Empty { at: 42 }); assert_eq!(short, 1...0);
assert_eq!(long.len(), 255); assert_eq!(long.len(), 255);
assert_eq!(short.len(), 0); assert_eq!(short.len(), 0);
@ -97,28 +97,28 @@ pub fn main() {
for i in 3...251 { for i in 3...251 {
assert_eq!(long.next(), Some(i)); assert_eq!(long.next(), Some(i));
} }
assert_eq!(long, RangeInclusive::Empty { at: 251 }); assert_eq!(long, 1...0);
// check underflow // check underflow
let mut narrow = 1...0; let mut narrow = 1...0;
assert_eq!(narrow.next_back(), None); assert_eq!(narrow.next_back(), None);
assert_eq!(narrow, RangeInclusive::Empty { at: 0 }); assert_eq!(narrow, 1...0);
let mut zero = 0u8...0; let mut zero = 0u8...0;
assert_eq!(zero.next_back(), Some(0)); assert_eq!(zero.next_back(), Some(0));
assert_eq!(zero.next_back(), None); assert_eq!(zero.next_back(), None);
assert_eq!(zero, RangeInclusive::Empty { at: 0 }); assert_eq!(zero, 1...0);
let mut high = 255u8...255; let mut high = 255u8...255;
assert_eq!(high.next_back(), Some(255)); assert_eq!(high.next_back(), Some(255));
assert_eq!(high.next_back(), None); assert_eq!(high.next_back(), None);
assert_eq!(high, RangeInclusive::Empty { at: 255 }); assert_eq!(high, 1...0);
// what happens if you have a nonsense range? // what happens if you have a nonsense range?
let mut nonsense = 10...5; let mut nonsense = 10...5;
assert_eq!(nonsense.next(), None); assert_eq!(nonsense.next(), None);
assert_eq!(nonsense, RangeInclusive::Empty { at: 10 }); assert_eq!(nonsense, 10...5);
// output // output
assert_eq!(format!("{:?}", 0...10), "0...10"); assert_eq!(format!("{:?}", 0...10), "0...10");
assert_eq!(format!("{:?}", ...10), "...10"); assert_eq!(format!("{:?}", ...10), "...10");
assert_eq!(format!("{:?}", long), "[empty range @ 251]"); assert_eq!(format!("{:?}", long), "1...0");
} }