bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

alloc: Implement rfold for VecDeque iterators

Browse source
This commit is contained in:
Ulrik Sverdrup 2017-09-18 21:52:13 +02:00
parent a59a25d8e6
commit 84c90f3022
2 changed files with 17 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/liballoc/lib.rs
View file

@ -98,6 +98,7 @@
#![feature(generic_param_attrs)] #![feature(generic_param_attrs)]
#![feature(i128_type)] #![feature(i128_type)]
#![feature(inclusive_range)] #![feature(inclusive_range)]
#![feature(iter_rfold)]
#![feature(lang_items)] #![feature(lang_items)]
#![feature(needs_allocator)] #![feature(needs_allocator)]
#![feature(nonzero)] #![feature(nonzero)]

16
src/liballoc/vec_deque.rs
View file

@ -1973,6 +1973,14 @@ impl<'a, T> DoubleEndedIterator for Iter<'a, T> {
self.head = wrap_index(self.head.wrapping_sub(1), self.ring.len()); self.head = wrap_index(self.head.wrapping_sub(1), self.ring.len());
unsafe { Some(self.ring.get_unchecked(self.head)) } unsafe { Some(self.ring.get_unchecked(self.head)) }
} }
fn rfold<Acc, F>(self, mut accum: Acc, mut f: F) -> Acc
where F: FnMut(Acc, Self::Item) -> Acc
{
let (front, back) = RingSlices::ring_slices(self.ring, self.head, self.tail);
accum = back.iter().rfold(accum, &mut f);
front.iter().rfold(accum, &mut f)
}
} }
#[stable(feature = "rust1", since = "1.0.0")] #[stable(feature = "rust1", since = "1.0.0")]
@ -2058,6 +2066,14 @@ impl<'a, T> DoubleEndedIterator for IterMut<'a, T> {
Some(&mut *(elem as *mut _)) Some(&mut *(elem as *mut _))
} }
} }
fn rfold<Acc, F>(self, mut accum: Acc, mut f: F) -> Acc
where F: FnMut(Acc, Self::Item) -> Acc
{
let (front, back) = RingSlices::ring_slices(self.ring, self.head, self.tail);
accum = back.iter_mut().rfold(accum, &mut f);
front.iter_mut().rfold(accum, &mut f)
}
} }
#[stable(feature = "rust1", since = "1.0.0")] #[stable(feature = "rust1", since = "1.0.0")]