Skip to content

Commit 44a9ce8

Browse files
committed
Remove search_bucket from raw_entry
It doesn't work in hashbrown anyways (see rust-lang#56167)
1 parent a7b34ab commit 44a9ce8

File tree

1 file changed

+0
-30
lines changed
  • src/libstd/collections/hash

1 file changed

+0
-30
lines changed

src/libstd/collections/hash/map.rs

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1416,17 +1416,6 @@ impl<'a, K, V, S> RawEntryBuilderMut<'a, K, V, S>
14161416
{
14171417
self.search(hash, is_match)
14181418
}
1419-
1420-
/// Search possible locations for an element with hash `hash` until `is_match` returns true for
1421-
/// one of them. There is no guarantee that all keys passed to `is_match` will have the provided
1422-
/// hash.
1423-
#[inline]
1424-
#[unstable(feature = "hash_raw_entry", issue = "56167")]
1425-
pub fn search_bucket<F>(self, hash: u64, is_match: F) -> RawEntryMut<'a, K, V, S>
1426-
where for<'b> F: FnMut(&'b K) -> bool,
1427-
{
1428-
self.search(hash, is_match)
1429-
}
14301419
}
14311420

14321421
impl<'a, K, V, S> RawEntryBuilder<'a, K, V, S>
@@ -1476,17 +1465,6 @@ impl<'a, K, V, S> RawEntryBuilder<'a, K, V, S>
14761465
{
14771466
self.search(hash, is_match)
14781467
}
1479-
1480-
/// Search possible locations for an element with hash `hash` until `is_match` returns true for
1481-
/// one of them. There is no guarantee that all keys passed to `is_match` will have the provided
1482-
/// hash.
1483-
#[inline]
1484-
#[unstable(feature = "hash_raw_entry", issue = "56167")]
1485-
pub fn search_bucket<F>(self, hash: u64, is_match: F) -> Option<(&'a K, &'a V)>
1486-
where F: FnMut(&K) -> bool
1487-
{
1488-
self.search(hash, is_match)
1489-
}
14901468
}
14911469

14921470
impl<'a, K, V, S> RawEntryMut<'a, K, V, S> {
@@ -3727,7 +3705,6 @@ mod test_map {
37273705
assert_eq!(map.raw_entry().from_key(&1).unwrap(), (&1, &100));
37283706
assert_eq!(map.raw_entry().from_hash(hash1, |k| *k == 1).unwrap(), (&1, &100));
37293707
assert_eq!(map.raw_entry().from_key_hashed_nocheck(hash1, &1).unwrap(), (&1, &100));
3730-
assert_eq!(map.raw_entry().search_bucket(hash1, |k| *k == 1).unwrap(), (&1, &100));
37313708
assert_eq!(map.len(), 6);
37323709

37333710
// Existing key (update)
@@ -3743,7 +3720,6 @@ mod test_map {
37433720
assert_eq!(map.raw_entry().from_key(&2).unwrap(), (&2, &200));
37443721
assert_eq!(map.raw_entry().from_hash(hash2, |k| *k == 2).unwrap(), (&2, &200));
37453722
assert_eq!(map.raw_entry().from_key_hashed_nocheck(hash2, &2).unwrap(), (&2, &200));
3746-
assert_eq!(map.raw_entry().search_bucket(hash2, |k| *k == 2).unwrap(), (&2, &200));
37473723
assert_eq!(map.len(), 6);
37483724

37493725
// Existing key (take)
@@ -3757,7 +3733,6 @@ mod test_map {
37573733
assert_eq!(map.raw_entry().from_key(&3), None);
37583734
assert_eq!(map.raw_entry().from_hash(hash3, |k| *k == 3), None);
37593735
assert_eq!(map.raw_entry().from_key_hashed_nocheck(hash3, &3), None);
3760-
assert_eq!(map.raw_entry().search_bucket(hash3, |k| *k == 3), None);
37613736
assert_eq!(map.len(), 5);
37623737

37633738

@@ -3780,7 +3755,6 @@ mod test_map {
37803755
assert_eq!(map.raw_entry().from_key(&k), kv);
37813756
assert_eq!(map.raw_entry().from_hash(hash, |q| *q == k), kv);
37823757
assert_eq!(map.raw_entry().from_key_hashed_nocheck(hash, &k), kv);
3783-
assert_eq!(map.raw_entry().search_bucket(hash, |q| *q == k), kv);
37843758

37853759
match map.raw_entry_mut().from_key(&k) {
37863760
Occupied(mut o) => assert_eq!(Some(o.get_key_value()), kv),
@@ -3794,10 +3768,6 @@ mod test_map {
37943768
Occupied(mut o) => assert_eq!(Some(o.get_key_value()), kv),
37953769
Vacant(_) => assert_eq!(v, None),
37963770
}
3797-
match map.raw_entry_mut().search_bucket(hash, |q| *q == k) {
3798-
Occupied(mut o) => assert_eq!(Some(o.get_key_value()), kv),
3799-
Vacant(_) => assert_eq!(v, None),
3800-
}
38013771
}
38023772
}
38033773

0 commit comments

Comments
 (0)