---

yaml
---
r: 31470
b: refs/heads/dist-snap
c: dd106ba
h: refs/heads/master
v: v3

Author: nikomatsakis

[refs]

@@ -7,6 +7,6 @@ refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df
 refs/heads/incoming: d9317a174e434d4c99fc1a37fd7dc0d2f5328d37
-refs/heads/dist-snap: 638491712e265c8d5bc9bd9852ece17b5ec78f5b
+refs/heads/dist-snap: dd106ba7631e07445f374339dcb8a3bbf0fa8e18
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/dist-snap/src/libstd/send_map.rs

@@ -15,7 +15,7 @@ type eqfn<K> = pure fn~(K, K) -> bool;
 
 /// Open addressing with linear probing.
 mod linear {
-    export linear_map, linear_map_with_capacity;
+    export linear_map, linear_map_with_capacity, public_methods;
 
     const initial_capacity: uint = 32u; // 2^5
     type bucket<K,V> = {hash: uint, key: K, value: V};
@@ -64,7 +64,7 @@ mod linear {
         p as &K
     }
 
-    impl private_const_methods<K,V> for &const linear_map<K,V> {
+    impl private_methods<K,V> for &const linear_map<K,V> {
         #[inline(always)]
         pure fn to_bucket(h: uint) -> uint {
             // FIXME(#3041) borrow a more sophisticated technique here from
@@ -130,7 +130,7 @@ mod linear {
         }
     }
 
-    impl private_mut_methods<K,V> for &mut linear_map<K,V> {
+    impl private_methods<K,V> for &mut linear_map<K,V> {
         /// Expands the capacity of the array and re-inserts each
         /// of the existing buckets.
         fn expand() {
@@ -179,7 +179,7 @@ mod linear {
         }
     }
 
-    impl mut_methods<K,V> for &mut linear_map<K,V> {
+    impl public_methods<K,V> for &mut linear_map<K,V> {
         fn insert(+k: K, +v: V) -> bool {
             if self.size >= self.resize_at {
                 // n.b.: We could also do this after searching, so
@@ -233,13 +233,13 @@ mod linear {
         }
     }
 
-    impl private_imm_methods<K,V> for &linear_map<K,V> {
+    impl private_methods<K,V> for &linear_map<K,V> {
         fn search(hash: uint, op: fn(x: &option<bucket<K,V>>) -> bool) {
             let _ = self.bucket_sequence(hash, |i| op(&self.buckets[i]));
         }
     }
 
-    impl const_methods<K,V> for &const linear_map<K,V> {
+    impl public_methods<K,V> for &const linear_map<K,V> {
         fn size() -> uint {
             self.size
         }
@@ -252,7 +252,7 @@ mod linear {
         }
     }
 
-    impl const_methods<K,V: copy> for &const linear_map<K,V> {
+    impl public_methods<K,V: copy> for &const linear_map<K,V> {
         fn find(k: &K) -> option<V> {
             alt self.bucket_for_key(self.buckets, k) {
               found_entry(idx) => {

branches/dist-snap/src/libstd/std.rc

@@ -23,7 +23,8 @@ import core::*;
 export net, net_tcp, net_ip, net_url;
 export uv, uv_ll, uv_iotask, uv_global_loop;
 export c_vec, util, timer;
-export bitv, deque, fun_treemap, list, map, smallintmap, sort, treemap;
+export bitv, deque, fun_treemap, list, map, send_map;
+export smallintmap, sort, treemap;
 export rope, arena, par;
 export ebml, dbg, getopts, json, rand, sha1, term, time, prettyprint;
 export test, tempfile, serialization;