Restructure into sub-crates

Author: phil-opp

.cargo/config.toml

@@ -1,5 +1,2 @@
 [target.x86_64-unknown-uefi]
 runner = "cargo run -p runner"
-
-[alias]
-builder = "run --bin builder --features builder --quiet --"

.vscode/settings.json

@@ -5,15 +5,12 @@
     ],
     "rust-analyzer.cargo.target": "x86_64-unknown-uefi",
     "editor.formatOnSave": true,
-    "rust-analyzer.cargo.features": [
-        "uefi_bin"
-    ],
     "rust-analyzer.checkOnSave.enable": true,
     "rust-analyzer.checkOnSave.overrideCommand": [
         "cargo",
         "c",
-        "--features",
-        "uefi_bin",
+        "-p",
+        "bootloader-x86_64-uefi",
         "--target",
         "x86_64-unknown-uefi",
         "-Zbuild-std=core",

Cargo.lock

@@ -10,6 +10,9 @@ edition = "2021"
 [workspace]
 members = [
     "api",
+    "common",
+    "uefi",
+    "bios",
     "bios/first_stage",
     "tests/runner",
     "tests/test_kernels/default_settings",
@@ -18,46 +21,16 @@ members = [
 ]
 exclude = ["examples/basic", "examples/test_framework"]
 
-[[bin]]
-name = "builder"
-required-features = ["builder"]
-
-[[bin]]
-name = "bios"
-required-features = ["bios_bin"]
-
-[[bin]]
-name = "uefi"
-required-features = ["uefi_bin"]
 
 [dependencies]
-bootloader_api = { path = "api", version = "0.1.0" }
-xmas-elf = { version = "0.6.2", optional = true }
-x86_64 = { version = "0.14.7", optional = true, default-features = false, features = [
-    "instructions",
-    "inline_asm",
-] }
-usize_conversions = { version = "0.2.0", optional = true }
-bit_field = { version = "0.10.0", optional = true }
-log = { version = "0.4.8", optional = true }
-uefi = { version = "0.13.0", optional = true }
-argh = { version = "0.1.3", optional = true }
-displaydoc = { version = "0.1.7", optional = true }
-conquer-once = { version = "0.2.1", optional = true, default-features = false }
-spinning_top = { version = "0.2.1", optional = true }
-anyhow = { version = "1.0.32", optional = true }
-llvm-tools = { version = "0.1.1", optional = true }
-thiserror = { version = "1.0.20", optional = true }
-json = { version = "0.12.4", optional = true }
-rsdp = { version = "1.0.0", optional = true }
-fatfs = { version = "0.3.4", optional = true }
-gpt = { version = "3.0.0", optional = true }
-
-[dependencies.font8x8]
-version = "0.2.5"
-default-features = false
-features = ["unicode"]
-optional = true
+argh = "0.1.3"
+displaydoc = "0.1.7"
+anyhow = "1.0.32"
+llvm-tools = "0.1.1"
+thiserror = "1.0.20"
+json = "0.12.4"
+fatfs = "0.3.4"
+gpt = "3.0.0"
 
 [build-dependencies]
 llvm-tools-build = { version = "0.1", optional = true, package = "llvm-tools" }
@@ -66,34 +39,6 @@ serde = { version = "1.0", features = ["derive"], optional = true }
 quote = { version = "1.0", optional = true }
 proc-macro2 = { version = "1.0", optional = true }
 
-[features]
-default = []
-builder = [
-    "argh",
-    "thiserror",
-    "displaydoc",
-    "anyhow",
-    "llvm-tools",
-    "json",
-    "fatfs",
-    "gpt",
-]
-bios_bin = ["binary", "rsdp"]
-uefi_bin = ["binary", "uefi"]
-binary = [
-    "llvm-tools-build",
-    "x86_64",
-    "toml",
-    "xmas-elf",
-    "usize_conversions",
-    "log",
-    "conquer-once",
-    "spinning_top",
-    "serde",
-    "font8x8",
-    "quote",
-    "proc-macro2",
-]
 
 [profile.dev]
 panic = "abort"

Cargo.toml

@@ -0,0 +1,14 @@
+[package]
+name = "bootloader-x86_64-bios"
+version = "0.1.0"
+edition = "2021"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+bootloader_api = { version = "0.1.0", path = "../api" }
+bootloader-x86_64-common = { version = "0.1.0", path = "../common" }
+log = "0.4.14"
+x86_64 = "0.14.8"
+usize_conversions = "0.2.0"
+rsdp = "2.0.0"