Move workspace crates under /crates

oleiade · Jul 14, 2023 · 5efa62b · 5efa62b
1 parent 04a3f99
commit 5efa62b
Show file tree

Hide file tree

Showing 11 changed files with 24 additions and 4 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -3,10 +3,14 @@ debug = true
 incremental = true
 lto = "off"
 
-[workspace]
 
+[workspace]
 members = [
-  "motus",
-  "cli",
-  "wasm",
+    "crates/*",
 ]
+resolver = "2"
+
+[workspace.dependencies]
+motus = { path = "crates/motus" }
+cli = { path = "crates/cli" }
+wasm = { path = "crates/wasm" }
diff --git a/cli/Cargo.toml → crates/motus-cli/Cargo.toml b/cli/Cargo.toml → crates/motus-cli/Cargo.toml
@@ -2,6 +2,7 @@
 edition = "2021"
 name = "cli"
 version = "0.2.0"
+publish = false
 
 [[bin]]
 name = "motus"

diff --git a/cli/src/main.rs → crates/motus-cli/src/main.rs b/cli/src/main.rs → crates/motus-cli/src/main.rs
diff --git a/crates/motus-tests/Cargo.toml b/crates/motus-tests/Cargo.toml
@@ -0,0 +1,13 @@
+[package]
+edition = "2021"
+name = "tests"
+version = "0.2.0"
+publish = false
+
+[dev-dependencies]
+assert_cmd = "2.0.11"
+assert_json = "0.1.0"
+
+[[test]]
+name = "integration"
+path = "integration.rs"
diff --git a/tests/integration.rs → crates/motus-tests/integration.rs b/tests/integration.rs → crates/motus-tests/integration.rs
diff --git a/wasm/Cargo.toml → crates/motus-wasm/Cargo.toml b/wasm/Cargo.toml → crates/motus-wasm/Cargo.toml
@@ -1,7 +1,9 @@
 [package]
 edition = "2021"
 name = "wasm"
+description = "A WASM-compatible wrapper around the motus crate"
 version = "0.1.0"
+publish = false
 
 [lib]
 crate-type = ["cdylib", "rlib"]

diff --git a/wasm/index.html → crates/motus-wasm/index.html b/wasm/index.html → crates/motus-wasm/index.html
diff --git a/wasm/src/lib.rs → crates/motus-wasm/src/lib.rs b/wasm/src/lib.rs → crates/motus-wasm/src/lib.rs
diff --git a/motus/Cargo.toml → crates/motus/Cargo.toml b/motus/Cargo.toml → crates/motus/Cargo.toml
diff --git a/motus/src/lib.rs → crates/motus/src/lib.rs b/motus/src/lib.rs → crates/motus/src/lib.rs
diff --git a/motus/wordlist.txt → crates/motus/wordlist.txt b/motus/wordlist.txt → crates/motus/wordlist.txt