about summary refs log tree commit diff
path: root/src/liballoc/alloc.rs
diff options
context:
space:
mode:
authorTim Diekmann <tim.diekmann@3dvision.de>2020-03-29 01:47:05 +0100
committerTim Diekmann <tim.diekmann@3dvision.de>2020-03-29 01:47:05 +0100
commit3ade8ae6608a9d371580e5e8d68c26a4e3e897fb (patch)
tree49607964c87f5f8fe647160c42b178226e2b570a /src/liballoc/alloc.rs
parentbf6a46db3129b0bf31dc67f06af2e52ece52701a (diff)
downloadrust-3ade8ae6608a9d371580e5e8d68c26a4e3e897fb.tar.gz
rust-3ade8ae6608a9d371580e5e8d68c26a4e3e897fb.zip
Implement `init` and `init_offset` on `AllocInit` and mark it unsafe
Diffstat (limited to 'src/liballoc/alloc.rs')
-rw-r--r--src/liballoc/alloc.rs8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/liballoc/alloc.rs b/src/liballoc/alloc.rs
index 67927629ed3..66575e3ef55 100644
--- a/src/liballoc/alloc.rs
+++ b/src/liballoc/alloc.rs
@@ -214,12 +214,12 @@ unsafe impl AllocRef for Global {
                 self.alloc(new_layout, init)
             }
             ReallocPlacement::MayMove => {
-                // `realloc` probably checks for `new_size > old_size` or something similar.
+                // `realloc` probably checks for `new_size > size` or something similar.
                 intrinsics::assume(new_size > size);
                 let ptr = realloc(ptr.as_ptr(), layout, new_size);
-                let mut memory =
+                let memory =
                     MemoryBlock { ptr: NonNull::new(ptr).ok_or(AllocErr)?, size: new_size };
-                memory.init_offset(init, size);
+                init.init_offset(memory, size);
                 Ok(memory)
             }
         }
@@ -250,7 +250,7 @@ unsafe impl AllocRef for Global {
                 Ok(MemoryBlock { ptr: layout.dangling(), size: 0 })
             }
             ReallocPlacement::MayMove => {
-                // `realloc` probably checks for `new_size < old_size` or something similar.
+                // `realloc` probably checks for `new_size < size` or something similar.
                 intrinsics::assume(new_size < size);
                 let ptr = realloc(ptr.as_ptr(), layout, new_size);
                 Ok(MemoryBlock { ptr: NonNull::new(ptr).ok_or(AllocErr)?, size: new_size })