Rebase on top of the main branch.

Author: gendx

src/external_trait_impls/paralight.rs

@@ -48,7 +48,7 @@ impl<T: Sync, A: Allocator> SourceCleanup for HashSetRefSourceDescriptor<'_, T,
     const NEEDS_CLEANUP: bool = false;
 
     fn len(&self) -> usize {
-        self.table.inner.buckets()
+        self.table.inner.num_buckets()
     }
 
     unsafe fn cleanup_item_range(&self, _range: core::ops::Range<usize>) {
@@ -121,7 +121,7 @@ impl<K: Sync, V: Sync, A: Allocator> SourceCleanup for HashMapRefSourceDescripto
     const NEEDS_CLEANUP: bool = false;
 
     fn len(&self) -> usize {
-        self.table.inner.buckets()
+        self.table.inner.num_buckets()
     }
 
     unsafe fn cleanup_item_range(&self, _range: core::ops::Range<usize>) {
@@ -195,7 +195,7 @@ impl<K: Sync, V: Send, A: Allocator> SourceCleanup for HashMapRefMutSourceDescri
     const NEEDS_CLEANUP: bool = false;
 
     fn len(&self) -> usize {
-        self.table.inner.buckets()
+        self.table.inner.num_buckets()
     }
 
     unsafe fn cleanup_item_range(&self, _range: core::ops::Range<usize>) {
@@ -274,7 +274,7 @@ impl<T: Send, A: Allocator> SourceCleanup for HashSetSourceDescriptor<T, A> {
     const NEEDS_CLEANUP: bool = core::mem::needs_drop::<T>();
 
     fn len(&self) -> usize {
-        self.table.inner.buckets()
+        self.table.inner.num_buckets()
     }
 
     unsafe fn cleanup_item_range(&self, range: core::ops::Range<usize>) {
@@ -392,7 +392,7 @@ impl<K: Send, V: Send, A: Allocator> SourceCleanup for HashMapSourceDescriptor<K
     const NEEDS_CLEANUP: bool = core::mem::needs_drop::<(K, V)>();
 
     fn len(&self) -> usize {
-        self.table.inner.buckets()
+        self.table.inner.num_buckets()
     }
 
     unsafe fn cleanup_item_range(&self, range: core::ops::Range<usize>) {

src/raw/mod.rs

@@ -1500,13 +1500,15 @@ impl<T, A: Allocator> RawTable<T, A> {
 
         // Avoid `Option::unwrap_or_else` because it bloats LLVM IR.
         let (layout, ctrl_offset) =
-            match Self::TABLE_LAYOUT.calculate_layout_for(self.table.buckets()) {
+            match Self::TABLE_LAYOUT.calculate_layout_for(self.table.num_buckets()) {
                 Some(lco) => lco,
                 None => unsafe { hint::unreachable_unchecked() },
             };
         let ptr =
             unsafe { NonNull::new_unchecked(self.table.ctrl.as_ptr().sub(ctrl_offset).cast()) };
-        self.alloc.deallocate(ptr, layout);
+        unsafe {
+            self.alloc.deallocate(ptr, layout);
+        }
 
         // Reset the table, so that it can be dropped without double free.
         self.table = RawTableInner::NEW;