Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

alloc: align with AllocRef trait changes in nightly #1

Merged
merged 1 commit into from
Oct 1, 2020
Merged

alloc: align with AllocRef trait changes in nightly #1

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/alloc.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ impl Allocator {

unsafe impl core::alloc::AllocRef for Allocator {
fn alloc(
&mut self,
&self,
layout: core::alloc::Layout,
) -> Result<core::ptr::NonNull<[u8]>, core::alloc::AllocErr> {
// We forward the allocation request to `AllocatePool()`. This takes the memory-type and
Expand Down Expand Up @@ -165,7 +165,7 @@ unsafe impl core::alloc::AllocRef for Allocator {
).unwrap())
}

unsafe fn dealloc(&mut self, ptr: core::ptr::NonNull<u8>, layout: core::alloc::Layout) {
unsafe fn dealloc(&self, ptr: core::ptr::NonNull<u8>, layout: core::alloc::Layout) {
if layout.size() != 0 {
// The spec allows returning errors from `FreePool()`. However, it
// must serve any valid requests. Only `INVALID_PARAMETER` is
Expand Down