From c9cb5278408955d3f15d128c8ce208a7330eb6d1 Mon Sep 17 00:00:00 2001
From: mii443 <mii@sfc.wide.ad.jp>
Date: Thu, 3 Jul 2025 22:19:05 +0900
Subject: [PATCH] wip

---
 nel_os_kernel/src/main.rs                   | 8 ++------
 nel_os_kernel/src/{ => memory}/allocator.rs | 0
 nel_os_kernel/src/memory/mod.rs             | 1 +
 3 files changed, 3 insertions(+), 6 deletions(-)
 rename nel_os_kernel/src/{ => memory}/allocator.rs (100%)

diff --git a/nel_os_kernel/src/main.rs b/nel_os_kernel/src/main.rs
index 08e023d..76d0d38 100644
--- a/nel_os_kernel/src/main.rs
+++ b/nel_os_kernel/src/main.rs
@@ -3,7 +3,6 @@
 
 extern crate alloc;
 
-pub mod allocator;
 pub mod constant;
 pub mod cpuid;
 pub mod graphics;
@@ -11,8 +10,6 @@ pub mod logging;
 pub mod memory;
 pub mod serial;
 
-use alloc::vec;
-
 use core::arch::asm;
 use core::panic::PanicInfo;
 use core::ptr::addr_of;
@@ -20,10 +17,9 @@ use core::ptr::addr_of;
 use x86_64::{registers::control::Cr3, structures::paging::OffsetPageTable, VirtAddr};
 
 use crate::{
-    constant::{BANNER, KERNEL_STACK_SIZE, PKG_VERSION},
+    constant::{KERNEL_STACK_SIZE, PKG_VERSION},
     graphics::{FrameBuffer, FRAME_BUFFER},
-    memory::memory::BitmapMemoryTable,
-    memory::paging,
+    memory::{allocator, memory::BitmapMemoryTable, paging},
 };
 
 #[repr(C, align(16))]
diff --git a/nel_os_kernel/src/allocator.rs b/nel_os_kernel/src/memory/allocator.rs
similarity index 100%
rename from nel_os_kernel/src/allocator.rs
rename to nel_os_kernel/src/memory/allocator.rs
diff --git a/nel_os_kernel/src/memory/mod.rs b/nel_os_kernel/src/memory/mod.rs
index 84eb999..4cde3c5 100644
--- a/nel_os_kernel/src/memory/mod.rs
+++ b/nel_os_kernel/src/memory/mod.rs
@@ -1,2 +1,3 @@
+pub mod allocator;
 pub mod memory;
 pub mod paging;