mirror of
https://github.com/rust-lang/rust.git
synced 2024-11-22 06:44:35 +00:00
Fix Skip::next
for non-fused inner iterators
This commit is contained in:
parent
144227dae9
commit
50c612faef
@ -33,7 +33,7 @@ where
|
||||
#[inline]
|
||||
fn next(&mut self) -> Option<I::Item> {
|
||||
if unlikely(self.n > 0) {
|
||||
self.iter.nth(crate::mem::take(&mut self.n) - 1);
|
||||
self.iter.nth(crate::mem::take(&mut self.n) - 1)?;
|
||||
}
|
||||
self.iter.next()
|
||||
}
|
||||
|
@ -1,5 +1,7 @@
|
||||
use core::iter::*;
|
||||
|
||||
use super::Unfuse;
|
||||
|
||||
#[test]
|
||||
fn test_iterator_skip() {
|
||||
let xs = [0, 1, 2, 3, 5, 13, 15, 16, 17, 19, 20, 30];
|
||||
@ -190,3 +192,9 @@ fn test_skip_nth_back() {
|
||||
it.by_ref().skip(2).nth_back(10);
|
||||
assert_eq!(it.next_back(), Some(&1));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_skip_non_fused() {
|
||||
let non_fused = Unfuse::new(0..10);
|
||||
let _ = non_fused.skip(20).next();
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user