diff options
| author | Jubilee <46493976+workingjubilee@users.noreply.github.com> | 2024-06-06 14:46:25 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-06-06 14:46:25 -0700 |
| commit | efd8959ab1bf30c098917af144db72ad08175bc6 (patch) | |
| tree | 33796f676f72ab1ec4292f6376f3cb71780d7c6e | |
| parent | 7e81738d5cff93329dd5cbd530380b88f8d54d2c (diff) | |
| parent | a8084dcec1d2d36c286ca0e2c384e7bf5cfeffce (diff) | |
| download | rust-efd8959ab1bf30c098917af144db72ad08175bc6.tar.gz rust-efd8959ab1bf30c098917af144db72ad08175bc6.zip | |
Rollup merge of #126096 - c410-f3r:tests-tests-tests, r=jhpratt
[RFC-2011] Allow `core_intrinsics` when activated Fix #120612
| -rw-r--r-- | compiler/rustc_builtin_macros/src/assert/context.rs | 1 | ||||
| -rw-r--r-- | library/core/src/macros/mod.rs | 7 |
2 files changed, 6 insertions, 2 deletions
diff --git a/compiler/rustc_builtin_macros/src/assert/context.rs b/compiler/rustc_builtin_macros/src/assert/context.rs index 78144226114..a98cb6f0f76 100644 --- a/compiler/rustc_builtin_macros/src/assert/context.rs +++ b/compiler/rustc_builtin_macros/src/assert/context.rs @@ -57,7 +57,6 @@ impl<'cx, 'a> Context<'cx, 'a> { /// Builds the whole `assert!` expression. For example, `let elem = 1; assert!(elem == 1);` expands to: /// /// ```rust - /// #![feature(generic_assert_internals)] /// let elem = 1; /// { /// #[allow(unused_imports)] diff --git a/library/core/src/macros/mod.rs b/library/core/src/macros/mod.rs index 2ddedfa37fe..0d4ca4d5f01 100644 --- a/library/core/src/macros/mod.rs +++ b/library/core/src/macros/mod.rs @@ -1569,7 +1569,12 @@ pub(crate) mod builtin { #[rustc_builtin_macro] #[macro_export] #[rustc_diagnostic_item = "assert_macro"] - #[allow_internal_unstable(panic_internals, edition_panic, generic_assert_internals)] + #[allow_internal_unstable( + core_intrinsics, + panic_internals, + edition_panic, + generic_assert_internals + )] macro_rules! assert { ($cond:expr $(,)?) => {{ /* compiler built-in */ }}; ($cond:expr, $($arg:tt)+) => {{ /* compiler built-in */ }}; |
