rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Rename 'distance' -> 'displacement'

Browse Source
This commit is contained in:
Piotr Czarnecki
2016-01-22 14:34:10 +01:00
parent d31d8a9a91
commit c71f720d9b
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/libstd/collections/hash/map.rs
View File

@@ -393,7 +393,7 @@ fn pop_internal<K, V>(starting_bucket: FullBucketMut<K, V>) -> (K, V) {
None => return (retkey, retval) None => return (retkey, retval)
}; };
while gap.full().distance() != 0 { while gap.full().displacement() != 0 {
gap = match gap.shift() { gap = match gap.shift() {
Some(b) => b, Some(b) => b,
None => break None => break
@@ -423,7 +423,7 @@ fn robin_hood<'a, K: 'a, V: 'a>(mut bucket: FullBucketMut<'a, K, V>,
// There can be at most `size - dib` buckets to displace, because // There can be at most `size - dib` buckets to displace, because
// in the worst case, there are `size` elements and we already are // in the worst case, there are `size` elements and we already are
// `distance` buckets away from the initial one. // `distance` buckets away from the initial one.
let idx_end = starting_index + size - bucket.distance(); let idx_end = starting_index + size - bucket.displacement();
loop { loop {
let (old_hash, old_key, old_val) = bucket.replace(hash, k, v); let (old_hash, old_key, old_val) = bucket.replace(hash, k, v);
@@ -446,7 +446,7 @@ fn robin_hood<'a, K: 'a, V: 'a>(mut bucket: FullBucketMut<'a, K, V>,
Full(bucket) => bucket Full(bucket) => bucket
}; };
let probe_ib = full_bucket.index() - full_bucket.distance(); let probe_ib = full_bucket.index() - full_bucket.displacement();
bucket = full_bucket; bucket = full_bucket;
@@ -731,7 +731,7 @@ impl<K, V, S> HashMap<K, V, S>
loop { loop {
bucket = match bucket.peek() { bucket = match bucket.peek() {
Full(full) => { Full(full) => {
if full.distance() == 0 { if full.displacement() == 0 {
// This bucket occupies its ideal spot. // This bucket occupies its ideal spot.
// It indicates the start of another "cluster". // It indicates the start of another "cluster".
bucket = full.into_bucket(); bucket = full.into_bucket();

2
src/libstd/collections/hash/table.rs
View File

@@ -370,7 +370,7 @@ impl<K, V, M: Deref<Target=RawTable<K, V>>> FullBucket<K, V, M> {
/// ///
/// In the cited blog posts above, this is called the "distance to /// In the cited blog posts above, this is called the "distance to
/// initial bucket", or DIB. Also known as "probe count". /// initial bucket", or DIB. Also known as "probe count".
pub fn distance(&self) -> usize { pub fn displacement(&self) -> usize {
// Calculates the distance one has to travel when going from // Calculates the distance one has to travel when going from
// `hash mod capacity` onwards to `idx mod capacity`, wrapping around // `hash mod capacity` onwards to `idx mod capacity`, wrapping around
// if the destination is not reached before the end of the table. // if the destination is not reached before the end of the table.