From 357c5dacee1015dc03583287d0c7a132d9fe7880 Mon Sep 17 00:00:00 2001 From: Ralf Jung Date: Sun, 16 Sep 2018 14:26:27 +0200 Subject: [PATCH] use mem::zeroed to make up ZST values --- src/liballoc/vec.rs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/liballoc/vec.rs b/src/liballoc/vec.rs index 02393a185b1d..7fc4453fec5b 100644 --- a/src/liballoc/vec.rs +++ b/src/liballoc/vec.rs @@ -2410,8 +2410,8 @@ impl Iterator for IntoIter { // same pointer. self.ptr = arith_offset(self.ptr as *const i8, 1) as *mut T; - // Read from a properly aligned pointer to make up a value of this ZST. - Some(ptr::read(NonNull::dangling().as_ptr())) + // Make up a value of this ZST. + Some(mem::zeroed()) } else { let old = self.ptr; self.ptr = self.ptr.offset(1); @@ -2450,8 +2450,8 @@ impl DoubleEndedIterator for IntoIter { // See above for why 'ptr.offset' isn't used self.end = arith_offset(self.end as *const i8, -1) as *mut T; - // Read from a properly aligned pointer to make up a value of this ZST. - Some(ptr::read(NonNull::dangling().as_ptr())) + // Make up a value of this ZST. + Some(mem::zeroed()) } else { self.end = self.end.offset(-1);