Skip to content

Commit e18eaf1

Browse files
authored
Unrolled build for rust-lang#126096
Rollup merge of rust-lang#126096 - c410-f3r:tests-tests-tests, r=jhpratt [RFC-2011] Allow `core_intrinsics` when activated Fix rust-lang#120612
2 parents 98489f2 + a8084dc commit e18eaf1

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

compiler/rustc_builtin_macros/src/assert/context.rs

-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@ impl<'cx, 'a> Context<'cx, 'a> {
5757
/// Builds the whole `assert!` expression. For example, `let elem = 1; assert!(elem == 1);` expands to:
5858
///
5959
/// ```rust
60-
/// #![feature(generic_assert_internals)]
6160
/// let elem = 1;
6261
/// {
6362
/// #[allow(unused_imports)]

library/core/src/macros/mod.rs

+6-1
Original file line numberDiff line numberDiff line change
@@ -1569,7 +1569,12 @@ pub(crate) mod builtin {
15691569
#[rustc_builtin_macro]
15701570
#[macro_export]
15711571
#[rustc_diagnostic_item = "assert_macro"]
1572-
#[allow_internal_unstable(panic_internals, edition_panic, generic_assert_internals)]
1572+
#[allow_internal_unstable(
1573+
core_intrinsics,
1574+
panic_internals,
1575+
edition_panic,
1576+
generic_assert_internals
1577+
)]
15731578
macro_rules! assert {
15741579
($cond:expr $(,)?) => {{ /* compiler built-in */ }};
15751580
($cond:expr, $($arg:tt)+) => {{ /* compiler built-in */ }};

0 commit comments

Comments
 (0)