提交 430b3e19 编写于 作者: A Alex Burka

remove under/overflow from next_back/next

上级 a928c836
......@@ -4605,8 +4605,10 @@ fn next(&mut self) -> Option<A> {
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 @@ fn next(&mut self) -> Option<A> {
// ^ 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 @@ fn next_back(&mut self) -> Option<A> {
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)
}
}
};
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册