build(cargo)!: split into a workspace of whippit library and `moz-w…

…ebgpu-cts` binary
erichdongubler-mozilla · Oct 27, 2023 · 7f1949d · 7f1949d
1 parent d45337f
commit 7f1949d
Show file tree

Hide file tree

Showing 13 changed files with 80 additions and 38 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,35 +1,17 @@
-[package]
-name = "whippit"
-description = "Tools and a library to work with Web Platform Tests data"
-version = "0.2.1"
-edition = "2021"
-repository = "https://github.com/ErichDonGubler/whippit"
-license = "MIT or Apache-2.0"
-publish = false
+[workspace]
+members = [
+	"moz-webgpu-cts",
+	"whippit",
+]
+resolver = "2"
 
-[features]
-default = ["unstructured-properties"]
-unstructured-properties = []
-
-[dependencies]
+[workspace.dependencies]
 chumsky = { version = "1.0.0-alpha.6", features = ["label", "pratt"] }
-clap = { version = "4.4.2", features = ["derive"] }
-env_logger = "0.10.0"
 format = "0.2.4"
 indexmap = "2.0.0"
-joinery = "3.1.0"
-lets_find_up = "0.0.3"
+insta = "1.33.0"
 log = "0.4.20"
-miette = { version = "5.10.0", features = ["fancy"] }
-natord = "1.0.9"
-path-dsl = "0.6.1"
-regex = "1.9.5"
-strum = { version = "0.25.0", features = ["derive"] }
 thiserror = "1.0.49"
-wax = "0.6.0"
-
-[dev-dependencies]
-insta = "1.33.0"
 
 # The profile that 'cargo dist' will build with
 [profile.dist]

diff --git a/moz-webgpu-cts/Cargo.toml b/moz-webgpu-cts/Cargo.toml
@@ -0,0 +1,29 @@
+[package]
+name = "moz-webgpu-cts"
+description = "Tools to work with Web Platform Tests metadata for WebGPU CTS in Firefox"
+version = "0.2.1"
+edition = "2021"
+repository = "https://github.com/ErichDonGubler/moz-webgpu-cts"
+license = "MIT or Apache-2.0"
+publish = false
+
+[dependencies]
+chumsky = { workspace = true }
+clap = { version = "4.4.2", features = ["derive"] }
+env_logger = "0.10.0"
+format = { workspace = true }
+indexmap = { workspace = true }
+joinery = "3.1.0"
+lets_find_up = "0.0.3"
+log = { workspace = true }
+miette = { version = "5.10.0", features = ["fancy"] }
+natord = "1.0.9"
+path-dsl = "0.6.1"
+regex = "1.9.5"
+strum = { version = "0.25.0", features = ["derive"] }
+thiserror = "1.0.49"
+wax = "0.6.0"
+whippit = { version = "0.2.1", path = "../whippit", default-features = false }
+
+[dev-dependencies]
+insta = { workspace = true }
diff --git a/src/bin/moz-webgpu-cts/main.rs → moz-webgpu-cts/src/main.rs b/src/bin/moz-webgpu-cts/main.rs → moz-webgpu-cts/src/main.rs
diff --git a/src/bin/moz-webgpu-cts/metadata.rs → moz-webgpu-cts/src/metadata.rs b/src/bin/moz-webgpu-cts/metadata.rs → moz-webgpu-cts/src/metadata.rs
diff --git a/src/bin/moz-webgpu-cts/shared.rs → moz-webgpu-cts/src/shared.rs b/src/bin/moz-webgpu-cts/shared.rs → moz-webgpu-cts/src/shared.rs
diff --git a/whippit/Cargo.toml b/whippit/Cargo.toml
@@ -0,0 +1,20 @@
+[package]
+name = "whippit"
+description = "Parsers for Web Platform Tests reports and metadata"
+version = "0.2.1"
+edition = "2021"
+repository = "https://github.com/ErichDonGubler/whippit"
+license = "MIT or Apache-2.0"
+publish = false
+
+[features]
+default = ["unstructured-properties"]
+unstructured-properties = []
+
+[dependencies]
+chumsky = { workspace = true }
+format = { workspace = true }
+indexmap = { workspace = true }
+
+[dev-dependencies]
+insta = { workspace = true }
diff --git a/src/lib.rs → whippit/src/lib.rs b/src/lib.rs → whippit/src/lib.rs
diff --git a/src/metadata.rs → whippit/src/metadata.rs b/src/metadata.rs → whippit/src/metadata.rs
diff --git a/src/metadata/properties.rs → whippit/src/metadata/properties.rs b/src/metadata/properties.rs → whippit/src/metadata/properties.rs
diff --git a/src/metadata/properties/conditional.rs → ...it/src/metadata/properties/conditional.rs b/src/metadata/properties/conditional.rs → ...it/src/metadata/properties/conditional.rs
diff --git a/src/metadata/properties/conditional/expr.rs → ...c/metadata/properties/conditional/expr.rs b/src/metadata/properties/conditional/expr.rs → ...c/metadata/properties/conditional/expr.rs
diff --git a/src/metadata/properties/unstructured.rs → ...t/src/metadata/properties/unstructured.rs b/src/metadata/properties/unstructured.rs → ...t/src/metadata/properties/unstructured.rs