From e2aa82c41395e04f69d615bf427128bc5b77cd38 Mon Sep 17 00:00:00 2001 From: Ulrik Sverdrup Date: Tue, 29 Sep 2015 17:12:42 +0200 Subject: [PATCH] Remove redundant uses of Iterator::by_ref() --- src/libcollections/btree/node.rs | 2 +- src/libcollections/vec.rs | 2 +- src/libcore/iter.rs | 10 +++++----- src/libstd/collections/hash/table.rs | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/libcollections/btree/node.rs b/src/libcollections/btree/node.rs index d8f8ca6eae59c..4e644e74cd019 100644 --- a/src/libcollections/btree/node.rs +++ b/src/libcollections/btree/node.rs @@ -271,7 +271,7 @@ impl DoubleEndedIterator for RawItems { impl Drop for RawItems { fn drop(&mut self) { - for _ in self.by_ref() {} + for _ in self {} } } diff --git a/src/libcollections/vec.rs b/src/libcollections/vec.rs index c99460a55c952..5f4fdae7c35bc 100644 --- a/src/libcollections/vec.rs +++ b/src/libcollections/vec.rs @@ -1489,7 +1489,7 @@ impl ExactSizeIterator for IntoIter {} impl Drop for IntoIter { fn drop(&mut self) { // destroy the remaining elements - for _x in self.by_ref() {} + for _x in self {} // RawVec handles deallocation } diff --git a/src/libcore/iter.rs b/src/libcore/iter.rs index 97dcb2475a3cf..d0590fdb72af1 100644 --- a/src/libcore/iter.rs +++ b/src/libcore/iter.rs @@ -165,7 +165,7 @@ pub trait Iterator { #[inline] #[stable(feature = "rust1", since = "1.0.0")] fn nth(&mut self, mut n: usize) -> Option where Self: Sized { - for x in self.by_ref() { + for x in self { if n == 0 { return Some(x) } n -= 1; } @@ -637,7 +637,7 @@ pub trait Iterator { fn all(&mut self, mut f: F) -> bool where Self: Sized, F: FnMut(Self::Item) -> bool { - for x in self.by_ref() { + for x in self { if !f(x) { return false; } @@ -664,7 +664,7 @@ pub trait Iterator { Self: Sized, F: FnMut(Self::Item) -> bool { - for x in self.by_ref() { + for x in self { if f(x) { return true; } @@ -689,7 +689,7 @@ pub trait Iterator { Self: Sized, P: FnMut(&Self::Item) -> bool, { - for x in self.by_ref() { + for x in self { if predicate(&x) { return Some(x) } } None @@ -725,7 +725,7 @@ pub trait Iterator { P: FnMut(Self::Item) -> bool, { // `enumerate` might overflow. - for (i, x) in self.by_ref().enumerate() { + for (i, x) in self.enumerate() { if predicate(x) { return Some(i); } diff --git a/src/libstd/collections/hash/table.rs b/src/libstd/collections/hash/table.rs index f8bd791f6819c..32541353a0af7 100644 --- a/src/libstd/collections/hash/table.rs +++ b/src/libstd/collections/hash/table.rs @@ -958,7 +958,7 @@ impl<'a, K, V> ExactSizeIterator for Drain<'a, K, V> { impl<'a, K: 'a, V: 'a> Drop for Drain<'a, K, V> { fn drop(&mut self) { - for _ in self.by_ref() {} + for _ in self {} } }