Upgrade rust and fix clipy errors

Author: wenyuzhao

hoard/src/lib.rs

@@ -1,7 +1,6 @@
 #![feature(thread_local)]
 #![feature(step_trait)]
 #![feature(allocator_api)]
-#![feature(const_trait_impl)]
 
 extern crate mallockit;
 

mallockit/macros/src/lib.rs

@@ -45,7 +45,7 @@ pub fn plan(_attr: TokenStream, item: TokenStream) -> TokenStream {
 
             static PLAN: ::mallockit::util::Lazy<Plan> = ::mallockit::util::Lazy::new(|| <Plan as ::mallockit::Plan>::new());
 
-            #[cfg(any(feature = "malloc", feature = "mallockit/malloc"))]
+            #[cfg(feature = "malloc")]
             #[::mallockit::ctor]
             unsafe fn ctor() {
                 <<Plan as ::mallockit::Plan>::Mutator as ::mallockit::mutator::TLS>::current();

mallockit/src/lib.rs

@@ -1,5 +1,4 @@
 #![allow(incomplete_features)]
-#![feature(const_trait_impl)]
 #![feature(step_trait)]
 #![feature(thread_local)]
 #![feature(allocator_api)]
@@ -8,7 +7,6 @@
 #![feature(alloc_layout_extra)]
 #![feature(adt_const_params)]
 #![feature(generic_const_exprs)]
-#![feature(effects)]
 
 extern crate mallockit_macros;
 pub extern crate spin;

mallockit/src/space/large_object_space.rs

@@ -1,6 +1,7 @@
 use std::{alloc::Layout, marker::PhantomData};
 
 use super::{
+    meta::Meta,
     page_resource::{FreelistPageResource, PageResource},
     Allocator, Space, SpaceId,
 };
@@ -59,11 +60,9 @@ pub struct LargeObjectAllocator<
     S: PageSize = Size4K,
     const MAX_CACHEABLE_SIZE: usize = 0,
     const THRESHOLD_SLOP: usize = 0,
-> where
-    [(); bins::<S>(MAX_CACHEABLE_SIZE)]: Sized,
-{
+> {
     space: &'static LargeObjectSpace,
-    bins: [Address; bins::<S>(MAX_CACHEABLE_SIZE)],
+    bins: Vec<Address, Meta>,
     max_live: usize,
     live: usize,
     cleared: bool,
@@ -72,15 +71,16 @@ pub struct LargeObjectAllocator<
 
 impl<S: PageSize, const MAX_CACHEABLE_SIZE: usize, const THRESHOLD_SLOP: usize>
     LargeObjectAllocator<S, MAX_CACHEABLE_SIZE, THRESHOLD_SLOP>
-where
-    [(); bins::<S>(MAX_CACHEABLE_SIZE)]: Sized,
 {
     const CACHE_ENABLED: bool = bins::<S>(MAX_CACHEABLE_SIZE) > 0;
 
     pub fn new(los: &'static LargeObjectSpace) -> Self {
+        let mut bins_vec = Vec::new_in(Meta);
+        bins_vec.resize(bins::<S>(MAX_CACHEABLE_SIZE), Address::ZERO);
+
         Self {
             space: los,
-            bins: [Address::ZERO; bins::<S>(MAX_CACHEABLE_SIZE)],
+            bins: bins_vec,
             max_live: 0,
             live: 0,
             cleared: false,
@@ -118,8 +118,6 @@ where
 
 impl<S: PageSize, const MAX_CACHEABLE_SIZE: usize, const THRESHOLD_SLOP: usize> Allocator
     for LargeObjectAllocator<S, MAX_CACHEABLE_SIZE, THRESHOLD_SLOP>
-where
-    [(); bins::<S>(MAX_CACHEABLE_SIZE)]: Sized,
 {
     #[cold]
     fn alloc(&mut self, layout: Layout) -> Option<Address> {
@@ -171,8 +169,6 @@ where
 
 impl<S: PageSize, const MAX_CACHEABLE_SIZE: usize, const THRESHOLD_SLOP: usize> Drop
     for LargeObjectAllocator<S, MAX_CACHEABLE_SIZE, THRESHOLD_SLOP>
-where
-    [(); bins::<S>(MAX_CACHEABLE_SIZE)]: Sized,
 {
     fn drop(&mut self) {
         if Self::CACHE_ENABLED {

mallockit/src/util/bits.rs

@@ -6,7 +6,6 @@ pub struct BitField {
     pub shift: usize,
 }
 
-#[const_trait]
 pub trait BitFieldSlot: Sized {
     fn get(&self, field: BitField) -> usize;
     fn set(&mut self, field: BitField, value: usize);
@@ -38,7 +37,7 @@ impl BitFieldSlot for AtomicUsize {
     }
 }
 
-impl const BitFieldSlot for usize {
+impl BitFieldSlot for usize {
     fn get(&self, field: BitField) -> usize {
         let value = *self;
         (value >> field.shift) & ((1usize << field.bits) - 1)

mallockit/src/util/malloc/malloc_api.rs

@@ -236,7 +236,7 @@ impl<P: Plan> MallocAPI<P> {
 #[doc(hidden)]
 macro_rules! export_malloc_api {
     ($plan: expr, $plan_ty: ty) => {
-        #[cfg(any(feature = "malloc", feature = "mallockit/malloc"))]
+        #[cfg(feature = "malloc")]
         pub mod __mallockit_malloc_api {
             use super::*;
             use $crate::Plan;

mallockit/src/util/mem/aligned_block.rs

@@ -205,7 +205,6 @@ macro_rules! impl_aligned_block {
     };
 }
 
-#[const_trait]
 pub trait AlignedBlockConfig: Sized {
     type Header: Sized = ();
 

mallockit/src/util/mem/alloc/arena.rs

@@ -9,6 +9,12 @@ pub struct Arena<T: Sized> {
     phanton: PhantomData<T>,
 }
 
+impl Default for Arena<u8> {
+    fn default() -> Self {
+        Self::new()
+    }
+}
+
 impl<T: Sized> Arena<T> {
     pub const fn new() -> Self {
         Self {

mallockit/src/util/mem/alloc/discrete_tlab.rs

@@ -6,6 +6,12 @@ pub struct DiscreteTLAB<const MAX_SIZE_CLASS: usize = { Address::LOG_BYTES }> {
     bytes: usize,
 }
 
+impl<const MAX_SIZE_CLASS: usize> Default for DiscreteTLAB<MAX_SIZE_CLASS> {
+    fn default() -> Self {
+        Self::new()
+    }
+}
+
 impl<const MAX_SIZE_CLASS: usize> DiscreteTLAB<MAX_SIZE_CLASS> {
     pub const fn new() -> Self {
         Self {

rust-toolchain

@@ -1 +1 @@
-nightly-2024-11-01
+nightly-2024-11-20