Fix some map related build failures.

src/libstd/map.rs

@@ -733,10 +733,7 @@ mod tests {
         i = 0u;
         while i < num_to_insert {
             let v = hm.remove(i);
-            match v {
+            assert v;
-              option::some(u) => assert (u == i * i),
-              option::none => fail
-            }
             i += 2u;
         }
         assert (hm.size() == num_to_insert / 2u);

src/test/run-pass/class-impl-very-parameterized-trait.rs

@@ -59,12 +59,12 @@ struct cat<T: copy> : map<int, T> {
      else { none }
   }
 
-  fn remove(+k:int) -> option<T> {
+  fn remove(+k:int) -> bool {
     match self.find(k) {
       some(x) => {
-        self.meows -= k; some(x)
+        self.meows -= k; true
       }
-      none => { none }
+      none => { false }
     }
   }