about summary refs log tree commit diff
path: root/src/libstd/hashmap.rs
diff options
context:
space:
mode:
authorMichael Darakananda <pongad@gmail.com>2014-02-06 02:34:33 -0500
committerMichael Darakananda <pongad@gmail.com>2014-02-13 20:12:59 -0500
commitbf1464c413bb2564c7be0eaceef9515bc0f94f1f (patch)
treeb956233c5e7c587d1faecbadb307117cda24952a /src/libstd/hashmap.rs
parent94d453e459107ed1c5d76f693686b29d31cdc58c (diff)
downloadrust-bf1464c413bb2564c7be0eaceef9515bc0f94f1f.tar.gz
rust-bf1464c413bb2564c7be0eaceef9515bc0f94f1f.zip
Removed num::Orderable
Diffstat (limited to 'src/libstd/hashmap.rs')
-rw-r--r--src/libstd/hashmap.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libstd/hashmap.rs b/src/libstd/hashmap.rs
index c49294a095f..f8e02c82fcd 100644
--- a/src/libstd/hashmap.rs
+++ b/src/libstd/hashmap.rs
@@ -54,7 +54,7 @@
 
 use container::{Container, Mutable, Map, MutableMap, Set, MutableSet};
 use clone::Clone;
-use cmp::{Eq, Equiv};
+use cmp::{Eq, Equiv, max};
 use default::Default;
 #[cfg(not(stage0))] use fmt;
 use hash::Hash;
@@ -376,7 +376,7 @@ impl<K: Hash + Eq, V> HashMap<K, V> {
     /// cause many collisions and very poor performance. Setting them
     /// manually using this function can expose a DoS attack vector.
     pub fn with_capacity_and_keys(k0: u64, k1: u64, capacity: uint) -> HashMap<K, V> {
-        let cap = num::max(INITIAL_CAPACITY, capacity);
+        let cap = max(INITIAL_CAPACITY, capacity);
         HashMap {
             k0: k0, k1: k1,
             resize_at: resize_at(cap),