Skip to content

Commit 875ce5f

Browse files
committed
sorted_map: change From<Iterator<I>> to FromIterator<I>
1 parent 286dc37 commit 875ce5f

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

src/librustc_data_structures/sorted_map.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
use std::borrow::Borrow;
1212
use std::cmp::Ordering;
13-
use std::convert::From;
13+
use std::iter::FromIterator;
1414
use std::mem;
1515
use std::ops::{RangeBounds, Bound, Index, IndexMut};
1616

@@ -272,9 +272,9 @@ impl<K: Ord, V, Q: Borrow<K>> IndexMut<Q> for SortedMap<K, V> {
272272
}
273273
}
274274

275-
impl<K: Ord, V, I: Iterator<Item=(K, V)>> From<I> for SortedMap<K, V> {
276-
fn from(data: I) -> Self {
277-
let mut data: Vec<(K, V)> = data.collect();
275+
impl<K: Ord, V> FromIterator<(K, V)> for SortedMap<K, V> {
276+
fn from_iter<T: IntoIterator<Item = (K, V)>>(iter: T) -> Self {
277+
let mut data: Vec<(K, V)> = iter.into_iter().collect();
278278
data.sort_unstable_by(|&(ref k1, _), &(ref k2, _)| k1.cmp(k2));
279279
data.dedup_by(|&mut (ref k1, _), &mut (ref k2, _)| {
280280
k1.cmp(k2) == Ordering::Equal

0 commit comments

Comments
 (0)