Merge pull request #34 from JasterV/refactor/cargo-workspace

[Refactor] Cargo workspace
JasterV · Feb 25, 2024 · eb28f20 · eb28f20
2 parents 1e161bc + 58faeef
commit eb28f20
Show file tree

Hide file tree

Showing 6 changed files with 32 additions and 26 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,25 +1,14 @@
-[package]
-name = "test-context"
-version = "0.1.4"
+[workspace]
+resolver = "2"
+members = ["test-context", "test-context-macros"]
+
+[workspace.package]
 edition = "2021"
-description = "A library for providing custom setup/teardown for Rust tests without needing a test harness"
+version = "0.1.4"
 homepage = "https://github.com/JasterV/test-context"
 repository = "https://github.com/JasterV/test-context"
-readme = "README.md"
 authors = [
   "Mark Hildreth <[email protected]>",
   "Victor Martinez <[email protected]>",
 ]
 license = "MIT"
-categories = ["development-tools::testing"]
-
-[dependencies]
-test-context-macros = { version = "0.1.4", path = "macros" }
-async-trait = "0.1.42"
-futures = "0.3"
-
-[dev-dependencies]
-tokio = { version = "1.0", features = ["macros", "rt"] }
-
-[workspace]
-members = ["macros"]
diff --git a/macros/Cargo.toml → test-context-macros/Cargo.toml b/macros/Cargo.toml → test-context-macros/Cargo.toml
@@ -1,15 +1,12 @@
 [package]
 name = "test-context-macros"
-version = "0.1.4"
-edition = "2021"
 description = "Macro crate for test-context"
-homepage = "https://github.com/JasterV/test-context"
-repository = "https://github.com/JasterV/test-context"
-authors = [
-  "Mark Hildreth <[email protected]>",
-  "Victor Martinez <[email protected]>",
-]
-license = "MIT"
+version.workspace = true
+edition.workspace = true
+homepage.workspace = true
+repository.workspace = true
+authors.workspace = true
+license.workspace = true
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 [lib]

diff --git a/macros/src/lib.rs → test-context-macros/src/lib.rs b/macros/src/lib.rs → test-context-macros/src/lib.rs
diff --git a/test-context/Cargo.toml b/test-context/Cargo.toml
@@ -0,0 +1,20 @@
+[package]
+name = "test-context"
+description = "A library for providing custom setup/teardown for Rust tests without needing a test harness"
+readme = "../README.md"
+keywords = ["test", "setup", "teardown"]
+categories = ["development-tools::testing"]
+version.workspace = true
+edition.workspace = true
+homepage.workspace = true
+repository.workspace = true
+authors.workspace = true
+license.workspace = true
+
+[dependencies]
+test-context-macros = { version = "0.1.4", path = "../test-context-macros/" }
+async-trait = "0.1.42"
+futures = "0.3"
+
+[dev-dependencies]
+tokio = { version = "1.0", features = ["macros", "rt"] }
diff --git a/src/lib.rs → test-context/src/lib.rs b/src/lib.rs → test-context/src/lib.rs
diff --git a/tests/test.rs → test-context/tests/test.rs b/tests/test.rs → test-context/tests/test.rs