refactor: move allocator into os::none module

Signed-off-by: Martin Kröning <martin.kroening@eonerc.rwth-aachen.de>
hermit-os · Apr 9, 2024 · 4271938 · 4271938
1 parent a7a71e0
commit 4271938
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 2 deletions.
diff --git a/src/main.rs b/src/main.rs
@@ -8,8 +8,6 @@
 #[macro_use]
 mod macros;
 
-#[cfg(target_os = "none")]
-mod allocator;
 mod arch;
 mod log;
 mod os;

diff --git a/src/allocator/bootstrap.rs → src/os/none/allocator/bootstrap.rs b/src/allocator/bootstrap.rs → src/os/none/allocator/bootstrap.rs
diff --git a/src/allocator/bump.rs → src/os/none/allocator/bump.rs b/src/allocator/bump.rs → src/os/none/allocator/bump.rs
diff --git a/src/allocator/mod.rs → src/os/none/allocator/mod.rs b/src/allocator/mod.rs → src/os/none/allocator/mod.rs
diff --git a/src/os/none/mod.rs b/src/os/none/mod.rs
@@ -1,3 +1,4 @@
+mod allocator;
 mod console;
 
 use core::fmt::Write;