rust-osdev · nicholasbishop · Nov 17, 2022 · Nov 13, 2022 · Nov 13, 2022
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,40 +1,5 @@
-[package]
-name = "uefi"
-version = "0.18.0"
-authors = ["Gabriel Majeri <[email protected]>"]
-readme = "README.md"
-edition = "2021"
-exclude = [
-    ".cargo/**",
-    "template/**",
-    "uefi-macros/**",
-    "uefi-services/**",
-    "uefi-test-runner/**",
-    "xtask/**",
-]
-description = "Safe and easy-to-use wrapper for building UEFI apps"
-repository = "https://github.com/rust-osdev/uefi-rs"
-keywords = ["uefi", "efi"]
-categories = ["embedded", "no-std", "api-bindings"]
-license = "MPL-2.0"
-
-[features]
-default = ["panic-on-logger-errors"]
-alloc = []
-exts = []
-logger = []
-# Ignore text output errors in logger as a workaround for firmware issues that
-# were observed on the VirtualBox UEFI implementation (see uefi-rs#121).
-# In those cases, this feature can be excluded by removing the default features.
-panic-on-logger-errors = []
-
-[dependencies]
-bitflags = "1.3.1"
-log = { version = "0.4.5", default-features = false }
-ucs2 = "0.3.2"
-uefi-macros = "0.9.0"
-
 [workspace]
+resolver = "2"
 members = [
     "template",
     "uefi-macros",
@@ -44,10 +9,6 @@ members = [
 ]
 
 [patch.crates-io]
+uefi = { path = "uefi" }
 uefi-macros = { path = "uefi-macros" }
 uefi-services = { path = "uefi-services" }
-uefi = { path = "." }
-
-[package.metadata.docs.rs]
-all-features = true
-rustdoc-args = ["--cfg", "docsrs"]
diff --git a/uefi-test-runner/Cargo.toml b/uefi-test-runner/Cargo.toml
@@ -6,7 +6,7 @@ publish = false
 edition = "2021"
 
 [dependencies]
-uefi = { path = "..", features = ['exts'] }
+uefi = { path = "../uefi", features = ['exts'] }
 uefi-services = { path = "../uefi-services" }
 
 log = { version = "0.4.11", default-features = false }

diff --git a/uefi/Cargo.toml b/uefi/Cargo.toml
@@ -0,0 +1,31 @@
+[package]
+name = "uefi"
+version = "0.18.0"
+authors = ["Gabriel Majeri <[email protected]>"]
+readme = "README.md"
+edition = "2021"
+description = "Safe and easy-to-use wrapper for building UEFI apps"
+repository = "https://github.com/rust-osdev/uefi-rs"
+keywords = ["uefi", "efi"]
+categories = ["embedded", "no-std", "api-bindings"]
+license = "MPL-2.0"
+
+[features]
+default = ["panic-on-logger-errors"]
+alloc = []
+exts = []
+logger = []
+# Ignore text output errors in logger as a workaround for firmware issues that
+# were observed on the VirtualBox UEFI implementation (see uefi-rs#121).
+# In those cases, this feature can be excluded by removing the default features.
+panic-on-logger-errors = []
+
+[dependencies]
+bitflags = "1.3.1"
+log = { version = "0.4.5", default-features = false }
+ucs2 = "0.3.2"
+uefi-macros = "0.9.0"
+
+[package.metadata.docs.rs]
+all-features = true
+rustdoc-args = ["--cfg", "docsrs"]
diff --git a/src/alloc.rs → uefi/src/alloc.rs b/src/alloc.rs → uefi/src/alloc.rs
diff --git a/src/data_types/chars.rs → uefi/src/data_types/chars.rs b/src/data_types/chars.rs → uefi/src/data_types/chars.rs
diff --git a/src/data_types/enums.rs → uefi/src/data_types/enums.rs b/src/data_types/enums.rs → uefi/src/data_types/enums.rs
diff --git a/src/data_types/guid.rs → uefi/src/data_types/guid.rs b/src/data_types/guid.rs → uefi/src/data_types/guid.rs
diff --git a/src/data_types/mod.rs → uefi/src/data_types/mod.rs b/src/data_types/mod.rs → uefi/src/data_types/mod.rs
diff --git a/src/data_types/owned_strs.rs → uefi/src/data_types/owned_strs.rs b/src/data_types/owned_strs.rs → uefi/src/data_types/owned_strs.rs
diff --git a/src/data_types/strs.rs → uefi/src/data_types/strs.rs b/src/data_types/strs.rs → uefi/src/data_types/strs.rs
diff --git a/src/data_types/unaligned_slice.rs → uefi/src/data_types/unaligned_slice.rs b/src/data_types/unaligned_slice.rs → uefi/src/data_types/unaligned_slice.rs
diff --git a/src/lib.rs → uefi/src/lib.rs b/src/lib.rs → uefi/src/lib.rs
diff --git a/src/logger.rs → uefi/src/logger.rs b/src/logger.rs → uefi/src/logger.rs
diff --git a/src/prelude.rs → uefi/src/prelude.rs b/src/prelude.rs → uefi/src/prelude.rs
diff --git a/src/proto/console/gop.rs → uefi/src/proto/console/gop.rs b/src/proto/console/gop.rs → uefi/src/proto/console/gop.rs
diff --git a/src/proto/console/mod.rs → uefi/src/proto/console/mod.rs b/src/proto/console/mod.rs → uefi/src/proto/console/mod.rs
diff --git a/src/proto/console/pointer/mod.rs → uefi/src/proto/console/pointer/mod.rs b/src/proto/console/pointer/mod.rs → uefi/src/proto/console/pointer/mod.rs
diff --git a/src/proto/console/serial.rs → uefi/src/proto/console/serial.rs b/src/proto/console/serial.rs → uefi/src/proto/console/serial.rs
diff --git a/src/proto/console/text/input.rs → uefi/src/proto/console/text/input.rs b/src/proto/console/text/input.rs → uefi/src/proto/console/text/input.rs
diff --git a/src/proto/console/text/mod.rs → uefi/src/proto/console/text/mod.rs b/src/proto/console/text/mod.rs → uefi/src/proto/console/text/mod.rs
diff --git a/src/proto/console/text/output.rs → uefi/src/proto/console/text/output.rs b/src/proto/console/text/output.rs → uefi/src/proto/console/text/output.rs
diff --git a/src/proto/debug/context.rs → uefi/src/proto/debug/context.rs b/src/proto/debug/context.rs → uefi/src/proto/debug/context.rs
diff --git a/src/proto/debug/exception.rs → uefi/src/proto/debug/exception.rs b/src/proto/debug/exception.rs → uefi/src/proto/debug/exception.rs
diff --git a/src/proto/debug/mod.rs → uefi/src/proto/debug/mod.rs b/src/proto/debug/mod.rs → uefi/src/proto/debug/mod.rs
diff --git a/src/proto/device_path/build.rs → uefi/src/proto/device_path/build.rs b/src/proto/device_path/build.rs → uefi/src/proto/device_path/build.rs
diff --git a/src/proto/device_path/device_path_gen.rs → .../src/proto/device_path/device_path_gen.rs b/src/proto/device_path/device_path_gen.rs → .../src/proto/device_path/device_path_gen.rs
@@ -3,7 +3,7 @@
 // This file was automatically generated with:
 // `cargo xtask gen-code`
 //
-// See //xtask/src/device_path/README.md for more details.
+// See `/xtask/src/device_path/README.md` for more details.
 
 use crate::data_types::UnalignedSlice;
 use crate::proto::device_path::{

diff --git a/src/proto/device_path/mod.rs → uefi/src/proto/device_path/mod.rs b/src/proto/device_path/mod.rs → uefi/src/proto/device_path/mod.rs
diff --git a/src/proto/device_path/text.rs → uefi/src/proto/device_path/text.rs b/src/proto/device_path/text.rs → uefi/src/proto/device_path/text.rs
diff --git a/src/proto/loaded_image.rs → uefi/src/proto/loaded_image.rs b/src/proto/loaded_image.rs → uefi/src/proto/loaded_image.rs
diff --git a/src/proto/media/block.rs → uefi/src/proto/media/block.rs b/src/proto/media/block.rs → uefi/src/proto/media/block.rs
diff --git a/src/proto/media/disk.rs → uefi/src/proto/media/disk.rs b/src/proto/media/disk.rs → uefi/src/proto/media/disk.rs
diff --git a/src/proto/media/file/dir.rs → uefi/src/proto/media/file/dir.rs b/src/proto/media/file/dir.rs → uefi/src/proto/media/file/dir.rs
diff --git a/src/proto/media/file/info.rs → uefi/src/proto/media/file/info.rs b/src/proto/media/file/info.rs → uefi/src/proto/media/file/info.rs
diff --git a/src/proto/media/file/mod.rs → uefi/src/proto/media/file/mod.rs b/src/proto/media/file/mod.rs → uefi/src/proto/media/file/mod.rs
diff --git a/src/proto/media/file/regular.rs → uefi/src/proto/media/file/regular.rs b/src/proto/media/file/regular.rs → uefi/src/proto/media/file/regular.rs
diff --git a/src/proto/media/fs.rs → uefi/src/proto/media/fs.rs b/src/proto/media/fs.rs → uefi/src/proto/media/fs.rs
diff --git a/src/proto/media/mod.rs → uefi/src/proto/media/mod.rs b/src/proto/media/mod.rs → uefi/src/proto/media/mod.rs
diff --git a/src/proto/media/partition.rs → uefi/src/proto/media/partition.rs b/src/proto/media/partition.rs → uefi/src/proto/media/partition.rs
diff --git a/src/proto/mod.rs → uefi/src/proto/mod.rs b/src/proto/mod.rs → uefi/src/proto/mod.rs
diff --git a/src/proto/network/mod.rs → uefi/src/proto/network/mod.rs b/src/proto/network/mod.rs → uefi/src/proto/network/mod.rs
diff --git a/src/proto/network/pxe.rs → uefi/src/proto/network/pxe.rs b/src/proto/network/pxe.rs → uefi/src/proto/network/pxe.rs
diff --git a/src/proto/pi/mod.rs → uefi/src/proto/pi/mod.rs b/src/proto/pi/mod.rs → uefi/src/proto/pi/mod.rs
diff --git a/src/proto/pi/mp.rs → uefi/src/proto/pi/mp.rs b/src/proto/pi/mp.rs → uefi/src/proto/pi/mp.rs
diff --git a/src/proto/rng.rs → uefi/src/proto/rng.rs b/src/proto/rng.rs → uefi/src/proto/rng.rs
diff --git a/src/proto/security/memory_protection.rs → uefi/src/proto/security/memory_protection.rs b/src/proto/security/memory_protection.rs → uefi/src/proto/security/memory_protection.rs
diff --git a/src/proto/security/mod.rs → uefi/src/proto/security/mod.rs b/src/proto/security/mod.rs → uefi/src/proto/security/mod.rs
diff --git a/src/proto/shim/mod.rs → uefi/src/proto/shim/mod.rs b/src/proto/shim/mod.rs → uefi/src/proto/shim/mod.rs
diff --git a/src/proto/string/mod.rs → uefi/src/proto/string/mod.rs b/src/proto/string/mod.rs → uefi/src/proto/string/mod.rs
diff --git a/src/proto/string/unicode_collation.rs → uefi/src/proto/string/unicode_collation.rs b/src/proto/string/unicode_collation.rs → uefi/src/proto/string/unicode_collation.rs
diff --git a/src/result/error.rs → uefi/src/result/error.rs b/src/result/error.rs → uefi/src/result/error.rs
diff --git a/src/result/mod.rs → uefi/src/result/mod.rs b/src/result/mod.rs → uefi/src/result/mod.rs
diff --git a/src/result/status.rs → uefi/src/result/status.rs b/src/result/status.rs → uefi/src/result/status.rs
diff --git a/src/table/boot.rs → uefi/src/table/boot.rs b/src/table/boot.rs → uefi/src/table/boot.rs
diff --git a/src/table/cfg.rs → uefi/src/table/cfg.rs b/src/table/cfg.rs → uefi/src/table/cfg.rs
diff --git a/src/table/header.rs → uefi/src/table/header.rs b/src/table/header.rs → uefi/src/table/header.rs
diff --git a/src/table/mod.rs → uefi/src/table/mod.rs b/src/table/mod.rs → uefi/src/table/mod.rs
diff --git a/src/table/revision.rs → uefi/src/table/revision.rs b/src/table/revision.rs → uefi/src/table/revision.rs
diff --git a/src/table/runtime.rs → uefi/src/table/runtime.rs b/src/table/runtime.rs → uefi/src/table/runtime.rs
diff --git a/src/table/system.rs → uefi/src/table/system.rs b/src/table/system.rs → uefi/src/table/system.rs
diff --git a/xtask/src/device_path/mod.rs b/xtask/src/device_path/mod.rs
@@ -12,7 +12,7 @@ use syn::{File, Item};
 use util::rustfmt_string;
 
 const INPUT_PATH: &str = "xtask/src/device_path/spec.rs";
-const OUTPUT_PATH: &str = "src/proto/device_path/device_path_gen.rs";
+const OUTPUT_PATH: &str = "uefi/src/proto/device_path/device_path_gen.rs";
 
 fn gen_code_as_string(groups: &[NodeGroup]) -> Result<String> {
     let packed_modules = groups.iter().map(NodeGroup::gen_packed_module);
@@ -63,7 +63,7 @@ fn gen_code_as_string(groups: &[NodeGroup]) -> Result<String> {
 // This file was automatically generated with:
 // `cargo xtask gen-code`
 //
-// See //xtask/src/device_path/README.md for more details.
+// See `/xtask/src/device_path/README.md` for more details.
 
 {code}"
     );