Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 1fc691e

Browse files
committedNov 29, 2024
Auto merge of #133533 - BoxyUwU:bump-boostrap, r=jieyouxu,Mark-Simulacrum
Bump boostrap compiler to new beta Currently failing due to something about the const stability checks and `panic!`. I'm not sure why though since I wasn't able to see any PRs merged in the past few days that would result in a `cfg(bootstrap)` that shouldn't be removed. cc `@RalfJung` #131349
2 parents d10a682 + 5fa483c commit 1fc691e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

81 files changed

+675
-924
lines changed
 

‎library/core/Cargo.toml

-2
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,6 @@ check-cfg = [
4343
'cfg(bootstrap)',
4444
'cfg(no_fp_fmt_parse)',
4545
'cfg(stdarch_intel_sde)',
46-
# #[cfg(bootstrap)] rtems
47-
'cfg(target_os, values("rtems"))',
4846
# core use #[path] imports to portable-simd `core_simd` crate
4947
# and to stdarch `core_arch` crate which messes-up with Cargo list
5048
# of declared features, we therefor expect any feature cfg

‎library/core/src/alloc/layout.rs

+4-5
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,6 @@ impl Layout {
157157
#[must_use = "this returns the minimum alignment, \
158158
without modifying the layout"]
159159
#[inline]
160-
#[cfg_attr(bootstrap, rustc_allow_const_fn_unstable(ptr_alignment_type))]
161160
pub const fn align(&self) -> usize {
162161
self.align.as_usize()
163162
}
@@ -255,7 +254,7 @@ impl Layout {
255254
/// `align` violates the conditions listed in [`Layout::from_size_align`].
256255
#[stable(feature = "alloc_layout_manipulation", since = "1.44.0")]
257256
#[rustc_const_unstable(feature = "const_alloc_layout", issue = "67521")]
258-
#[cfg_attr(not(bootstrap), rustc_const_stable_indirect)]
257+
#[rustc_const_stable_indirect]
259258
#[inline]
260259
pub const fn align_to(&self, align: usize) -> Result<Self, LayoutError> {
261260
if let Some(align) = Alignment::new(align) {
@@ -331,7 +330,7 @@ impl Layout {
331330
/// to the layout's current size.
332331
#[stable(feature = "alloc_layout_manipulation", since = "1.44.0")]
333332
#[rustc_const_unstable(feature = "const_alloc_layout", issue = "67521")]
334-
#[cfg_attr(not(bootstrap), rustc_const_stable_indirect)]
333+
#[rustc_const_stable_indirect]
335334
#[must_use = "this returns a new `Layout`, \
336335
without modifying the original"]
337336
#[inline]
@@ -431,7 +430,7 @@ impl Layout {
431430
/// ```
432431
#[stable(feature = "alloc_layout_manipulation", since = "1.44.0")]
433432
#[rustc_const_unstable(feature = "const_alloc_layout", issue = "67521")]
434-
#[cfg_attr(not(bootstrap), rustc_const_stable_indirect)]
433+
#[rustc_const_stable_indirect]
435434
#[inline]
436435
pub const fn extend(&self, next: Self) -> Result<(Self, usize), LayoutError> {
437436
let new_align = Alignment::max(self.align, next.align);
@@ -495,7 +494,7 @@ impl Layout {
495494
/// `isize::MAX`, returns `LayoutError`.
496495
#[stable(feature = "alloc_layout_manipulation", since = "1.44.0")]
497496
#[rustc_const_unstable(feature = "const_alloc_layout", issue = "67521")]
498-
#[cfg_attr(not(bootstrap), rustc_const_stable_indirect)]
497+
#[rustc_const_stable_indirect]
499498
#[inline]
500499
pub const fn array<T>(n: usize) -> Result<Self, LayoutError> {
501500
// Reduce the amount of code we need to monomorphize per `T`.
There was a problem loading the remainder of the diff.

0 commit comments

Comments
 (0)
Failed to load comments.