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:
commit
ea762f2bff
@ -873,7 +873,7 @@ fn alloc_one<T>(&mut self) -> Result<Unique<T>, AllocErr>
|
||||
{
|
||||
let k = Layout::new::<T>();
|
||||
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 {
|
||||
Err(AllocErr::invalid_input("zero-sized type invalid for alloc_one"))
|
||||
}
|
||||
|
27
src/test/run-pass/allocator-alloc-one.rs
Normal file
27
src/test/run-pass/allocator-alloc-one.rs
Normal 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);
|
||||
}
|
||||
}
|
Loading…
Reference in New Issue
Block a user