Merge pull request #233 from JohnTitor/alloc-removal

Follow-up for rust-lang/rust#74850
rust-lang · Aug 18, 2020 · 685ca70 · 685ca70
2 parents bfe1ab9 + be0687a
commit 685ca70
Showing 1 changed file with 2 additions and 6 deletions.
diff --git a/src/vec-final.md b/src/vec-final.md
@@ -10,12 +10,10 @@ use std::mem;
 use std::ops::{Deref, DerefMut};
 use std::marker::PhantomData;
 use std::alloc::{
-    AllocInit,
     AllocRef,
     Global,
     GlobalAlloc,
     Layout,
-    ReallocPlacement,
     handle_alloc_error
 };
 
@@ -42,16 +40,14 @@ impl<T> RawVec<T> {
             assert!(elem_size != 0, "capacity overflow");
 
             let (new_cap, ptr) = if self.cap == 0 {
-                let ptr = Global.alloc(Layout::array::<T>(1).unwrap(), AllocInit::Uninitialized);
+                let ptr = Global.alloc(Layout::array::<T>(1).unwrap());
                 (1, ptr)
             } else {
                 let new_cap = 2 * self.cap;
                 let c: NonNull<T> = self.ptr.into();
                 let ptr = Global.grow(c.cast(),
                                       Layout::array::<T>(self.cap).unwrap(),
-                                      Layout::array::<T>(new_cap).unwrap().size(),
-                                      ReallocPlacement::MayMove,
-                                      AllocInit::Uninitialized);
+                                      Layout::array::<T>(new_cap).unwrap().size());
                 (new_cap, ptr)
             };