---

yaml
---
r: 67207
b: refs/heads/master
c: de2b5c5
h: refs/heads/master
i:
  67205: df1c7d8
  67203: e9ae8ca
  67199: 30c83ab
v: v3

Author: huonw

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 0a5d1a1b81ccb839b44c9251d9ffad2838179f1f
+refs/heads/master: de2b5c50cd80e8aa65d79c8dd96d9ee93538a012
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 18e3db7392d2d0697b7e27d6d986139960144d85
 refs/heads/try: 7b78b52e602bb3ea8174f9b2006bff3315f03ef9

trunk/src/libstd/hashmap.rs

@@ -255,8 +255,11 @@ impl<K:Hash + Eq,V> HashMap<K, V> {
         let len_buckets = self.buckets.len();
         let bucket = self.buckets[idx].take();
 
-        let value = do bucket.map_consume |bucket| {
-            bucket.value
+        let value = match bucket {
+            None => None,
+            Some(Bucket{value, _}) => {
+                Some(value)
+            },
         };
 
         /* re-inserting buckets may cause changes in size, so remember
@@ -502,6 +505,7 @@ impl<K: Hash + Eq, V> HashMap<K, V> {
         // `consume_rev_iter` is more efficient than `consume_iter` for vectors
         HashMapConsumeIterator {iter: self.buckets.consume_rev_iter()}
     }
+
 }
 
 impl<K: Hash + Eq, V: Clone> HashMap<K, V> {
@@ -520,12 +524,14 @@ impl<K:Hash + Eq,V:Eq> Eq for HashMap<K, V> {
     fn eq(&self, other: &HashMap<K, V>) -> bool {
         if self.len() != other.len() { return false; }
 
-        do self.iter().all |(key, value)| {
+        for self.iter().advance |(key, value)| {
             match other.find(key) {
-                None => false,
-                Some(v) => value == v
+                None => return false,
+                Some(v) => if value != v { return false },
             }
         }
+
+        true
     }
 
     fn ne(&self, other: &HashMap<K, V>) -> bool { !self.eq(other) }

trunk/src/test/run-fail/bug-2470-bounds-check-overflow-2.rs

@@ -11,6 +11,8 @@
 // xfail-test
 // error-pattern:index out of bounds
 
+use std::uint;
+
 fn main() {
     let x = ~[1u,2u,3u];
 

trunk/src/test/run-fail/bug-2470-bounds-check-overflow-3.rs

@@ -11,6 +11,8 @@
 // xfail-test
 // error-pattern:index out of bounds
 
+use std::u64;
+
 #[cfg(target_arch="x86")]
 fn main() {
     let x = ~[1u,2u,3u];

trunk/src/test/run-fail/too-much-recursion-unwinding.rs

@@ -15,7 +15,7 @@
 // during unwinding
 
 fn recurse() {
-    log(debug, "don't optimize me out");
+    info!("don't optimize me out");
     recurse();
 }
 
@@ -35,9 +35,7 @@ impl Drop for r {
 }
 
 fn r(recursed: *mut bool) -> r {
-    unsafe {
-        r { recursed: recursed }
-    }
+    r { recursed: recursed }
 }
 
 fn main() {

trunk/src/test/run-fail/unwind-misc-1.rs

@@ -8,17 +8,16 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// xfail-test - issue #5512, fails but exits with 0
-
+// exec-env:RUST_NEWRT=1
 // error-pattern:fail
 
 fn main() {
     let count = @mut 0u;
     let mut map = std::hashmap::HashMap::new();
     let mut arr = ~[];
-    for uint::range(0u, 10u) |i| {
-        arr += ~[@~"key stuff"];
-        map.insert(arr.clone(), arr + ~[@~"value stuff"]);
+    for std::uint::range(0u, 10u) |i| {
+        arr.push(@~"key stuff");
+        map.insert(arr.clone(), arr + &[@~"value stuff"]);
         if arr.len() == 5 {
             fail!();
         }