squiid/rust
1
0
Fork 0
Code Issues Pull requests Projects Activity

use fold instead of try_fold now that .by_ref().next() has been inlined

Browse source
This commit is contained in:
The8472 2021-10-11 23:36:04 +02:00
parent a398b6b9d4
commit f1c588f1ef
1 changed files with 6 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
library/core/src/array/iter.rs
View file

@ -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| {
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.
Ok(fold(acc, unsafe { data.get_unchecked(idx).assume_init_read() }))
fold(acc, unsafe { data.get_unchecked(idx).assume_init_read() })
})
.unwrap()
}
fn count(self) -> usize {