Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 6 additions & 13 deletions library/core/src/array/iter.rs
Original file line number Diff line number Diff line change
Expand Up @@ -135,19 +135,12 @@ impl<T, const N: usize> Iterator for IntoIter<T, N> {
Fold: FnMut(Acc, Self::Item) -> Acc,
{
let data = &mut self.data;
// FIXME: This uses try_fold(&mut iter) instead of fold(iter) because the latter
// would go through the blanket `impl Iterator for &mut I` implementation
// which lacks inline annotations on its methods and adding those would be a larger
// perturbation than using try_fold here.
// Whether it would be beneficial to add those annotations should be investigated separately.
(&mut self.alive)
.try_fold::<_, _, Result<_, !>>(init, |acc, idx| {
// SAFETY: idx is obtained by folding over the `alive` range, which implies the
// value is currently considered alive but as the range is being consumed each value
// we read here will only be read once and then considered dead.
Ok(fold(acc, unsafe { data.get_unchecked(idx).assume_init_read() }))
})
.unwrap()
self.alive.by_ref().fold(init, |acc, idx| {
// SAFETY: idx is obtained by folding over the `alive` range, which implies the
// value is currently considered alive but as the range is being consumed each value
// we read here will only be read once and then considered dead.
fold(acc, unsafe { data.get_unchecked(idx).assume_init_read() })
})
}

fn count(self) -> usize {
Expand Down
1 change: 1 addition & 0 deletions library/core/src/iter/traits/iterator.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3460,6 +3460,7 @@ pub trait Iterator {
#[stable(feature = "rust1", since = "1.0.0")]
impl<I: Iterator + ?Sized> Iterator for &mut I {
type Item = I::Item;
#[inline]
fn next(&mut self) -> Option<I::Item> {
(**self).next()
}
Expand Down