diff options
| author | Christiaan Dirkx <christiaan@dirkx.email> | 2021-04-29 15:59:05 +0200 |
|---|---|---|
| committer | Christiaan Dirkx <christiaan@dirkx.email> | 2021-05-19 15:01:50 +0200 |
| commit | b987f74f05b3fbeb81eed27c43678dc71cdab8cf (patch) | |
| tree | 59b4c658c11ffeb49101a624e5bfbfe80d6c51c5 | |
| parent | 5b0908587e5e549051bcc6294b034049421de4f8 (diff) | |
| download | rust-b987f74f05b3fbeb81eed27c43678dc71cdab8cf.tar.gz rust-b987f74f05b3fbeb81eed27c43678dc71cdab8cf.zip | |
Remove `sys_common::util::abort`
| -rw-r--r-- | library/std/src/sys_common/rt.rs | 7 | ||||
| -rw-r--r-- | library/std/src/sys_common/util.rs | 10 |
2 files changed, 6 insertions, 11 deletions
diff --git a/library/std/src/sys_common/rt.rs b/library/std/src/sys_common/rt.rs index 9ce6aa7c369..e4c9b60594e 100644 --- a/library/std/src/sys_common/rt.rs +++ b/library/std/src/sys_common/rt.rs @@ -48,7 +48,12 @@ macro_rules! rterr { } macro_rules! rtabort { - ($($t:tt)*) => (crate::sys_common::util::abort(format_args!($($t)*))) + ($($t:tt)*) => { + { + rterr!("fatal runtime error: {}\n", format_args!($($t)*)); + crate::sys::abort_internal(); + } + } } macro_rules! rtassert { diff --git a/library/std/src/sys_common/util.rs b/library/std/src/sys_common/util.rs index 9f7c3bd8795..b8cae26d04c 100644 --- a/library/std/src/sys_common/util.rs +++ b/library/std/src/sys_common/util.rs @@ -9,16 +9,6 @@ pub fn dumb_print(args: fmt::Arguments<'_>) { } } -// Other platforms should use the appropriate platform-specific mechanism for -// aborting the process. If no platform-specific mechanism is available, -// crate::intrinsics::abort() may be used instead. The above implementations cover -// all targets currently supported by libstd. - -pub fn abort(args: fmt::Arguments<'_>) -> ! { - dumb_print(format_args!("fatal runtime error: {}\n", args)); - crate::sys::abort_internal(); -} - #[allow(dead_code)] // stack overflow detection not enabled on all platforms pub unsafe fn report_overflow() { dumb_print(format_args!( |