about summary refs log tree commit diff
path: root/src/libcollections
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2014-02-25 06:41:36 -0800
committerbors <bors@rust-lang.org>2014-02-25 06:41:36 -0800
commit25d68366b73c24bd9b7d277b38da087420d63f9b (patch)
tree20978b14ec9da96f64fbd7659d090c04e99d300d /src/libcollections
parentd222f03f42fe855d2fadc87010453bcfc2a669e1 (diff)
parent6335a76b6eb473ea399b16fe9309db142d6b68ce (diff)
downloadrust-25d68366b73c24bd9b7d277b38da087420d63f9b.tar.gz
rust-25d68366b73c24bd9b7d277b38da087420d63f9b.zip
auto merge of #12522 : erickt/rust/hash, r=alexcrichton
This patch series does a couple things:

* replaces manual `Hash` implementations with `#[deriving(Hash)]`
* adds `Hash` back to `std::prelude`
* minor cleanup of whitespace and variable names.
Diffstat (limited to 'src/libcollections')
-rw-r--r--src/libcollections/hashmap.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libcollections/hashmap.rs b/src/libcollections/hashmap.rs
index 7ab85979692..6abe49bc908 100644
--- a/src/libcollections/hashmap.rs
+++ b/src/libcollections/hashmap.rs
@@ -98,7 +98,7 @@ fn resize_at(capacity: uint) -> uint {
     (capacity * 3) / 4
 }
 
-impl<K:Hash + Eq,V> HashMap<K, V> {
+impl<K:Hash + Eq, V> HashMap<K, V> {
     #[inline]
     fn to_bucket(&self, h: uint) -> uint {
         // A good hash function with entropy spread over all of the