mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Forward ArrayChunks::next{,_back} to try_{for_each,rfold}

Browse Source 
(suggested in the review of the previous attempt to add `ArrayChunks`)
This commit is contained in:
Maybe Waffle 2022-08-01 18:26:18 +04:00
parent ef72349e38
commit b8b14864c0
1 changed files with 2 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
library/core/src/iter/adapters/array_chunks.rs
View File

@ -48,33 +48,7 @@ impl<I, const N: usize> Iterator for ArrayChunks<I, N>
#[inline]
fn next(&mut self) -> Option<Self::Item> {
let mut array = MaybeUninit::uninit_array();
// SAFETY: `array` will still be valid if `guard` is dropped.
let mut guard = unsafe { FrontGuard::new(&mut array) };
for slot in array.iter_mut() {
match self.iter.next() {
Some(item) => {
slot.write(item);
guard.init += 1;
}
None => {
if guard.init > 0 {
let init = guard.init;
mem::forget(guard);
self.remainder = {
// SAFETY: `array` was initialized with `init` elements.
Some(unsafe { array::IntoIter::new_unchecked(array, 0..init) })
};
}
return None;
}
}
}
mem::forget(guard);
// SAFETY: All elements of the array were populated in the loop above.
Some(unsafe { MaybeUninit::array_assume_init(array) })
self.try_for_each(ControlFlow::Break).break_value()
}
#[inline]
@ -194,21 +168,7 @@ impl<I, const N: usize> DoubleEndedIterator for ArrayChunks<I, N>
{
#[inline]
fn next_back(&mut self) -> Option<Self::Item> {
// We are iterating from the back we need to first handle the remainder.
self.next_back_remainder()?;
let mut array = MaybeUninit::uninit_array();
// SAFETY: `array` will still be valid if `guard` is dropped.
let mut guard = unsafe { BackGuard::new(&mut array) };
for slot in array.iter_mut().rev() {
slot.write(self.iter.next_back()?);
guard.uninit -= 1;
}
mem::forget(guard);
// SAFETY: All elements of the array were populated in the loop above.
Some(unsafe { MaybeUninit::array_assume_init(array) })
self.try_rfold((), |(), x| ControlFlow::Break(x)).break_value()
}
fn try_rfold<B, F, R>(&mut self, init: B, mut f: F) -> R