Upgrade rust toolchain

Author: wenyuzhao

hoard/src/lib.rs

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

hoard/src/pool.rs

@@ -24,7 +24,7 @@ impl EmptyClass {
         }
     }
 
-    const fn group(block: SuperBlock) -> usize {
+    fn group(block: SuperBlock) -> usize {
         let t =
             SuperBlock::DATA_BYTES >> block.size_class.log_bytes() << block.size_class.log_bytes();
         let u = block.used_bytes();

hoard/src/super_block.rs

@@ -64,15 +64,15 @@ impl SuperBlock {
         self.used_bytes = 0;
     }
 
-    pub const fn used_bytes(self) -> usize {
+    pub fn used_bytes(self) -> usize {
         self.used_bytes as _
     }
 
-    pub const fn is_empty(self) -> bool {
+    pub fn is_empty(self) -> bool {
         self.used_bytes == 0
     }
 
-    pub const fn is_full(self) -> bool {
+    pub fn is_full(self) -> bool {
         self.bump_cursor >= Self::BYTES as u32 && self.head_cell.is_zero()
     }
 
@@ -92,7 +92,7 @@ impl SuperBlock {
         Some(cell)
     }
 
-    pub const fn free_cell(&mut self, cell: Address) {
+    pub fn free_cell(&mut self, cell: Address) {
         unsafe {
             cell.store(self.head_cell);
         }

mallockit/src/lib.rs

@@ -1,6 +1,5 @@
 #![allow(incomplete_features)]
 #![feature(const_trait_impl)]
-#![feature(const_mut_refs)]
 #![feature(step_trait)]
 #![feature(thread_local)]
 #![feature(allocator_api)]
@@ -10,9 +9,6 @@
 #![feature(adt_const_params)]
 #![feature(generic_const_exprs)]
 #![feature(effects)]
-#![feature(asm_const)]
-#![feature(const_refs_to_cell)]
-#![feature(const_refs_to_static)]
 
 extern crate mallockit_macros;
 pub extern crate spin;

mallockit/src/space/page_resource/block_page_resource.rs

@@ -108,7 +108,7 @@ impl<B: MemRegion> BlockPageResource<B> {
         }
     }
 
-    const fn set_next(b: B, next: Option<B>) {
+    fn set_next(b: B, next: Option<B>) {
         let a = b.start();
         let next = match next {
             Some(b) => b.start(),
@@ -117,7 +117,7 @@ impl<B: MemRegion> BlockPageResource<B> {
         unsafe { a.store(next) }
     }
 
-    const fn get_next(b: B) -> Option<B> {
+    fn get_next(b: B) -> Option<B> {
         let a = b.start();
         let next: Address = unsafe { a.load() };
         if next.is_zero() {

mallockit/src/util/malloc/macos_malloc_zone.rs

@@ -20,7 +20,7 @@ pub static mut MALLOCKIT_MALLOC_ZONE: MallocZone = MallocZone {
     batch_malloc: 0 as _,
     // Nullable
     batch_free: 0 as _,
-    introspect: unsafe { addr_of!(MALLOCKIT_MALLOC_INTROSPECTION) },
+    introspect: addr_of!(MALLOCKIT_MALLOC_INTROSPECTION),
     version: 9,
     memalign: zone_memalign,
     free_definite_size: 0 as _,

mallockit/src/util/mem/heap.rs

@@ -24,7 +24,7 @@ impl Heap {
     }
 
     pub const fn contains(&self, ptr: Address) -> bool {
-        self.start <= ptr && ptr < self.end
+        self.start.as_usize() <= ptr.as_usize() && ptr.as_usize() < self.end.as_usize()
     }
 
     pub const fn start(&self) -> Address {

mallockit/src/util/sys/hooks.rs

@@ -1,8 +1,8 @@
-use std::panic::PanicInfo;
+use std::panic::PanicHookInfo;
 
 use crate::Plan;
 
-fn panic_handler(panic_info: &PanicInfo<'_>) {
+fn panic_handler(panic_info: &PanicHookInfo<'_>) {
     crate::println!("{}", panic_info);
     std::process::abort();
 }

rust-toolchain

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