Rollup merge of #42901 - alexcrichton:alloc-one, r=sfackler

std: Fix implementation of `Alloc::alloc_one`

This had an accidental `u8 as *mut T` where it was intended to have just a
normal pointer-to-pointer cast.

Closes #42827
This commit is contained in:
Ariel Ben-Yehuda 2017-06-29 08:40:06 +00:00 committed by GitHub
commit ea762f2bff
2 changed files with 28 additions and 1 deletions

View File

@ -873,7 +873,7 @@ fn alloc_one<T>(&mut self) -> Result<Unique<T>, AllocErr>
{ {
let k = Layout::new::<T>(); let k = Layout::new::<T>();
if k.size() > 0 { if k.size() > 0 {
unsafe { self.alloc(k).map(|p|Unique::new(*p as *mut T)) } unsafe { self.alloc(k).map(|p| Unique::new(p as *mut T)) }
} else { } else {
Err(AllocErr::invalid_input("zero-sized type invalid for alloc_one")) Err(AllocErr::invalid_input("zero-sized type invalid for alloc_one"))
} }

View File

@ -0,0 +1,27 @@
// Copyright 2017 The Rust Project Developers. See the COPYRIGHT
// file at the top-level directory of this distribution and at
// http://rust-lang.org/COPYRIGHT.
//
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
// option. This file may not be copied, modified, or distributed
// except according to those terms.
#![feature(alloc, allocator_api, heap_api, unique)]
extern crate alloc;
use alloc::heap::HeapAlloc;
use alloc::allocator::Alloc;
fn main() {
unsafe {
let ptr = HeapAlloc.alloc_one::<i32>().unwrap_or_else(|e| {
HeapAlloc.oom(e)
});
*ptr.as_ptr() = 4;
assert_eq!(*ptr.as_ptr(), 4);
HeapAlloc.dealloc_one(ptr);
}
}