Improve interface by making functions unsafe and by changing arguments

Author: phil-opp

src/hole.rs

@@ -17,12 +17,13 @@ impl HoleList {
         }
     }
 
-    pub unsafe fn new(ptr: *mut Hole, size: usize) -> HoleList {
+    pub unsafe fn new(hole_addr: usize, hole_size: usize) -> HoleList {
         assert!(size_of::<Hole>() == Self::min_size());
 
+        let ptr = hole_addr as *mut Hole;
         mem::forget(mem::replace(&mut *ptr,
                                  Hole {
-                                     size: size,
+                                     size: hole_size,
                                      next: None,
                                  }));
 
@@ -48,10 +49,7 @@ impl HoleList {
         })
     }
 
-    pub fn deallocate(&mut self, ptr: *mut u8, size: usize) {
-        println!("deallocate {:p} ({} bytes)", ptr, size);
-        assert!(size >= Self::min_size());
-
+    pub unsafe fn deallocate(&mut self, ptr: *mut u8, size: usize) {
         deallocate(&mut self.first, ptr as usize, size)
     }
 

src/lib.rs

@@ -25,11 +25,11 @@ impl Heap {
         }
     }
 
-    pub fn new(heap_bottom: usize, heap_top: usize) -> Heap {
+    pub unsafe fn new(heap_bottom: usize, heap_top: usize) -> Heap {
         Heap {
             bottom: heap_bottom,
             top: heap_top,
-            holes: unsafe { HoleList::new(heap_bottom as *mut _, heap_top - heap_bottom) },
+            holes: HoleList::new(heap_bottom, heap_top - heap_bottom),
         }
     }
 
@@ -41,7 +41,7 @@ impl Heap {
         self.holes.allocate_first_fit(size, align)
     }
 
-    pub fn deallocate(&mut self, ptr: *mut u8, mut size: usize, _align: usize) {
+    pub unsafe fn deallocate(&mut self, ptr: *mut u8, mut size: usize, _align: usize) {
         if size < HoleList::min_size() {
             size = HoleList::min_size();
         }