bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Shorten lifetime of panic temporaries in panic_fmt case

Browse source
This commit is contained in:
David Tolnay 2022-11-07 13:23:16 -08:00
parent cbee2a1ec4
commit cb109a672d
No known key found for this signature in database
GPG key ID: F9BA143B95FF6D82
5 changed files with 24 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

16
library/core/src/panic.rs
View file

@ -35,9 +35,11 @@ pub macro panic_2015 {
("{}", $arg:expr $(,)?) => (
$crate::panicking::panic_display(&$arg)
),
($fmt:expr, $($arg:tt)+) => (
$crate::panicking::panic_fmt($crate::const_format_args!($fmt, $($arg)+))
),
($fmt:expr, $($arg:tt)+) => ({
// Semicolon to prevent temporaries inside the formatting machinery from
// being considered alive in the caller after the panic_fmt call.
$crate::panicking::panic_fmt($crate::const_format_args!($fmt, $($arg)+));
}),
}
#[doc(hidden)]
@ -53,9 +55,11 @@ pub macro panic_2021 {
("{}", $arg:expr $(,)?) => (
$crate::panicking::panic_display(&$arg)
),
($($t:tt)+) => (
$crate::panicking::panic_fmt($crate::const_format_args!($($t)+))
),
($($t:tt)+) => ({
// Semicolon to prevent temporaries inside the formatting machinery from
// being considered alive in the caller after the panic_fmt call.
$crate::panicking::panic_fmt($crate::const_format_args!($($t)+));
}),
}
#[doc(hidden)]