Skip to content

Commit 70e49b6

Browse files
committed
Auto merge of #2720 - solid-rs:fix-solid-diverging, r=Amanieu
kmc-solid: Mark `abort`, `exit`, and `_Exit` as diverging This PR marks these functions as diverging (`fn (...) -> !`) for the [`*-kmc-solid_*`](https://doc.rust-lang.org/nightly/rustc/platform-support/kmc-solid.html) target, so that they are in line with the other targets (e.g., [`unix`](https://github.com/rust-lang/libc/blob/1708299c6b49e9fb7e7c34b9edd37c77e7af003c/src/unix/mod.rs#L496)).
2 parents 1708299 + c5c8f59 commit 70e49b6

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

src/solid/mod.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -535,8 +535,8 @@ extern "C" {
535535
pub fn strtod_l(arg1: *const c_char, arg2: *mut *mut c_char, arg3: locale_t) -> f64;
536536
pub fn strtof_l(arg1: *const c_char, arg2: *mut *mut c_char, arg3: locale_t) -> f32;
537537
pub fn strtold_l(arg1: *const c_char, arg2: *mut *mut c_char, arg3: locale_t) -> f64;
538-
pub fn _Exit(arg1: c_int);
539-
pub fn abort();
538+
pub fn _Exit(arg1: c_int) -> !;
539+
pub fn abort() -> !;
540540
pub fn abs(arg1: c_int) -> c_int;
541541
pub fn atexit(arg1: ::Option<unsafe extern "C" fn()>) -> c_int;
542542
pub fn atoi(arg1: *const c_char) -> c_int;
@@ -553,7 +553,7 @@ extern "C" {
553553
) -> *mut c_void;
554554
pub fn calloc(arg1: size_t, arg2: size_t) -> *mut c_void;
555555
pub fn div(arg1: c_int, arg2: c_int) -> div_t;
556-
pub fn exit(arg1: c_int);
556+
pub fn exit(arg1: c_int) -> !;
557557
pub fn free(arg1: *mut c_void);
558558
pub fn getenv(arg1: *const c_char) -> *mut c_char;
559559
pub fn labs(arg1: c_long) -> c_long;

0 commit comments

Comments
 (0)