Remove redundant hashmap constructor functions.

3 files changed, 11 insertions, 66 deletions

diff --git a/src/libstd/json.rs b/src/libstd/json.rs
index 5b7c92f59fa..b10c40f634a 100644
--- a/src/libstd/json.rs
+++ b/src/libstd/json.rs
@@ -517,7 +517,7 @@ impl Parser {
         self.bump();
         self.parse_whitespace();
 
-        let values = map::str_hash();
+        let values = map::HashMap();
 
         if self.ch == '}' {
           self.bump();
@@ -802,7 +802,7 @@ impl <A: ToJson> ~[A]: ToJson {
 
 impl <A: ToJson Copy> HashMap<~str, A>: ToJson {
     fn to_json() -> Json {
-        let d = map::str_hash();
+        let d = map::HashMap();
         for self.each() |key, value| {
             d.insert(copy key, value.to_json());
         }
@@ -832,7 +832,7 @@ impl Error: to_str::ToStr {
 #[cfg(test)]
 mod tests {
     fn mk_dict(items: &[(~str, Json)]) -> Json {
-        let d = map::str_hash();
+        let d = map::HashMap();
 
         for vec::each(items) |item| {
             let (key, value) = copy *item;
diff --git a/src/libstd/map.rs b/src/libstd/map.rs
index 7d609a42ebd..cdca0aae157 100644
--- a/src/libstd/map.rs
+++ b/src/libstd/map.rs
@@ -12,11 +12,8 @@ use core::cmp::Eq;
 use hash::Hash;
 use to_bytes::IterBytes;
 
-export HashMap, hashfn, eqfn, Set, Map, chained, hashmap, str_hash;
-export box_str_hash;
-export bytes_hash, int_hash, uint_hash, set_add;
-export hash_from_vec, hash_from_strs, hash_from_bytes;
-export hash_from_ints, hash_from_uints;
+export HashMap, hashfn, eqfn, Set, Map, chained, set_add;
+export hash_from_vec;
 export vec_from_set;
 
 /// A convenience type to treat a hashmap as a set
@@ -385,36 +382,6 @@ fn HashMap<K:Eq IterBytes Hash Const, V: Copy>()
     chained::mk()
 }
 
-/// Construct a hashmap for string-slice keys
-fn str_slice_hash<V: Copy>() -> HashMap<&str, V> {
-    return HashMap();
-}
-
-/// Construct a hashmap for string keys
-fn str_hash<V: Copy>() -> HashMap<~str, V> {
-    return HashMap();
-}
-
-/// Construct a hashmap for boxed string keys
-fn box_str_hash<V: Copy>() -> HashMap<@~str, V> {
-    HashMap()
-}
-
-/// Construct a hashmap for byte string keys
-fn bytes_hash<V: Copy>() -> HashMap<~[u8], V> {
-    return HashMap();
-}
-
-/// Construct a hashmap for int keys
-fn int_hash<V: Copy>() -> HashMap<int, V> {
-    return HashMap();
-}
-
-/// Construct a hashmap for uint keys
-fn uint_hash<V: Copy>() -> HashMap<uint, V> {
-    return HashMap();
-}
-
 /// Convenience function for adding keys to a hashmap with nil type keys
 fn set_add<K:Eq IterBytes Hash Const Copy>(set: Set<K>, +key: K) -> bool {
     set.insert(key, ())
@@ -445,26 +412,6 @@ fn hash_from_vec<K: Eq IterBytes Hash Const Copy, V: Copy>(
     map
 }
 
-/// Construct a hashmap from a vector with string keys
-fn hash_from_strs<V: Copy>(items: &[(~str, V)]) -> HashMap<~str, V> {
-    hash_from_vec(items)
-}
-
-/// Construct a hashmap from a vector with byte keys
-fn hash_from_bytes<V: Copy>(items: &[(~[u8], V)]) -> HashMap<~[u8], V> {
-    hash_from_vec(items)
-}
-
-/// Construct a hashmap from a vector with int keys
-fn hash_from_ints<V: Copy>(items: &[(int, V)]) -> HashMap<int, V> {
-    hash_from_vec(items)
-}
-
-/// Construct a hashmap from a vector with uint keys
-fn hash_from_uints<V: Copy>(items: &[(uint, V)]) -> HashMap<uint, V> {
-    hash_from_vec(items)
-}
-
 // XXX Transitional
 impl<K: Eq IterBytes Hash Copy, V: Copy> @Mut<LinearMap<K, V>>:
     Map<K, V> {
@@ -810,7 +757,7 @@ mod tests {
 
     #[test]
     fn test_hash_from_vec() {
-        let map = map::hash_from_strs(~[
+        let map = map::hash_from_vec(~[
             (~"a", 1),
             (~"b", 2),
             (~"c", 3)
diff --git a/src/libstd/net_url.rs b/src/libstd/net_url.rs
index 98907fba682..edd562fa1a7 100644
--- a/src/libstd/net_url.rs
+++ b/src/libstd/net_url.rs
@@ -3,7 +3,7 @@
 #[forbid(deprecated_pattern)];
 
 use core::cmp::Eq;
-use map::{HashMap, str_hash};
+use map::HashMap;
 use io::{Reader, ReaderUtil};
 use dvec::DVec;
 use from_str::FromStr;
@@ -213,7 +213,7 @@ fn encode_form_urlencoded(m: HashMap<~str, @DVec<@~str>>) -> ~str {
 fn decode_form_urlencoded(s: ~[u8]) ->
     map::HashMap<~str, @dvec::DVec<@~str>> {
     do io::with_bytes_reader(s) |rdr| {
-        let m = str_hash();
+        let m = HashMap();
         let mut key = ~"";
         let mut value = ~"";
         let mut parsing_key = true;
@@ -1069,26 +1069,24 @@ mod tests {
 
     #[test]
     fn test_encode_form_urlencoded() {
-        let m = str_hash();
+        let m = HashMap();
         assert encode_form_urlencoded(m) == ~"";
 
         m.insert(~"", @DVec());
         m.insert(~"foo", @DVec());
         assert encode_form_urlencoded(m) == ~"";
 
-        let m = str_hash();
+        let m = HashMap();
         m.insert(~"foo", @dvec::from_vec(~[@~"bar", @~"123"]));
         assert encode_form_urlencoded(m) == ~"foo=bar&foo=123";
 
-        let m = str_hash();
+        let m = HashMap();
         m.insert(~"foo bar", @dvec::from_vec(~[@~"abc", @~"12 = 34"]));
         assert encode_form_urlencoded(m) == ~"foo+bar=abc&foo+bar=12+%3D+34";
     }
 
     #[test]
     fn test_decode_form_urlencoded() {
-        use map::hash_from_strs;
-
         assert decode_form_urlencoded(~[]).size() == 0;
 
         let s = str::to_bytes(~"a=1&foo+bar=abc&foo+bar=12+%3D+34");