提交 5c58eec0 编写于 作者: C Clar Charr

Replace manual iter exhaust with for_each(drop).

上级 178becdd
......@@ -1260,8 +1260,7 @@ fn into_iter(self) -> IntoIter<K, V> {
#[stable(feature = "btree_drop", since = "1.7.0")]
impl<K, V> Drop for IntoIter<K, V> {
fn drop(&mut self) {
for _ in &mut *self {
}
self.for_each(drop);
unsafe {
let leaf_node = ptr::read(&self.front).into_node();
if let Some(first_parent) = leaf_node.deallocate_and_ascend() {
......
......@@ -1076,7 +1076,7 @@ impl<'a, T, F> Drop for DrainFilter<'a, T, F>
where F: FnMut(&mut T) -> bool,
{
fn drop(&mut self) {
for _ in self { }
self.for_each(drop);
}
}
......
......@@ -2354,7 +2354,7 @@ fn next_back(&mut self) -> Option<T> {
impl<'a, T> Drop for Drain<'a, T> {
fn drop(&mut self) {
// exhaust self first
while let Some(_) = self.next() {}
self.for_each(drop);
if self.tail_len > 0 {
unsafe {
......@@ -2474,9 +2474,7 @@ impl<'a, I: Iterator> ExactSizeIterator for Splice<'a, I> {}
#[stable(feature = "vec_splice", since = "1.21.0")]
impl<'a, I: Iterator> Drop for Splice<'a, I> {
fn drop(&mut self) {
// exhaust drain first
while let Some(_) = self.drain.next() {}
self.drain.by_ref().for_each(drop);
unsafe {
if self.drain.tail_len == 0 {
......@@ -2605,8 +2603,7 @@ impl<'a, T, F> Drop for DrainFilter<'a, T, F>
where F: FnMut(&mut T) -> bool,
{
fn drop(&mut self) {
for _ in self.by_ref() { }
self.for_each(drop);
unsafe {
self.vec.set_len(self.old_len - self.del);
}
......
......@@ -2177,7 +2177,7 @@ unsafe impl<'a, T: Send> Send for Drain<'a, T> {}
#[stable(feature = "drain", since = "1.6.0")]
impl<'a, T: 'a> Drop for Drain<'a, T> {
fn drop(&mut self) {
for _ in self.by_ref() {}
self.for_each(drop);
let source_deque = unsafe { self.deque.as_mut() };
......
......@@ -207,7 +207,7 @@ pub struct Iter<A: Array> {
impl<A: Array> Drop for Iter<A> {
fn drop(&mut self) {
for _ in self {}
self.for_each(drop);
}
}
......@@ -251,7 +251,7 @@ fn size_hint(&self) -> (usize, Option<usize>) {
impl<'a, A: Array> Drop for Drain<'a, A> {
fn drop(&mut self) {
// exhaust self first
while let Some(_) = self.next() {}
self.for_each(drop);
if self.tail_len > 0 {
unsafe {
......
......@@ -1129,7 +1129,7 @@ fn len(&self) -> usize {
impl<'a, K: 'a, V: 'a> Drop for Drain<'a, K, V> {
fn drop(&mut self) {
for _ in self {}
self.for_each(drop);
}
}
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册