Split kernel-lib/alloc.rs to kernel-lib/allocator/

kernel-lib/src/allocator.rs

@@ -0,0 +1,2 @@
+pub mod fixed_length_allocator;
+pub use fixed_length_allocator::FixedLengthAllocator;

kernel-lib/src/allocator/lib.rs

@@ -0,0 +1 @@
+struct A(FixedLengthAllocator);

kernel-lib/src/lib.rs

@@ -3,7 +3,7 @@
 #![feature(allocator_api)]
 #![feature(generic_arg_infer)]
 
-pub mod alloc;
+pub mod allocator;
 pub mod futures;
 pub mod layer;
 pub mod logger;

kernel/src/alloc/alloc.rs

@@ -1,7 +1,7 @@
 extern crate alloc;
 use alloc::boxed::Box;
 use core::{alloc::LayoutError, mem::MaybeUninit};
-use kernel_lib::alloc::FixedLengthAllocator;
+use kernel_lib::allocator::FixedLengthAllocator;
 
 const HEAP_SIZE: usize = 1 << 21;
 
@@ -14,15 +14,17 @@ pub fn alloc_with_boundary<T>(
     alignment: usize,
     boundary: usize,
 ) -> Result<Box<MaybeUninit<T>, &'static GlobalAllocator>, LayoutError> {
-    kernel_lib::alloc::alloc_with_boundary(&ALLOCATOR, alignment, boundary)
+    kernel_lib::allocator::fixed_length_allocator::alloc_with_boundary(
+        &ALLOCATOR, alignment, boundary,
+    )
 }
 
 pub fn alloc_with_boundary_with_default_else<T>(
     alignment: usize,
     boundary: usize,
     default: impl FnOnce() -> T,
 ) -> Result<Box<T, &'static GlobalAllocator>, LayoutError> {
-    kernel_lib::alloc::alloc_with_boundary_with_default_else(
+    kernel_lib::allocator::fixed_length_allocator::alloc_with_boundary_with_default_else(
         &ALLOCATOR, alignment, boundary, default,
     )
 }
@@ -32,7 +34,9 @@ pub fn alloc_array_with_boundary<T>(
     alignment: usize,
     boundary: usize,
 ) -> Result<Box<[MaybeUninit<T>], &'static GlobalAllocator>, LayoutError> {
-    kernel_lib::alloc::alloc_array_with_boundary(&ALLOCATOR, len, alignment, boundary)
+    kernel_lib::allocator::fixed_length_allocator::alloc_array_with_boundary(
+        &ALLOCATOR, len, alignment, boundary,
+    )
 }
 
 pub fn alloc_array_with_boundary_with_default_else<T>(
@@ -41,7 +45,7 @@ pub fn alloc_array_with_boundary_with_default_else<T>(
     boundary: usize,
     default: impl Fn() -> T,
 ) -> Result<Box<[T], &'static GlobalAllocator>, LayoutError> {
-    kernel_lib::alloc::alloc_array_with_boundary_with_default_else(
+    kernel_lib::allocator::fixed_length_allocator::alloc_array_with_boundary_with_default_else(
         &ALLOCATOR, len, alignment, boundary, default,
     )
 }