OpenE2K/rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

remove under/overflow from next_back/next

Browse Source
This commit is contained in:
Alex Burka 2016-03-04 18:57:43 -05:00
parent a928c8360c
commit 430b3e1960
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/libcore/iter.rs
View File

@ -4605,8 +4605,10 @@ impl<A: Step + One> Iterator for ops::RangeInclusive<A> where
Empty { .. } => (None, None), // empty iterators yield no values
NonEmpty { ref mut start, ref mut end } => {
let one = A::one();
if start <= end {
if start == end {
(Some(mem::replace(end, A::one())), Some(mem::replace(start, A::one())))
} else if start < end {
let one = A::one();
let mut n = &*start + &one;
mem::swap(&mut n, start);
@ -4620,7 +4622,7 @@ impl<A: Step + One> Iterator for ops::RangeInclusive<A> where
// ^ are we done yet?
Some(n)) // < the value to output
} else {
(Some(mem::replace(start, one)), None)
(Some(mem::replace(start, A::one())), None)
}
}
};
@ -4664,15 +4666,17 @@ impl<A: Step + One> DoubleEndedIterator for ops::RangeInclusive<A> where
Empty { .. } => return None,
NonEmpty { ref mut start, ref mut end } => {
let one = A::one();
if start <= end {
if start == end {
(Some(mem::replace(start, A::one())), Some(mem::replace(end, A::one())))
} else if start < end {
let one = A::one();
let mut n = &*end - &one;
mem::swap(&mut n, end);
(if n == *start { Some(mem::replace(start, one)) } else { None },
Some(n))
} else {
(Some(mem::replace(end, one)), None)
(Some(mem::replace(end, A::one())), None)
}
}
};