Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions src/map.rs
Original file line number Diff line number Diff line change
Expand Up @@ -809,7 +809,7 @@ impl<K, V, S, A: Allocator> HashMap<K, V, S, A> {
#[cfg(test)]
#[cfg_attr(feature = "inline-more", inline)]
fn raw_capacity(&self) -> usize {
self.table.buckets()
self.table.num_buckets()
}

/// Returns the number of elements in the map.
Expand Down Expand Up @@ -6565,10 +6565,10 @@ mod test_map {
Ok(map) => map,
Err(msg) => return msg,
};
if map.table.buckets() != scope_map.table.buckets() {
if map.table.num_buckets() != scope_map.table.num_buckets() {
return format!(
"map.table.buckets() != scope_map.table.buckets(),\nleft: `{}`,\nright: `{}`",
map.table.buckets(), scope_map.table.buckets()
"map.table.num_buckets() != scope_map.table.num_buckets(),\nleft: `{}`,\nright: `{}`",
map.table.num_buckets(), scope_map.table.num_buckets()
);
}
map.clone_from(&scope_map);
Expand All @@ -6590,7 +6590,7 @@ mod test_map {
assert_eq!(unsafe { map.table.iter().count() }, 0);
assert_eq!(unsafe { map.table.iter().iter.count() }, 0);

for idx in 0..map.table.buckets() {
for idx in 0..map.table.num_buckets() {
let idx = idx as u64;
assert!(
map.table.find(idx, |(k, _)| *k == idx).is_none(),
Expand Down Expand Up @@ -6633,10 +6633,10 @@ mod test_map {
Ok(map) => map,
Err(msg) => return msg,
};
if map.table.buckets() == scope_map.table.buckets() {
if map.table.num_buckets() == scope_map.table.num_buckets() {
return format!(
"map.table.buckets() == scope_map.table.buckets(): `{}`",
map.table.buckets()
"map.table.num_buckets() == scope_map.table.num_buckets(): `{}`",
map.table.num_buckets()
);
}
map.clone_from(&scope_map);
Expand All @@ -6658,7 +6658,7 @@ mod test_map {
assert_eq!(unsafe { map.table.iter().count() }, 0);
assert_eq!(unsafe { map.table.iter().iter.count() }, 0);

for idx in 0..map.table.buckets() {
for idx in 0..map.table.num_buckets() {
let idx = idx as u64;
assert!(
map.table.find(idx, |(k, _)| *k == idx).is_none(),
Expand Down
Loading