---

yaml
---
r: 64301
b: refs/heads/snap-stage3
c: 0e882f2
h: refs/heads/master
i:
  64299: a55bf46
v: v3

Author: sfackler

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: 2d28d645422c1617be58c8ca7ad9a457264ca850
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: 6b37b5bab74a87c4f05274e6a49d9e28a4c0f4e1
+refs/heads/snap-stage3: 0e882f2bbda58e8271ff25c1467a35fc3ff26dd4
 refs/heads/try: 7b78b52e602bb3ea8174f9b2006bff3315f03ef9
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/src/test/bench/core-map.rs

@@ -27,7 +27,7 @@ fn timed(label: &str, f: &fn()) {
     io::println(fmt!("  %s: %f", label, end - start));
 }
 
-fn ascending<M: Map<uint, uint>>(map: &mut M, n_keys: uint) {
+fn ascending<M: MutableMap<uint, uint>>(map: &mut M, n_keys: uint) {
     io::println(" Ascending integers:");
 
     do timed("insert") {
@@ -49,7 +49,7 @@ fn ascending<M: Map<uint, uint>>(map: &mut M, n_keys: uint) {
     }
 }
 
-fn descending<M: Map<uint, uint>>(map: &mut M, n_keys: uint) {
+fn descending<M: MutableMap<uint, uint>>(map: &mut M, n_keys: uint) {
     io::println(" Descending integers:");
 
     do timed("insert") {
@@ -71,7 +71,7 @@ fn descending<M: Map<uint, uint>>(map: &mut M, n_keys: uint) {
     }
 }
 
-fn vector<M: Map<uint, uint>>(map: &mut M, n_keys: uint, dist: &[uint]) {
+fn vector<M: MutableMap<uint, uint>>(map: &mut M, n_keys: uint, dist: &[uint]) {
 
     do timed("insert") {
         for uint::range(0, n_keys) |i| {

branches/snap-stage3/src/test/bench/core-set.rs

@@ -36,7 +36,7 @@ fn timed(result: &mut float, op: &fn()) {
 }
 
 impl Results {
-    pub fn bench_int<T:Set<uint>,
+    pub fn bench_int<T:MutableSet<uint>,
                  R: rand::Rng>(
                  &mut self,
                  rng: &mut R,
@@ -79,7 +79,7 @@ impl Results {
         }
     }
 
-    pub fn bench_str<T:Set<~str>,
+    pub fn bench_str<T:MutableSet<~str>,
                  R:rand::Rng>(
                  &mut self,
                  rng: &mut R,