Skip to content

Commit b8774af

Browse files
committed
Auto merge of rust-lang#97147 - Mark-Simulacrum:stage0-bump, r=pietroalbini
stage0 bootstrap bump r? `@pietroalbini`
2 parents 6878049 + c3b5622 commit b8774af

File tree

3 files changed

+0
-4
lines changed

3 files changed

+0
-4
lines changed

core/src/lib.rs

-1
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,6 @@
171171
#![feature(const_precise_live_drops)]
172172
#![feature(const_refs_to_cell)]
173173
#![feature(decl_macro)]
174-
#![cfg_attr(bootstrap, feature(derive_default_enum))]
175174
#![feature(deprecated_suggestion)]
176175
#![feature(doc_cfg)]
177176
#![feature(doc_notable_trait)]

core/src/slice/mod.rs

-1
Original file line numberDiff line numberDiff line change
@@ -4016,7 +4016,6 @@ impl<T> [T] {
40164016
}
40174017
}
40184018

4019-
#[cfg(not(bootstrap))]
40204019
impl<T, const N: usize> [[T; N]] {
40214020
/// Takes a `&[[T; N]]`, and flattens it to a `&[T]`.
40224021
///

core/tests/slice.rs

-2
Original file line numberDiff line numberDiff line change
@@ -2518,15 +2518,13 @@ fn test_slice_from_ptr_range() {
25182518
}
25192519

25202520
#[test]
2521-
#[cfg(not(bootstrap))]
25222521
#[should_panic = "slice len overflow"]
25232522
fn test_flatten_size_overflow() {
25242523
let x = &[[(); usize::MAX]; 2][..];
25252524
let _ = x.flatten();
25262525
}
25272526

25282527
#[test]
2529-
#[cfg(not(bootstrap))]
25302528
#[should_panic = "slice len overflow"]
25312529
fn test_flatten_mut_size_overflow() {
25322530
let x = &mut [[(); usize::MAX]; 2][..];

0 commit comments

Comments
 (0)