From 15dd4bdaf460a2cacee812e66c0d8f2cd0cbb989 Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Tue, 15 Dec 2020 17:16:54 +0100 Subject: [PATCH] fix: do not require alloc crate Using `core::alloc` instead of `alloc::alloc` removes the need to include `alloc` in this library. This enables users of this crate to use `Heap` without `alloc` in `no_std`. --- src/hole.rs | 2 +- src/lib.rs | 8 +++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/hole.rs b/src/hole.rs index aee2abe..a1db1c5 100644 --- a/src/hole.rs +++ b/src/hole.rs @@ -1,4 +1,4 @@ -use alloc::alloc::Layout; +use core::alloc::Layout; use core::mem::{align_of, size_of}; use core::ptr::NonNull; diff --git a/src/lib.rs b/src/lib.rs index aa76463..99a4378 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -12,13 +12,11 @@ extern crate std; #[cfg(feature = "use_spin")] extern crate spinning_top; -extern crate alloc; - -use alloc::alloc::Layout; -#[cfg(feature = "alloc_ref")] -use alloc::alloc::{AllocError, Allocator}; #[cfg(feature = "use_spin")] use core::alloc::GlobalAlloc; +use core::alloc::Layout; +#[cfg(feature = "alloc_ref")] +use core::alloc::{AllocError, Allocator}; use core::mem; #[cfg(feature = "use_spin")] use core::ops::Deref;