Skip to content

Commit

Permalink
no need to bootstrap
Browse files Browse the repository at this point in the history
  • Loading branch information
mark-i-m committed Dec 19, 2019
1 parent 2535435 commit 7d26811
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 9 deletions.
2 changes: 1 addition & 1 deletion src/liballoc/lib.rs
Expand Up @@ -85,7 +85,7 @@
#![feature(const_generic_impls_guard)]
#![feature(const_generics)]
#![feature(const_in_array_repeat_expressions)]
#![cfg_attr(not(bootstrap), feature(const_if_match))]
#![feature(const_if_match)]
#![feature(cow_is_borrowed)]
#![feature(dispatch_from_dyn)]
#![feature(core_intrinsics)]
Expand Down
9 changes: 1 addition & 8 deletions src/liballoc/raw_vec.rs
Expand Up @@ -52,14 +52,7 @@ impl<T, A: Alloc> RawVec<T, A> {
/// Like `new`, but parameterized over the choice of allocator for
/// the returned `RawVec`.
pub const fn new_in(a: A) -> Self {
// FIXME(mark-i-m): remove bootstrapping cfgs these after a cycle
let cap = {
#[cfg(not(bootstrap))]
{ if mem::size_of::<T>() == 0 { core::usize::MAX } else { 0 } }

#[cfg(bootstrap)]
[0, !0][(mem::size_of::<T>() == 0) as usize]
};
let cap = if mem::size_of::<T>() == 0 { core::usize::MAX } else { 0 };

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

0 comments on commit 7d26811

Please sign in to comment.