diff options
| author | bors <bors@rust-lang.org> | 2019-04-06 21:34:12 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-04-06 21:34:12 +0000 |
| commit | 091380021a8f05bb3b533209e588a9f7c0e9486b (patch) | |
| tree | 9e8cf1fceb25e7ec236ae728b20ead419139a0ad /src/liballoc | |
| parent | 8159f389f6cc8ec3e3ea009222d6926da77371ec (diff) | |
| parent | 4601ff017fcccd8eb2874d09b58c86ba675f1188 (diff) | |
| download | rust-091380021a8f05bb3b533209e588a9f7c0e9486b.tar.gz rust-091380021a8f05bb3b533209e588a9f7c0e9486b.zip | |
Auto merge of #59760 - Centril:rollup-4b9x7ue, r=Centril
Rollup of 5 pull requests Successful merges: - #59738 (Move match_path from DefId to lint::LateContext) - #59740 (Use for_each to extend collections) - #59751 (Tiny docs fix) - #59754 (Update books) - #59755 (Update miri) Failed merges: r? @ghost
Diffstat (limited to 'src/liballoc')
| -rw-r--r-- | src/liballoc/collections/binary_heap.rs | 4 | ||||
| -rw-r--r-- | src/liballoc/collections/btree/map.rs | 4 | ||||
| -rw-r--r-- | src/liballoc/collections/btree/set.rs | 4 | ||||
| -rw-r--r-- | src/liballoc/collections/linked_list.rs | 4 | ||||
| -rw-r--r-- | src/liballoc/collections/vec_deque.rs | 4 |
5 files changed, 7 insertions, 13 deletions
diff --git a/src/liballoc/collections/binary_heap.rs b/src/liballoc/collections/binary_heap.rs index a171f128c24..8c142a3d317 100644 --- a/src/liballoc/collections/binary_heap.rs +++ b/src/liballoc/collections/binary_heap.rs @@ -1177,9 +1177,7 @@ impl<T: Ord> BinaryHeap<T> { self.reserve(lower); - for elem in iterator { - self.push(elem); - } + iterator.for_each(move |elem| self.push(elem)); } } diff --git a/src/liballoc/collections/btree/map.rs b/src/liballoc/collections/btree/map.rs index ce29978856f..6b079fc87cc 100644 --- a/src/liballoc/collections/btree/map.rs +++ b/src/liballoc/collections/btree/map.rs @@ -1727,9 +1727,9 @@ impl<K: Ord, V> FromIterator<(K, V)> for BTreeMap<K, V> { impl<K: Ord, V> Extend<(K, V)> for BTreeMap<K, V> { #[inline] fn extend<T: IntoIterator<Item = (K, V)>>(&mut self, iter: T) { - for (k, v) in iter { + iter.into_iter().for_each(move |(k, v)| { self.insert(k, v); - } + }); } } diff --git a/src/liballoc/collections/btree/set.rs b/src/liballoc/collections/btree/set.rs index e71767077ca..16a96ca19b8 100644 --- a/src/liballoc/collections/btree/set.rs +++ b/src/liballoc/collections/btree/set.rs @@ -883,9 +883,9 @@ impl<'a, T> IntoIterator for &'a BTreeSet<T> { impl<T: Ord> Extend<T> for BTreeSet<T> { #[inline] fn extend<Iter: IntoIterator<Item = T>>(&mut self, iter: Iter) { - for elem in iter { + iter.into_iter().for_each(move |elem| { self.insert(elem); - } + }); } } diff --git a/src/liballoc/collections/linked_list.rs b/src/liballoc/collections/linked_list.rs index c2ee2e63156..d6d84a4f083 100644 --- a/src/liballoc/collections/linked_list.rs +++ b/src/liballoc/collections/linked_list.rs @@ -1107,9 +1107,7 @@ impl<T> Extend<T> for LinkedList<T> { impl<I: IntoIterator> SpecExtend<I> for LinkedList<I::Item> { default fn spec_extend(&mut self, iter: I) { - for elt in iter { - self.push_back(elt); - } + iter.into_iter().for_each(move |elt| self.push_back(elt)); } } diff --git a/src/liballoc/collections/vec_deque.rs b/src/liballoc/collections/vec_deque.rs index 4e90f783ec6..4bea615ab86 100644 --- a/src/liballoc/collections/vec_deque.rs +++ b/src/liballoc/collections/vec_deque.rs @@ -2677,9 +2677,7 @@ impl<'a, T> IntoIterator for &'a mut VecDeque<T> { #[stable(feature = "rust1", since = "1.0.0")] impl<A> Extend<A> for VecDeque<A> { fn extend<T: IntoIterator<Item = A>>(&mut self, iter: T) { - for elt in iter { - self.push_back(elt); - } + iter.into_iter().for_each(move |elt| self.push_back(elt)); } } |
