about summary refs log tree commit diff
path: root/src/liballoc/alloc/tests.rs
diff options
context:
space:
mode:
authorTim Diekmann <tim.diekmann@3dvision.de>2020-03-26 17:11:47 +0100
committerTim Diekmann <tim.diekmann@3dvision.de>2020-03-26 17:11:47 +0100
commit2526accdd35c564eee80b6453a0b4965e6a76afd (patch)
tree76705d1a424dc9682b2e1c2599db6a0985d25335 /src/liballoc/alloc/tests.rs
parent56cbf2f22aeb6448acd7eb49e9b2554c80bdbf79 (diff)
downloadrust-2526accdd35c564eee80b6453a0b4965e6a76afd.tar.gz
rust-2526accdd35c564eee80b6453a0b4965e6a76afd.zip
Fix issues from review and unsoundness of `RawVec::into_box`
Diffstat (limited to 'src/liballoc/alloc/tests.rs')
-rw-r--r--src/liballoc/alloc/tests.rs6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/liballoc/alloc/tests.rs b/src/liballoc/alloc/tests.rs
index 6a2130a7192..34380ba41b4 100644
--- a/src/liballoc/alloc/tests.rs
+++ b/src/liballoc/alloc/tests.rs
@@ -8,17 +8,17 @@ use test::Bencher;
 fn allocate_zeroed() {
     unsafe {
         let layout = Layout::from_size_align(1024, 1).unwrap();
-        let (ptr, _) = Global
+        let memory = Global
             .alloc(layout.clone(), AllocInit::Zeroed)
             .unwrap_or_else(|_| handle_alloc_error(layout));
 
-        let mut i = ptr.cast::<u8>().as_ptr();
+        let mut i = memory.ptr().cast::<u8>().as_ptr();
         let end = i.add(layout.size());
         while i < end {
             assert_eq!(*i, 0);
             i = i.offset(1);
         }
-        Global.dealloc(ptr, layout);
+        Global.dealloc(memory);
     }
 }