diff options
| author | Graydon Hoare <graydon@mozilla.com> | 2013-02-05 14:30:53 -0800 |
|---|---|---|
| committer | Graydon Hoare <graydon@mozilla.com> | 2013-02-05 14:30:53 -0800 |
| commit | a4250a96fdf61142a9c8dbb6d37ae8435c99e396 (patch) | |
| tree | 0d31d5d32334825c1b174c1febf2160689626801 /src/test/bench | |
| parent | 0110dfb27cc72b7cb269630061e87e858eda0610 (diff) | |
| download | rust-a4250a96fdf61142a9c8dbb6d37ae8435c99e396.tar.gz rust-a4250a96fdf61142a9c8dbb6d37ae8435c99e396.zip | |
Revert "oldmap: use &K instead of K in find and get"
This reverts commit 8e643525d4e5bca993dada43615916c382a0645b.
Diffstat (limited to 'src/test/bench')
| -rw-r--r-- | src/test/bench/core-map.rs | 4 | ||||
| -rw-r--r-- | src/test/bench/core-std.rs | 2 | ||||
| -rw-r--r-- | src/test/bench/shootout-k-nucleotide-pipes.rs | 2 | ||||
| -rw-r--r-- | src/test/bench/shootout-mandelbrot.rs | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/src/test/bench/core-map.rs b/src/test/bench/core-map.rs index 68ba40749f2..67c071da26d 100644 --- a/src/test/bench/core-map.rs +++ b/src/test/bench/core-map.rs @@ -42,7 +42,7 @@ fn old_int_benchmarks(rng: @rand::Rng, num_keys: uint, results: &mut Results) { } for uint::range(0, num_keys) |i| { - assert map.get(&i) == i+1; + assert map.get(i) == i+1; } } } @@ -81,7 +81,7 @@ fn old_str_benchmarks(rng: @rand::Rng, num_keys: uint, results: &mut Results) { for uint::range(0, num_keys) |i| { let s = uint::to_str(i); - assert map.get(&s) == i; + assert map.get(s) == i; } } } diff --git a/src/test/bench/core-std.rs b/src/test/bench/core-std.rs index fafda39993e..32b6c491898 100644 --- a/src/test/bench/core-std.rs +++ b/src/test/bench/core-std.rs @@ -83,7 +83,7 @@ fn str_set() { let mut found = 0; for int::range(0, 1000) |_i| { - match s.find(&r.gen_str(10)) { + match s.find(r.gen_str(10)) { Some(_) => { found += 1; } None => { } } diff --git a/src/test/bench/shootout-k-nucleotide-pipes.rs b/src/test/bench/shootout-k-nucleotide-pipes.rs index 811f39e4343..0f4f22196ce 100644 --- a/src/test/bench/shootout-k-nucleotide-pipes.rs +++ b/src/test/bench/shootout-k-nucleotide-pipes.rs @@ -69,7 +69,7 @@ fn sort_and_fmt(mm: HashMap<~[u8], uint>, total: uint) -> ~str { // given a map, search for the frequency of a pattern fn find(mm: HashMap<~[u8], uint>, key: ~str) -> uint { - match mm.find(&str::to_bytes(str::to_lower(key))) { + match mm.find(str::to_bytes(str::to_lower(key))) { option::None => { return 0u; } option::Some(num) => { return num; } } diff --git a/src/test/bench/shootout-mandelbrot.rs b/src/test/bench/shootout-mandelbrot.rs index 5888dab3bb9..8cf57b19825 100644 --- a/src/test/bench/shootout-mandelbrot.rs +++ b/src/test/bench/shootout-mandelbrot.rs @@ -136,7 +136,7 @@ fn writer(path: ~str, pport: pipes::Port<Line>, size: uint) while prev <= i { if lines.contains_key_ref(&prev) { debug!("WS %u", prev); - cout.write(lines.get(&prev)); + cout.write(lines.get(prev)); done += 1_u; lines.remove(&prev); prev += 1_u; |
