OpenE2K
/
rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

auto merge of #7100 : thestinger/rust/hashmap, r=pnkfelix 

Not much point in leaving these around. They just get in the way when you actually want to log something else.
This commit is contained in:
bors 2013-06-13 03:25:11 -07:00
parent 4e950e9702 ed7892ac00
commit a198aad8f3
1 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/libstd/hashmap.rs
View File

@ -94,9 +94,7 @@ impl<K:Hash + Eq,V> HashMap<K, V> {
#[inline(always)]
fn next_bucket(&self, idx: uint, len_buckets: uint) -> uint {
let n = (idx + 1) % len_buckets;
debug!("next_bucket(%?, %?) = %?", idx, len_buckets, n);
n
(idx + 1) % len_buckets
}
#[inline(always)]
@ -215,16 +213,12 @@ impl<K:Hash + Eq,V> HashMap<K, V> {
match self.bucket_for_key_with_hash(hash, &k) {
TableFull => { fail!("Internal logic error"); }
FoundHole(idx) => {
debug!("insert fresh (%?->%?) at idx %?, hash %?",
k, v, idx, hash);
self.buckets[idx] = Some(Bucket{hash: hash, key: k,
value: v});
self.size += 1;
None
}
FoundEntry(idx) => {
debug!("insert overwrite (%?->%?) at idx %?, hash %?",
k, v, idx, hash);
match self.buckets[idx] {
None => { fail!("insert_internal: Internal logic error") }
Some(ref mut b) => {