OpenE2K/rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix bug with assert!() calling the wrong edition of panic!().

Browse Source 
The span of `panic!` produced by the `assert` macro did not carry the
right edition. This changes `assert` to call the right version.
This commit is contained in:
Mara Bos 2021-02-01 23:08:22 +01:00
parent 5022ad0127
commit ed1de99b4f
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
compiler/rustc_builtin_macros/src/assert.rs
View File

@ -29,11 +29,11 @@ pub fn expand_assert<'cx>(
let panic_call = if let Some(tokens) = custom_message { let panic_call = if let Some(tokens) = custom_message {
let path = if span.rust_2021() { let path = if span.rust_2021() {
// On edition 2021, we always call `$crate::panic!()`. // On edition 2021, we always call `$crate::panic::panic_2021!()`.
Path { Path {
span: sp, span: sp,
segments: cx segments: cx
.std_path(&[sym::panic]) .std_path(&[sym::panic, sym::panic_2021])
.into_iter() .into_iter()
.map(|ident| PathSegment::from_ident(ident)) .map(|ident| PathSegment::from_ident(ident))
.collect(), .collect(),

2
library/core/src/macros/mod.rs
View File

@ -1234,7 +1234,7 @@ pub(crate) mod builtin {
#[rustc_builtin_macro] #[rustc_builtin_macro]
#[macro_export] #[macro_export]
#[rustc_diagnostic_item = "assert_macro"] #[rustc_diagnostic_item = "assert_macro"]
#[allow_internal_unstable(core_panic)] #[allow_internal_unstable(core_panic, edition_panic)]
macro_rules! assert { macro_rules! assert {
($cond:expr $(,)?) => {{ /* compiler built-in */ }}; ($cond:expr $(,)?) => {{ /* compiler built-in */ }};
($cond:expr, $($arg:tt)+) => {{ /* compiler built-in */ }}; ($cond:expr, $($arg:tt)+) => {{ /* compiler built-in */ }};