Rollup merge of rust-lang#89622 - m-ou-se:debug-assert-2021, r=estebank

workingjubilee · web-flow · commit 2c83aa04e017 · 2021-10-07T20:26:15.000-07:00
Use correct edition for panic in [debug_]assert!(). See rust-lang#88638 (comment)
diff --git a/core/src/macros/mod.rs b/core/src/macros/mod.rs
@@ -210,6 +210,7 @@ pub macro assert_matches {
 #[macro_export]
 #[stable(feature = "rust1", since = "1.0.0")]
 #[rustc_diagnostic_item = "debug_assert_macro"]
+#[allow_internal_unstable(edition_panic)]
 macro_rules! debug_assert {
     ($($arg:tt)*) => (if $crate::cfg!(debug_assertions) { $crate::assert!($($arg)*); })
 }

Original file line number	Diff line number	Diff line change
`@@ -210,6 +210,7 @@ pub macro assert_matches {`
`210`	`210`	`#[macro_export]`
`211`	`211`	`#[stable(feature = "rust1", since = "1.0.0")]`
`212`	`212`	`#[rustc_diagnostic_item = "debug_assert_macro"]`
	`213`	`+#[allow_internal_unstable(edition_panic)]`
`213`	`214`	`macro_rules! debug_assert {`
`214`	`215`	`($($arg:tt)) => (if $crate::cfg!(debug_assertions) { $crate::assert!($($arg)); })`
`215`	`216`	`}`