---

yaml
---
r: 13722
b: refs/heads/master
c: ccd2394
h: refs/heads/master
v: v3

Author: eholk

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: a08281616f5afcf7b134159a919e76829d2f2a8d
+refs/heads/master: ccd2394ff9ccff11950d0830aaeb74f4fabb7d9c
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
 refs/heads/try: 2898dcc5d97da9427ac367542382b6239d9c0bbf

trunk/src/libstd/map.rs

@@ -326,7 +326,7 @@ Convert a set into a vector.
 fn vec_from_set<T: copy>(s: set<T>) -> [T]/~ {
     let mut v = []/~;
     s.each_key() {|k|
-        v += [k]/~;
+        vec::push(v, k);
         true
     };
     v

trunk/src/test/bench/core-std.rs

@@ -3,17 +3,25 @@
 use std;
 
 import std::time::precise_time_s;
+import std::map;
+import std::map::{map, hashmap};
 
 import io::{reader, reader_util};
 
-fn main() {
+fn main(argv: [str]/~) {
     #macro[
         [#bench[id],
-         run_test(#stringify(id), id)]
+         if tests.len() == 0 || vec::contains(tests, #stringify(id)) {
+             run_test(#stringify(id), id);
+         }
+        ]
     ];
 
+    let tests = vec::view(argv, 1, argv.len());
+
     #bench[shift_push];
     #bench[read_line];
+    #bench[str_set];
 }
 
 fn run_test(name: str, test: fn()) {
@@ -46,3 +54,21 @@ fn read_line() {
         }
     }
 }
+
+fn str_set() {
+    let r = rand::rng();
+
+    let s = map::hashmap(str::hash, str::eq);
+
+    for int::range(0, 1000) {|_i|
+        map::set_add(s, r.gen_str(10));
+    }
+    
+    let mut found = 0;
+    for int::range(0, 1000) {|_i|
+        alt s.find(r.gen_str(10)) {
+          some(_) { found += 1; }
+          none { }
+        }
+    }
+}