Move mctp-usb-embassy into the workspace

mctp-usb-embassy now sets default-features = false for usb-embassy,
to avoid pulling in usbd-hid feature which previously prevented
builds (via ssmarshal
https://gitlab.com/robigalia/ssmarshal/-/issues/5).

mctp-estack workspace dependency is now default-features = false.

Signed-off-by: Matt Johnston <matt@codeconstruct.com.au>

Author: mkj

Cargo.lock

@@ -1,6 +1,5 @@
 [workspace]
-members = [ "pldm-fw-cli", "standalone" ]
-exclude = [ "mctp-usb-embassy" ]
+members = [ "mctp-usb-embassy", "pldm-fw-cli", "standalone" ]
 resolver = "2"
 
 [workspace.package]
@@ -20,7 +19,7 @@ enumset = "1.1"
 env_logger = "0.11.3"
 heapless = "0.8"
 log = "0.4"
-mctp-estack = { version = "0.1", path = "mctp-estack" }
+mctp-estack = { version = "0.1", path = "mctp-estack", default-features = false }
 mctp-linux = { version = "0.2", path = "mctp-linux" }
 mctp = { version = "0.2", path = "mctp", default-features = false }
 num-derive = { version = "0.4", default-features = false }

Cargo.toml

@@ -30,19 +30,18 @@ for c in $NOSTD_CRATES; do
     )
 done
 
-# mctp-estack combinations
+# mctp-estack combinations, defmt and log
 (
 cd mctp-estack
 cargo build --target thumbv7em-none-eabihf --features defmt --no-default-features
 cargo build --features log
 )
 
-# not a workspace
+# mctp-usb-embassy combinations, defmt and log
 (
 cd mctp-usb-embassy
 cargo build --target thumbv7em-none-eabihf --features defmt --no-default-features
 cargo build --features log
-cargo doc
 )
 
 cargo doc --features mctp-estack/log

ci/runtests.sh

@@ -1,22 +1,22 @@
 [package]
 name = "mctp-usb-embassy"
 description = "MCTP over USB transport for embassy-usb"
-edition = "2021"
 version = "0.1.0"
-license = "MIT OR Apache-2.0"
-repository = "https://github.com/CodeConstruct/mctp-rs"
+edition.workspace = true
+license.workspace = true
+repository.workspace = true
 categories = ["network-programming", "embedded", "no-std"]
 rust-version = "1.82"
 
 [dependencies]
-defmt = { version = "0.3", optional = true }
+defmt = { workspace = true, optional = true }
 embassy-futures = { version = "0.1" }
 embassy-usb-driver = { version = "0.2" }
-embassy-usb = { version = "0.5" }
-heapless = "0.8"
-log = { version = "0.4", optional = true }
-mctp-estack = { version = "0.1", path = "../mctp-estack", default-features = false }
-mctp = { version = "0.2", path = "../mctp", default-features = false }
+embassy-usb = { version = "0.5", default-features = false }
+heapless = { workspace = true }
+log = { workspace = true, optional = true }
+mctp-estack = { workspace = true }
+mctp = { workspace = true, default-features = false }
 
 [features]
 default = ["log"]

mctp-usb-embassy/Cargo.toml

@@ -10,7 +10,7 @@ categories = ["network-programming"]
 [dependencies]
 embedded-io-async = { workspace = true }
 log = { workspace = true }
-mctp-estack = { workspace = true }
+mctp-estack = { workspace = true, default-features = true }
 mctp = { workspace = true }
 smol = { workspace = true }