diff options
| author | Steve Klabnik <steve@steveklabnik.com> | 2017-07-13 10:45:21 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-13 10:45:21 -0400 |
| commit | 9d4b46225073c25770200082e5d71718d9afadaf (patch) | |
| tree | 07ae2d086680b86f272c4e9ebb85a4784a4068f6 /src/libstd | |
| parent | a14b30c463c517a23edf2fe254de0f7bdc912dd3 (diff) | |
| parent | 21f2ace8cfaa6c6cd137cfa3b11222f4a06a0b87 (diff) | |
| download | rust-9d4b46225073c25770200082e5d71718d9afadaf.tar.gz rust-9d4b46225073c25770200082e5d71718d9afadaf.zip | |
Rollup merge of #43203 - jackpot51:patch-2, r=alexcrichton
Remove obsolete oom handler from sys::redox Alloc no longer has set_oom_handler.
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/sys/redox/mod.rs | 20 |
1 files changed, 1 insertions, 19 deletions
diff --git a/src/libstd/sys/redox/mod.rs b/src/libstd/sys/redox/mod.rs index 31c40ea58b1..7c728ebb1af 100644 --- a/src/libstd/sys/redox/mod.rs +++ b/src/libstd/sys/redox/mod.rs @@ -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 { |
