diff options
| -rw-r--r-- | src/libcollections/enum_set.rs | 16 | ||||
| -rw-r--r-- | src/libstd/collections/lru_cache.rs | 11 |
2 files changed, 26 insertions, 1 deletions
diff --git a/src/libcollections/enum_set.rs b/src/libcollections/enum_set.rs index 1acdaef9c91..7d2d298ee87 100644 --- a/src/libcollections/enum_set.rs +++ b/src/libcollections/enum_set.rs @@ -230,6 +230,22 @@ impl<E:CLike> Iterator<E> for Items<E> { } } +impl<E:CLike> FromIterator<E> for EnumSet<E> { + fn from_iter<I:Iterator<E>>(iterator: I) -> EnumSet<E> { + let mut ret = EnumSet::new(); + ret.extend(iterator); + ret + } +} + +impl<E:CLike> Extend<E> for EnumSet<E> { + fn extend<I: Iterator<E>>(&mut self, mut iterator: I) { + for element in iterator { + self.insert(element); + } + } +} + #[cfg(test)] mod test { use std::prelude::*; diff --git a/src/libstd/collections/lru_cache.rs b/src/libstd/collections/lru_cache.rs index aab0924e7e4..94bea37d187 100644 --- a/src/libstd/collections/lru_cache.rs +++ b/src/libstd/collections/lru_cache.rs @@ -41,7 +41,7 @@ use cmp::{PartialEq, Eq}; use collections::HashMap; use fmt; use hash::Hash; -use iter::{range, Iterator}; +use iter::{range, Iterator, Extend}; use mem; use ops::Drop; use option::{Some, None, Option}; @@ -329,6 +329,15 @@ impl<K: Hash + Eq, V> LruCache<K, V> { /// Clear the cache of all key-value pairs. #[unstable = "matches collection reform specification, waiting for dust to settle"] pub fn clear(&mut self) { self.map.clear(); } + +} + +impl<K: Hash + Eq, V> Extend<(K, V)> for LruCache<K, V> { + fn extend<T: Iterator<(K, V)>>(&mut self, mut iter: T) { + for (k, v) in iter{ + self.insert(k, v); + } + } } impl<A: fmt::Show + Hash + Eq, B: fmt::Show> fmt::Show for LruCache<A, B> { |
