Custom oom handler that calls panic instead of intrinsics::abort (#7)

robert-w-gries · phil-opp · commit b6cadb4327f7 · 2017-12-15T09:19:56.000+01:00
diff --git a/src/lib.rs b/src/lib.rs
@@ -132,6 +132,10 @@ unsafe impl Alloc for Heap {
     unsafe fn dealloc(&mut self, ptr: *mut u8, layout: Layout) {
         self.deallocate(ptr, layout)
     }
+
+    fn oom(&mut self, _: AllocErr) -> ! {
+        panic!("Out of memory");
+    }
 }
 
 pub struct LockedHeap(Mutex<Heap>);
@@ -171,6 +175,10 @@ unsafe impl<'a> Alloc for &'a LockedHeap {
     unsafe fn dealloc(&mut self, ptr: *mut u8, layout: Layout) {
         self.0.lock().deallocate(ptr, layout)
     }
+
+    fn oom(&mut self, _: AllocErr) -> ! {
+        panic!("Out of memory");
+    }
 }
 
 /// Align downwards. Returns the greatest x with alignment `align`

Original file line number	Diff line number	Diff line change
`@@ -132,6 +132,10 @@ unsafe impl Alloc for Heap {`
`132`	`132`	`unsafe fn dealloc(&mut self, ptr: *mut u8, layout: Layout) {`
`133`	`133`	`self.deallocate(ptr, layout)`
`134`	`134`	`}`
	`135`	`+`
	`136`	`+ fn oom(&mut self, _: AllocErr) -> ! {`
	`137`	`+ panic!("Out of memory");`
	`138`	`+ }`
`135`	`139`	`}`
`136`	`140`
`137`	`141`	`pub struct LockedHeap(Mutex<Heap>);`
`@@ -171,6 +175,10 @@ unsafe impl<'a> Alloc for &'a LockedHeap {`
`171`	`175`	`unsafe fn dealloc(&mut self, ptr: *mut u8, layout: Layout) {`
`172`	`176`	`self.0.lock().deallocate(ptr, layout)`
`173`	`177`	`}`
	`178`	`+`
	`179`	`+ fn oom(&mut self, _: AllocErr) -> ! {`
	`180`	`+ panic!("Out of memory");`
	`181`	`+ }`
`174`	`182`	`}`
`175`	`183`
`176`	`184`	/// Align downwards. Returns the greatest x with alignment `align`