workspace: adapted files

Author: phip1611

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"]

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 }

uefi/Cargo.toml

@@ -4,14 +4,6 @@ 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"]

uefi/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::{

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}"
     );