---

yaml
---
r: 89216
b: refs/heads/snap-stage3
c: b3b49d9
h: refs/heads/master
v: v3

Author: bors

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: deeca5d586bfaa4aa60246f671a8d611d38f6248
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: 86835c95f4c6f4753f139b096f9949a742c0ab51
+refs/heads/snap-stage3: b3b49d9873afaa600ba9dc00566dba73c3eae195
 refs/heads/try: b160761e35efcd1207112b3b782c06633cf441a8
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/doc/rust.md

@@ -3806,25 +3806,6 @@ As a convenience, the logging spec can also be set to a special pseudo-crate,
 `::help`. In this case, when the application starts, the runtime will
 simply output a list of loaded modules containing log expressions, then exit.
 
-The Rust runtime itself generates logging information. The runtime's logs are
-generated for a number of artificial modules in the `::rt` pseudo-crate,
-and can be enabled just like the logs for any standard module. The full list
-of runtime logging modules follows.
-
-* `::rt::mem` Memory management
-* `::rt::comm` Messaging and task communication
-* `::rt::task` Task management
-* `::rt::dom` Task scheduling
-* `::rt::trace` Unused
-* `::rt::cache` Type descriptor cache
-* `::rt::upcall` Compiler-generated runtime calls
-* `::rt::timer` The scheduler timer
-* `::rt::gc` Garbage collection
-* `::rt::stdlib` Functions used directly by the standard library
-* `::rt::kern` The runtime kernel
-* `::rt::backtrace` Log a backtrace on task failure
-* `::rt::callback` Unused
-
 #### Logging Expressions
 
 Rust provides several macros to log information. Here's a simple Rust program

branches/snap-stage3/src/librustc/middle/typeck/coherence.rs

@@ -426,10 +426,9 @@ impl CoherenceChecker {
 
     pub fn check_implementation_coherence(&self) {
         let trait_impls = self.crate_context.tcx.trait_impls.borrow();
-        trait_impls.get().each_key(|&trait_id| {
+        for &trait_id in trait_impls.get().keys() {
             self.check_implementation_coherence_of(trait_id);
-            true
-        });
+        }
     }
 
     pub fn check_implementation_coherence_of(&self, trait_def_id: DefId) {

branches/snap-stage3/src/libstd/hashmap.rs

@@ -57,6 +57,7 @@ use clone::Clone;
 use cmp::{Eq, Equiv};
 use default::Default;
 use hash::Hash;
+use iter;
 use iter::{Iterator, FromIterator, Extendable};
 use iter::{FilterMap, Chain, Repeat, Zip};
 use num;
@@ -525,14 +526,16 @@ impl<K: Hash + Eq, V> HashMap<K, V> {
         }
     }
 
-    /// Visit all keys
-    pub fn each_key(&self, blk: |k: &K| -> bool) -> bool {
-        self.iter().advance(|(k, _)| blk(k))
+    /// An iterator visiting all keys in arbitrary order.
+    /// Iterator element type is &'a K.
+    pub fn keys<'a>(&'a self) -> HashMapKeyIterator<'a, K, V> {
+        self.iter().map(|(k, _v)| k)
     }
 
-    /// Visit all values
-    pub fn each_value<'a>(&'a self, blk: |v: &'a V| -> bool) -> bool {
-        self.iter().advance(|(_, v)| blk(v))
+    /// An iterator visiting all values in arbitrary order.
+    /// Iterator element type is &'a V.
+    pub fn values<'a>(&'a self) -> HashMapValueIterator<'a, K, V> {
+        self.iter().map(|(_k, v)| v)
     }
 
     /// An iterator visiting all key-value pairs in arbitrary order.
@@ -609,6 +612,14 @@ pub struct HashMapMoveIterator<K, V> {
     priv iter: vec::MoveIterator<Option<Bucket<K, V>>>,
 }
 
+/// HashMap keys iterator
+pub type HashMapKeyIterator<'a, K, V> =
+    iter::Map<'static, (&'a K, &'a V), &'a K, HashMapIterator<'a, K, V>>;
+
+/// HashMap values iterator
+pub type HashMapValueIterator<'a, K, V> =
+    iter::Map<'static, (&'a K, &'a V), &'a V, HashMapIterator<'a, K, V>>;
+
 /// HashSet iterator
 #[deriving(Clone)]
 pub struct HashSetIterator<'a, K> {
@@ -1015,6 +1026,28 @@ mod test_map {
         assert_eq!(observed, 0xFFFF_FFFF);
     }
 
+    #[test]
+    fn test_keys() {
+        let vec = ~[(1, 'a'), (2, 'b'), (3, 'c')];
+        let map = vec.move_iter().collect::<HashMap<int, char>>();
+        let keys = map.keys().map(|&k| k).collect::<~[int]>();
+        assert_eq!(keys.len(), 3);
+        assert!(keys.contains(&1));
+        assert!(keys.contains(&2));
+        assert!(keys.contains(&3));
+    }
+
+    #[test]
+    fn test_values() {
+        let vec = ~[(1, 'a'), (2, 'b'), (3, 'c')];
+        let map = vec.move_iter().collect::<HashMap<int, char>>();
+        let values = map.values().map(|&v| v).collect::<~[char]>();
+        assert_eq!(values.len(), 3);
+        assert!(values.contains(&'a'));
+        assert!(values.contains(&'b'));
+        assert!(values.contains(&'c'));
+    }
+
     #[test]
     fn test_find() {
         let mut m = HashMap::new();