mirror of
https://github.com/rust-lang/rust.git
synced 2025-04-28 02:57:37 +00:00
Rollup merge of #43203 - jackpot51:patch-2, r=alexcrichton
Remove obsolete oom handler from sys::redox Alloc no longer has set_oom_handler.
This commit is contained in:
commit
9d4b462250
@ -39,25 +39,7 @@ pub mod thread_local;
|
||||
pub mod time;
|
||||
|
||||
#[cfg(not(test))]
|
||||
pub fn init() {
|
||||
use alloc::oom;
|
||||
|
||||
oom::set_oom_handler(oom_handler);
|
||||
|
||||
// A nicer handler for out-of-memory situations than the default one. This
|
||||
// one prints a message to stderr before aborting. It is critical that this
|
||||
// code does not allocate any 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.
|
||||
fn oom_handler() -> ! {
|
||||
use intrinsics;
|
||||
let msg = "fatal runtime error: out of memory\n";
|
||||
unsafe {
|
||||
let _ = syscall::write(2, msg.as_bytes());
|
||||
intrinsics::abort();
|
||||
}
|
||||
}
|
||||
}
|
||||
pub fn init() {}
|
||||
|
||||
pub fn decode_error_kind(errno: i32) -> ErrorKind {
|
||||
match errno {
|
||||
|
Loading…
Reference in New Issue
Block a user