use const trick

2 files changed, 7 insertions, 24 deletions

diff --git a/src/liballoc/raw_vec.rs b/src/liballoc/raw_vec.rs
index fe18979fb51..6ca668fda59 100644
--- a/src/liballoc/raw_vec.rs
+++ b/src/liballoc/raw_vec.rs
@@ -54,28 +54,18 @@ pub struct RawVec<T, A: Alloc = Global> {
 }
 
 impl<T, A: Alloc> RawVec<T, A> {
-    // FIXME: this should be made `const` when `if` statements are allowed
     /// Like `new` but parameterized over the choice of allocator for
     /// the returned RawVec.
-    pub fn new_in(a: A) -> Self {
+    pub const fn new_in(a: A) -> Self {
         // !0 is usize::MAX. This branch should be stripped at compile time.
-        let cap = if mem::size_of::<T>() == 0 { !0 } else { 0 };
+        // FIXME(mark-i-m): use this line when `if`s are allowed in `const`
+        //let cap = if mem::size_of::<T>() == 0 { !0 } else { 0 };
 
         // Unique::empty() doubles as "unallocated" and "zero-sized allocation"
         RawVec {
             ptr: Unique::empty(),
-            cap,
-            a,
-        }
-    }
-
-    // FIXME: this should removed when `new_in` can be made `const`
-    /// Like `empty` but parametrized over the choice of allocator for the returned `RawVec`.
-    pub const fn empty_in(a: A) -> Self {
-        // Unique::empty() doubles as "unallocated" and "zero-sized allocation"
-        RawVec {
-            ptr: Unique::empty(),
-            cap: 0,
+            // FIXME(mark-i-m): use `cap` when ifs are allowed in const
+            cap: [0, !0][(mem::size_of::<T>() != 0) as usize],
             a,
         }
     }
@@ -132,17 +122,10 @@ impl<T> RawVec<T, Global> {
     /// RawVec with capacity 0. If T has 0 size, then it makes a
     /// RawVec with capacity `usize::MAX`. Useful for implementing
     /// delayed allocation.
-    pub fn new() -> Self {
+    pub const fn new() -> Self {
         Self::new_in(Global)
     }
 
-    // FIXME: this should removed when `new` can be made `const`
-    /// Create a `RawVec` with capcity 0 (on the system heap), regardless of `T`, without
-    /// allocating.
-    pub const fn empty() -> Self {
-        Self::empty_in(Global)
-    }
-
     /// Creates a RawVec (on the system heap) with exactly the
     /// capacity and alignment requirements for a `[T; cap]`. This is
     /// equivalent to calling RawVec::new when `cap` is 0 or T is
diff --git a/src/liballoc/vec.rs b/src/liballoc/vec.rs
index 415d75664ff..35d0a69a05a 100644
--- a/src/liballoc/vec.rs
+++ b/src/liballoc/vec.rs
@@ -325,7 +325,7 @@ impl<T> Vec<T> {
     #[rustc_const_unstable(feature = "const_vec_new")]
     pub const fn new() -> Vec<T> {
         Vec {
-            buf: RawVec::empty(),
+            buf: RawVec::new(),
             len: 0,
         }
     }