diff options
| author | Gary Guo <gary@garyguo.net> | 2021-09-11 03:44:02 +0100 |
|---|---|---|
| committer | Gary Guo <gary@garyguo.net> | 2021-10-19 15:02:21 +0100 |
| commit | 93701569573b367aaeaf659af154f5ae0d49af2b (patch) | |
| tree | 6cf9bc8ba68559e4fb43739911ce9136b9a50cbc /library/std/src/rt.rs | |
| parent | 148f456cc6fd12a19f45a75b1fd758605c657d0d (diff) | |
| download | rust-93701569573b367aaeaf659af154f5ae0d49af2b.tar.gz rust-93701569573b367aaeaf659af154f5ae0d49af2b.zip | |
Deduplicate panic_fmt
std's begin_panic_fmt and core's panic_fmt are duplicates. Merge them to declutter code and remove a lang item.
Diffstat (limited to 'library/std/src/rt.rs')
| -rw-r--r-- | library/std/src/rt.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/library/std/src/rt.rs b/library/std/src/rt.rs index 4d72aff0116..121c214780d 100644 --- a/library/std/src/rt.rs +++ b/library/std/src/rt.rs @@ -19,8 +19,8 @@ use crate::ffi::CString; // Re-export some of our utilities which are expected by other crates. -pub use crate::panicking::{begin_panic, begin_panic_fmt, panic_count}; -pub use core::panicking::panic_display; +pub use crate::panicking::{begin_panic, panic_count}; +pub use core::panicking::{panic_display, panic_fmt}; use crate::sync::Once; use crate::sys; |