From 76b4a86b571408ba2f99e047e9f5972ae682cb99 Mon Sep 17 00:00:00 2001 From: Martin Kröning Date: Wed, 31 Jul 2024 12:39:23 +0200 Subject: refactor(pal/hermit): return `!` to satisfy rust-analyzer MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This silences this rust-analyzer-specific error: `expected !, found ()` Signed-off-by: Martin Kröning --- library/std/src/sys/pal/hermit/mod.rs | 6 ++---- library/std/src/sys/pal/hermit/os.rs | 4 +--- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/library/std/src/sys/pal/hermit/mod.rs b/library/std/src/sys/pal/hermit/mod.rs index 55583b89d67..2c9aeb48044 100644 --- a/library/std/src/sys/pal/hermit/mod.rs +++ b/library/std/src/sys/pal/hermit/mod.rs @@ -49,9 +49,7 @@ pub fn unsupported_err() -> crate::io::Error { } pub fn abort_internal() -> ! { - unsafe { - hermit_abi::abort(); - } + unsafe { hermit_abi::abort() } } pub fn hashmap_random_keys() -> (u64, u64) { @@ -104,7 +102,7 @@ pub unsafe extern "C" fn runtime_entry( let result = main(argc as isize, argv); crate::sys::thread_local::destructors::run(); - hermit_abi::exit(result); + hermit_abi::exit(result) } #[inline] diff --git a/library/std/src/sys/pal/hermit/os.rs b/library/std/src/sys/pal/hermit/os.rs index 9631dac658c..50ce2f57b30 100644 --- a/library/std/src/sys/pal/hermit/os.rs +++ b/library/std/src/sys/pal/hermit/os.rs @@ -190,9 +190,7 @@ pub fn home_dir() -> Option { } pub fn exit(code: i32) -> ! { - unsafe { - hermit_abi::exit(code); - } + unsafe { hermit_abi::exit(code) } } pub fn getpid() -> u32 { -- cgit 1.4.1-3-g733a5