mirror of
https://github.com/rust-lang/rust.git
synced 2024-11-23 15:23:46 +00:00
Auto merge of #89774 - the8472:inline-mut-iter-next, r=m-ou-se
inline next() on &mut Iterator impl In [#87431](https://github.com/rust-lang/rust/pull/87431/files#diff-79a6b417b85ecf4f1a4ef2235135fedf540199caf6e9e1d154ac6a413b40a757R132-R136) I found that `(&mut range).fold` doesn't optimize well because the default impl for for `fold` on `&mut Iterator` doesn't inline `next`. In that particular case it was worked around by using `try_fold` which takes a `&mut self` instead of `self`. Let's see if this can be fixed more broadly.
This commit is contained in:
commit
ef4b3069ba
@ -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 {
|
||||
|
@ -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()
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user