Skip to content

Commit 5a32b4a

Browse files
committed
rollup merge of #22491: Gankro/into_iter
Conflicts: src/libcollections/bit.rs src/libcollections/linked_list.rs src/libcollections/vec_deque.rs src/libstd/sys/common/wtf8.rs
2 parents 9aee389 + 66613e2 commit 5a32b4a

File tree

28 files changed

+990
-938
lines changed

28 files changed

+990
-938
lines changed

src/libcollections/binary_heap.rs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -650,8 +650,8 @@ impl<'a, T: 'a> ExactSizeIterator for Drain<'a, T> {}
650650

651651
#[stable(feature = "rust1", since = "1.0.0")]
652652
impl<T: Ord> FromIterator<T> for BinaryHeap<T> {
653-
fn from_iter<Iter: Iterator<Item=T>>(iter: Iter) -> BinaryHeap<T> {
654-
BinaryHeap::from_vec(iter.collect())
653+
fn from_iter<I: IntoIterator<Item=T>>(iter: I) -> BinaryHeap<T> {
654+
BinaryHeap::from_vec(iter.into_iter().collect())
655655
}
656656
}
657657

@@ -677,7 +677,8 @@ impl<'a, T> IntoIterator for &'a BinaryHeap<T> where T: Ord {
677677

678678
#[stable(feature = "rust1", since = "1.0.0")]
679679
impl<T: Ord> Extend<T> for BinaryHeap<T> {
680-
fn extend<Iter: Iterator<Item=T>>(&mut self, iter: Iter) {
680+
fn extend<I: IntoIterator<Item=T>>(&mut self, iterable: I) {
681+
let iter = iterable.into_iter();
681682
let (lower, _) = iter.size_hint();
682683

683684
self.reserve(lower);

0 commit comments

Comments
 (0)