Separate library and ectool into different workspaces

FyraLabs · Apr 28, 2024 · 7d3bf41 · 7d3bf41
1 parent 5275acd
commit 7d3bf41
Show file tree

Hide file tree

Showing 12 changed files with 60 additions and 41 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,13 +1,3 @@
-[package]
-name = "crosec-rs"
-version = "0.1.0"
-edition = "2021"
-
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
-[dependencies]
-color-eyre = "0.6.2"
-nix = { version = "0.27.1", features = ["ioctl"] }
-num-derive = "0.4.2"
-num-traits = "0.2.18"
-thiserror = "1.0.57"
+[workspace]
+members = ["crosec", "ectool"]
+resolver = "2"
diff --git a/crosec/Cargo.toml b/crosec/Cargo.toml
@@ -0,0 +1,12 @@
+[package]
+name = "crosec"
+version = "0.1.0"
+edition = "2021"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+nix = { version = "0.27.1", features = ["ioctl"] }
+num-derive = "0.4.2"
+num-traits = "0.2.18"
+thiserror = "1.0.57"
diff --git a/src/commands/get_chip_info.rs → crosec/src/commands/get_chip_info.rs b/src/commands/get_chip_info.rs → crosec/src/commands/get_chip_info.rs
diff --git a/src/commands/hello.rs → crosec/src/commands/hello.rs b/src/commands/hello.rs → crosec/src/commands/hello.rs
diff --git a/src/commands/mod.rs → crosec/src/commands/mod.rs b/src/commands/mod.rs → crosec/src/commands/mod.rs
diff --git a/src/commands/version.rs → crosec/src/commands/version.rs b/src/commands/version.rs → crosec/src/commands/version.rs
diff --git a/src/crosec/dev.rs → crosec/src/crosec/dev.rs b/src/crosec/dev.rs → crosec/src/crosec/dev.rs
diff --git a/src/crosec/mod.rs → crosec/src/crosec/mod.rs b/src/crosec/mod.rs → crosec/src/crosec/mod.rs
diff --git a/src/lib.rs → crosec/src/lib.rs b/src/lib.rs → crosec/src/lib.rs
diff --git a/ectool/Cargo.toml b/ectool/Cargo.toml
@@ -0,0 +1,10 @@
+[package]
+name = "ectool"
+version = "0.1.0"
+edition = "2021"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+crosec = { version = "0.1.0", path = "../crosec" }
+color-eyre = "0.6.2"
diff --git a/src/bin/ectool.rs → ectool/src/main.rs b/src/bin/ectool.rs → ectool/src/main.rs
@@ -1,5 +1,5 @@
 use color_eyre::eyre::Result;
-use crosec_rs::commands::{
+use crosec::commands::{
     get_chip_info::ec_cmd_get_chip_info, hello::ec_cmd_hello, version::ec_cmd_version,
 };
 
@@ -30,4 +30,4 @@ fn main() -> Result<()> {
     println!("  revision:  {revision}");
 
     Ok(())
-}
+}