Unverified Commit 5840dc78 authored by bors[bot]'s avatar bors[bot] Committed by GitHub
Browse files

Merge #34



34: Allocator: Use ZST instead of reference r=stlankes a=mkroening
Co-authored-by: Martin Kröning's avatarMartin Kröning <mkroening@posteo.net>
parents 7322a58e 1e0695e3
Pipeline #567348 passed with stages
in 1 minute and 58 seconds
......@@ -46,7 +46,7 @@ extern "C" {
}
#[global_allocator]
static ALLOCATOR: &mm::allocator::Allocator = &mm::allocator::Allocator;
static ALLOCATOR: mm::allocator::Allocator = mm::allocator::Allocator;
// FUNCTIONS
pub unsafe fn sections_init() {
......
......@@ -46,7 +46,7 @@ static mut ALLOCATOR_INFO: AllocatorInfo = AllocatorInfo::new();
pub struct Allocator;
unsafe impl<'a> GlobalAlloc for &'a Allocator {
unsafe impl GlobalAlloc for Allocator {
unsafe fn alloc(&self, layout: Layout) -> *mut u8 {
alloc_bootstrap(layout)
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment