mathieu/os-rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add const-stability to panicking::panic_* fns

Browse source 
This allows us to use `panic!` and friends in a const-stable context
within libcore.
This commit is contained in:
Deadbeef 2021-12-17 21:52:22 +08:00
parent 390bb3406d
commit f52eb4ca8b
No known key found for this signature in database
GPG key ID: 6D017A96D8E6C2F9
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
library/core/src/panicking.rs
View file

@ -51,6 +51,7 @@ pub const fn panic(expr: &'static str) -> ! {
#[inline] #[inline]
#[track_caller] #[track_caller]
#[lang = "panic_str"] // needed for `non-fmt-panics` lint #[lang = "panic_str"] // needed for `non-fmt-panics` lint
#[rustc_const_unstable(feature = "core_panic", issue = "none")]
pub const fn panic_str(expr: &str) -> ! { pub const fn panic_str(expr: &str) -> ! {
panic_display(&expr); panic_display(&expr);
} }
@ -59,6 +60,7 @@ pub const fn panic_str(expr: &str) -> ! {
#[track_caller] #[track_caller]
#[lang = "panic_display"] // needed for const-evaluated panics #[lang = "panic_display"] // needed for const-evaluated panics
#[rustc_do_not_const_check] // hooked by const-eval #[rustc_do_not_const_check] // hooked by const-eval
#[rustc_const_unstable(feature = "core_panic", issue = "none")]
pub const fn panic_display<T: fmt::Display>(x: &T) -> ! { pub const fn panic_display<T: fmt::Display>(x: &T) -> ! {
panic_fmt(format_args!("{}", *x)); panic_fmt(format_args!("{}", *x));
} }
@ -89,6 +91,7 @@ fn panic_bounds_check(index: usize, len: usize) -> ! {
#[track_caller] #[track_caller]
#[lang = "panic_fmt"] // needed for const-evaluated panics #[lang = "panic_fmt"] // needed for const-evaluated panics
#[rustc_do_not_const_check] // hooked by const-eval #[rustc_do_not_const_check] // hooked by const-eval
#[rustc_const_unstable(feature = "core_panic", issue = "none")]
pub const fn panic_fmt(fmt: fmt::Arguments<'_>) -> ! { pub const fn panic_fmt(fmt: fmt::Arguments<'_>) -> ! {
if cfg!(feature = "panic_immediate_abort") { if cfg!(feature = "panic_immediate_abort") {
super::intrinsics::abort() super::intrinsics::abort()
@ -109,6 +112,7 @@ pub const fn panic_fmt(fmt: fmt::Arguments<'_>) -> ! {
/// This function is used instead of panic_fmt in const eval. /// This function is used instead of panic_fmt in const eval.
#[lang = "const_panic_fmt"] #[lang = "const_panic_fmt"]
#[rustc_const_unstable(feature = "core_panic", issue = "none")]
pub const fn const_panic_fmt(fmt: fmt::Arguments<'_>) -> ! { pub const fn const_panic_fmt(fmt: fmt::Arguments<'_>) -> ! {
if let Some(msg) = fmt.as_str() { if let Some(msg) = fmt.as_str() {
panic_str(msg); panic_str(msg);