Skip to content

Commit

Permalink
Auto merge of #28094 - apasel422:extend-hashmap, r=alexcrichton
Browse files Browse the repository at this point in the history
It appears that these impls were left out of #25989 by mistake.

r? @alexcrichton

I'm not sure what the stability markers for these should be.
  • Loading branch information
bors committed Sep 1, 2015
2 parents 2d3e837 + a73d27f commit 7d78f2d
Show file tree
Hide file tree
Showing 2 changed files with 62 additions and 0 deletions.
24 changes: 24 additions & 0 deletions src/libstd/collections/hash/map.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1583,6 +1583,14 @@ impl<K, V, S> Extend<(K, V)> for HashMap<K, V, S>
}
}

#[stable(feature = "hash_extend_copy", since = "1.4.0")]
impl<'a, K, V, S> Extend<(&'a K, &'a V)> for HashMap<K, V, S>
where K: Eq + Hash + Copy, V: Copy, S: HashState
{
fn extend<T: IntoIterator<Item=(&'a K, &'a V)>>(&mut self, iter: T) {
self.extend(iter.into_iter().map(|(&key, &value)| (key, value)));
}
}

/// `RandomState` is the default state for `HashMap` types.
///
Expand Down Expand Up @@ -2347,4 +2355,20 @@ mod test_map {
check(&m);
}
}

#[test]
fn test_extend_ref() {
let mut a = HashMap::new();
a.insert(1, "one");
let mut b = HashMap::new();
b.insert(2, "two");
b.insert(3, "three");

a.extend(&b);

assert_eq!(a.len(), 3);
assert_eq!(a[&1], "one");
assert_eq!(a[&2], "two");
assert_eq!(a[&3], "three");
}
}
38 changes: 38 additions & 0 deletions src/libstd/collections/hash/set.rs
Original file line number Diff line number Diff line change
Expand Up @@ -654,6 +654,16 @@ impl<T, S> Extend<T> for HashSet<T, S>
}
}

#[stable(feature = "hash_extend_copy", since = "1.4.0")]
impl<'a, T, S> Extend<&'a T> for HashSet<T, S>
where T: 'a + Eq + Hash + Copy,
S: HashState,
{
fn extend<I: IntoIterator<Item=&'a T>>(&mut self, iter: I) {
self.extend(iter.into_iter().cloned());
}
}

#[stable(feature = "rust1", since = "1.0.0")]
impl<T, S> Default for HashSet<T, S>
where T: Eq + Hash,
Expand Down Expand Up @@ -1325,4 +1335,32 @@ mod test_set {
assert_eq!(it.next(), Some(&Foo("a", 2)));
assert_eq!(it.next(), None);
}

#[test]
fn test_extend_ref() {
let mut a = HashSet::new();
a.insert(1);

a.extend(&[2, 3, 4]);

assert_eq!(a.len(), 4);
assert!(a.contains(&1));
assert!(a.contains(&2));
assert!(a.contains(&3));
assert!(a.contains(&4));

let mut b = HashSet::new();
b.insert(5);
b.insert(6);

a.extend(&b);

assert_eq!(a.len(), 6);
assert!(a.contains(&1));
assert!(a.contains(&2));
assert!(a.contains(&3));
assert!(a.contains(&4));
assert!(a.contains(&5));
assert!(a.contains(&6));
}
}

0 comments on commit 7d78f2d

Please sign in to comment.