bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Rollup merge of #123406 - krtab:fix_remainder_iterchunk, r=scottmcm

Browse source 
Force exhaustion in iter::ArrayChunks::into_remainder

Closes: #123333
This commit is contained in:
Jubilee 2024-04-18 21:38:54 -07:00 • committed by GitHub
commit 3831cbb28f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 14 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

15
library/core/src/iter/adapters/array_chunks.rs
View file

@ -34,9 +34,22 @@ where
/// Returns an iterator over the remaining elements of the original iterator /// Returns an iterator over the remaining elements of the original iterator
/// that are not going to be returned by this iterator. The returned /// that are not going to be returned by this iterator. The returned
/// iterator will yield at most `N-1` elements. /// iterator will yield at most `N-1` elements.
///
/// # Example
/// ```
/// # // Also serves as a regression test for https://github.com/rust-lang/rust/issues/123333
/// # #![feature(iter_array_chunks)]
/// let x = [1,2,3,4,5].into_iter().array_chunks::<2>();
/// let mut rem = x.into_remainder().unwrap();
/// assert_eq!(rem.next(), Some(5));
/// assert_eq!(rem.next(), None);
/// ```
#[unstable(feature = "iter_array_chunks", reason = "recently added", issue = "100450")] #[unstable(feature = "iter_array_chunks", reason = "recently added", issue = "100450")]
#[inline] #[inline]
pub fn into_remainder(self) -> Option<array::IntoIter<I::Item, N>> { pub fn into_remainder(mut self) -> Option<array::IntoIter<I::Item, N>> {
if self.remainder.is_none() {
while let Some(_) = self.next() {}
}
self.remainder self.remainder
} }
} }