Merge #19

19: Update after recent rust-nightly changes. r=jacob-hughes a=ltratt There are two PRs which affect us: rust-lang/rust#74850 rust-lang/rust#75152 Henceforth, we should probably be keeping a close eye on and contributing to: https://github.com/rust-lang/wg-allocators/issues Co-authored-by: Laurence Tratt <[email protected]>
softdevteam · Aug 7, 2020 · 5882ebc · 5882ebc
2 parents 10fdb18 + 57b1b9e
commit 5882ebc
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 19 deletions.
diff --git a/src/allocator.rs b/src/allocator.rs
@@ -1,5 +1,5 @@
 use std::{
-    alloc::{AllocErr, AllocInit, AllocRef, GlobalAlloc, Layout, MemoryBlock},
+    alloc::{AllocErr, AllocRef, GlobalAlloc, Layout},
     ffi::c_void,
     ptr::NonNull,
 };
@@ -24,13 +24,11 @@ unsafe impl GlobalAlloc for BoehmAllocator {
 }
 
 unsafe impl AllocRef for BoehmGcAllocator {
-    fn alloc(&mut self, layout: Layout, _init: AllocInit) -> Result<MemoryBlock, AllocErr> {
+    fn alloc(&mut self, layout: Layout) -> Result<NonNull<[u8]>, AllocErr> {
         let ptr = unsafe { boehm::GC_malloc(layout.size()) } as *mut u8;
         assert!(!ptr.is_null());
-        Ok(MemoryBlock {
-            ptr: unsafe { NonNull::new_unchecked(ptr) },
-            size: layout.size(),
-        })
+        let ptr = unsafe { NonNull::new_unchecked(ptr) };
+        Ok(NonNull::slice_from_raw_parts(ptr, layout.size()))
     }
 
     unsafe fn dealloc(&mut self, _: NonNull<u8>, _: Layout) {}

diff --git a/src/gc.rs b/src/gc.rs
@@ -1,5 +1,5 @@
 use std::{
-    alloc::{AllocInit, AllocRef, Layout},
+    alloc::{AllocRef, Layout},
     any::Any,
     ffi::c_void,
     fmt,
@@ -146,13 +146,7 @@ struct GcBox<T: ?Sized>(ManuallyDrop<T>);
 impl<T> GcBox<T> {
     fn new(value: T) -> *mut GcBox<T> {
         let layout = Layout::new::<T>();
-        let ptr = unsafe {
-            GC_ALLOCATOR
-                .alloc(layout, AllocInit::Uninitialized)
-                .unwrap()
-                .ptr
-                .as_ptr()
-        } as *mut GcBox<T>;
+        let ptr = unsafe { GC_ALLOCATOR.alloc(layout).unwrap().as_ptr() } as *mut GcBox<T>;
         let gcbox = GcBox(ManuallyDrop::new(value));
 
         unsafe {
@@ -166,11 +160,7 @@ impl<T> GcBox<T> {
 
     fn new_from_layout(layout: Layout) -> NonNull<GcBox<MaybeUninit<T>>> {
         unsafe {
-            let base_ptr = GC_ALLOCATOR
-                .alloc(layout, AllocInit::Uninitialized)
-                .unwrap()
-                .ptr
-                .as_ptr() as *mut usize;
+            let base_ptr = GC_ALLOCATOR.alloc(layout).unwrap().as_ptr() as *mut usize;
             NonNull::new_unchecked(base_ptr as *mut GcBox<MaybeUninit<T>>)
         }
     }

diff --git a/src/lib.rs b/src/lib.rs
@@ -3,6 +3,7 @@
 #![feature(alloc_layout_extra)]
 #![feature(arbitrary_self_types)]
 #![feature(dispatch_from_dyn)]
+#![feature(nonnull_slice_from_raw_parts)]
 #![feature(raw_vec_internals)]
 #![feature(const_fn)]
 #![feature(coerce_unsized)]