about summary refs log tree commit diff
path: root/src/liballoc_system
diff options
context:
space:
mode:
authorSimon Sapin <simon.sapin@exyr.org>2018-04-03 16:00:04 +0200
committerSimon Sapin <simon.sapin@exyr.org>2018-04-12 22:53:13 +0200
commit157ff8cd0562eefdd7aa296395c38a7bc259a4b9 (patch)
tree162a8b87c71c590b4ae1a594c4087819fb719b57 /src/liballoc_system
parent86753ce1cc520bfe50ae89f09ec47f313ce900eb (diff)
downloadrust-157ff8cd0562eefdd7aa296395c38a7bc259a4b9.tar.gz
rust-157ff8cd0562eefdd7aa296395c38a7bc259a4b9.zip
Remove the now-unit-struct AllocErr parameter of oom()
Diffstat (limited to 'src/liballoc_system')
-rw-r--r--src/liballoc_system/lib.rs12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/liballoc_system/lib.rs b/src/liballoc_system/lib.rs
index 0480be8d913..5e6b3b5ca11 100644
--- a/src/liballoc_system/lib.rs
+++ b/src/liballoc_system/lib.rs
@@ -73,8 +73,8 @@ unsafe impl Alloc for System {
         Alloc::realloc(&mut &*self, ptr, old_layout, new_layout)
     }
 
-    fn oom(&mut self, err: AllocErr) -> ! {
-        Alloc::oom(&mut &*self, err)
+    fn oom(&mut self) -> ! {
+        Alloc::oom(&mut &*self)
     }
 
     #[inline]
@@ -242,7 +242,7 @@ mod platform {
     unsafe impl<'a> Alloc for &'a System {
         alloc_methods_based_on_global_alloc!();
 
-        fn oom(&mut self, err: AllocErr) -> ! {
+        fn oom(&mut self) -> ! {
             use core::fmt::{self, Write};
 
             // Print a message to stderr before aborting to assist with
@@ -250,7 +250,7 @@ mod platform {
             // memory since we are in an OOM situation. Any errors are ignored
             // while printing since there's nothing we can do about them and we
             // are about to exit anyways.
-            drop(writeln!(Stderr, "fatal runtime error: {}", err));
+            drop(writeln!(Stderr, "fatal runtime error: {}", AllocErr));
             unsafe {
                 ::core::intrinsics::abort();
             }
@@ -459,11 +459,11 @@ mod platform {
             }
         }
 
-        fn oom(&mut self, err: AllocErr) -> ! {
+        fn oom(&mut self) -> ! {
             use core::fmt::{self, Write};
 
             // Same as with unix we ignore all errors here
-            drop(writeln!(Stderr, "fatal runtime error: {}", err));
+            drop(writeln!(Stderr, "fatal runtime error: {}", AllocErr));
             unsafe {
                 ::core::intrinsics::abort();
             }