Skip to content

Commit 7d26811

Browse files
committed
no need to bootstrap
1 parent 2535435 commit 7d26811

File tree

2 files changed

+2
-9
lines changed

2 files changed

+2
-9
lines changed

src/liballoc/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@
8585
#![feature(const_generic_impls_guard)]
8686
#![feature(const_generics)]
8787
#![feature(const_in_array_repeat_expressions)]
88-
#![cfg_attr(not(bootstrap), feature(const_if_match))]
88+
#![feature(const_if_match)]
8989
#![feature(cow_is_borrowed)]
9090
#![feature(dispatch_from_dyn)]
9191
#![feature(core_intrinsics)]

src/liballoc/raw_vec.rs

+1-8
Original file line numberDiff line numberDiff line change
@@ -52,14 +52,7 @@ impl<T, A: Alloc> RawVec<T, A> {
5252
/// Like `new`, but parameterized over the choice of allocator for
5353
/// the returned `RawVec`.
5454
pub const fn new_in(a: A) -> Self {
55-
// FIXME(mark-i-m): remove bootstrapping cfgs these after a cycle
56-
let cap = {
57-
#[cfg(not(bootstrap))]
58-
{ if mem::size_of::<T>() == 0 { core::usize::MAX } else { 0 } }
59-
60-
#[cfg(bootstrap)]
61-
[0, !0][(mem::size_of::<T>() == 0) as usize]
62-
};
55+
let cap = if mem::size_of::<T>() == 0 { core::usize::MAX } else { 0 };
6356

6457
// `Unique::empty()` doubles as "unallocated" and "zero-sized allocation".
6558
RawVec {

0 commit comments

Comments
 (0)