Back to one crate. idk what I was doing earlier

Cargo.lock

@@ -68,13 +68,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b7ac824320a75a52197e8f2d787f6a38b6718bb6897a35142d749af3c0e8f4fe"
 
 [[package]]
-name = "intbits"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5170c2c8ecda29c1bccb9d95ccbe107bc75fa084dc0c9c6087e719f9d46330e5"
-
-[[package]]
-name = "kernel"
+name = "gila"
 version = "0.3.2"
 dependencies = [
  "acid_alloc",
@@ -82,7 +76,6 @@ dependencies = [
  "flagset",
  "intbits",
  "lazy_static",
- "libgila",
  "limine",
  "num-derive",
  "num-traits",
@@ -93,6 +86,12 @@ dependencies = [
  "x86_64",
 ]
 
+[[package]]
+name = "intbits"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5170c2c8ecda29c1bccb9d95ccbe107bc75fa084dc0c9c6087e719f9d46330e5"
+
 [[package]]
 name = "lazy_static"
 version = "1.5.0"
@@ -102,14 +101,6 @@ dependencies = [
  "spin 0.9.8",
 ]
 
-[[package]]
-name = "libgila"
-version = "0.1.0"
-dependencies = [
- "num-derive",
- "num-traits",
-]
-
 [[package]]
 name = "limine"
 version = "0.6.5"

Cargo.toml

@@ -1,3 +1,33 @@
-[workspace]
-resolver = "3"
-members = ["kernel", "libgila"]
+[package]
+name = "gila"
+version = "0.3.2"
+edition = "2024"
+license = "MIT"
+
+[dependencies]
+acid_alloc = { version = "0.1.0", features = ["alloc"] }
+enumflags2 = "0.7.12"
+flagset = "0.4.7"
+intbits = "0.2.0"
+lazy_static = { version = "1.5.0", default-features = false, features = ["spin_no_std"] }
+limine = "0.6.5"
+num-derive = "0.4.2"
+num-traits = { version = "0.2.19", default-features = false }
+once_cell = { version = "1.21.3", default-features = false, features = ["alloc", "critical-section"] }
+spin = "0.12.1"
+talc = "4.4.3"
+
+[target.'cfg(target_arch = "x86_64")'.dependencies]
+x86_64 = "0.15.2"
+raw-cpuid = "11.6.0"
+
+[[bin]]
+name = "kernel"
+path = "src/kernel/main.rs"
+test = false
+doctest = false
+bench = false
+
+[lib]
+name = "libgila"
+path = "src/lib/lib.rs"

Makefile.toml

@@ -76,20 +76,20 @@ command = "rm"
 args = ["-rf", "build/iso", "build/gila.iso"]
 
 [tasks.lib]
-condition = { files_modified = { input = ["libgila/src/**/*.rs"], output = ["${ARTIFACTDIR}/libgila.rlib"] }, fail_message = "(inputs unchanged)" }
+condition = { files_modified = { input = ["src/lib/**/*.rs"], output = ["${ARTIFACTDIR}/libgila.rlib"] }, fail_message = "(inputs unchanged)" }
 dependencies = []
 command = "cargo"
-args = ["build", "--profile", "${PROFILE}", "-p", "libgila"]
+args = ["build", "--profile", "${PROFILE}", "--lib"]
 
 [tasks.kernel]
 condition = { files_modified = { input = [
-    "kernel/src/**/*.rs", 
-    "kernel/src/**/*.ld", 
+    "src/kernel/**/*.rs", 
+    "src/kernel/**/*.ld", 
     "${ARTIFACTDIR}/libgila.rlib"
 ], output = ["${ARTIFACTDIR}/kernel"] }, fail_message = "(inputs unchanged)" }
 dependencies = ["lib"]
 command = "cargo"
-args = ["build", "--profile", "${PROFILE}", "-p", "kernel"]
+args = ["build", "--profile", "${PROFILE}", "--bin", "kernel"]
 
 [tasks.iso]
 condition = { files_modified = { input = [

build.rs

@@ -1,7 +1,7 @@
 fn main() {
     let arch = std::env::var("CARGO_CFG_TARGET_ARCH").unwrap();
     // Tell cargo to pass the linker script to the linker..
-    println!("cargo:rustc-link-arg=-Tkernel/src/arch/{arch}/linker.ld");
+    println!("cargo:rustc-link-arg=-Tsrc/kernel/arch/{arch}/linker.ld");
     // ..and to re-run if it changes.
-    println!("cargo:rerun-if-changed=kernel/src/arch/{arch}linker.ld");
-}
+    println!("cargo:rerun-if-changed=src/kernel/arch/{arch}linker.ld");
+}

kernel/Cargo.toml

@@ -1,31 +0,0 @@
-[package]
-name = "kernel"
-version = "0.3.2"
-edition = "2024"
-license = "MIT"
-
-[dependencies]
-acid_alloc = { version = "0.1.0", features = ["alloc"] }
-enumflags2 = "0.7.12"
-flagset = "0.4.7"
-intbits = "0.2.0"
-lazy_static = { version = "1.5.0", default-features = false, features = ["spin_no_std"] }
-limine = "0.6.5"
-num-derive = "0.4.2"
-num-traits = { version = "0.2.19", default-features = false }
-once_cell = { version = "1.21.3", default-features = false, features = ["alloc", "critical-section"] }
-spin = "0.12.1"
-talc = "4.4.3"
-
-libgila = { path = "../libgila" }
-
-[target.'cfg(target_arch = "x86_64")'.dependencies]
-x86_64 = "0.15.2"
-raw-cpuid = "11.6.0"
-
-[[bin]]
-name = "kernel"
-path = "src/main.rs"
-test = false
-doctest = false
-bench = false