From 3539bcdd6d17d8850077fa6c4a3d6b11803e31c1 Mon Sep 17 00:00:00 2001 From: Victor Martinez <49537445+JasterV@users.noreply.github.com> Date: Mon, 26 Feb 2024 00:19:53 +0100 Subject: [PATCH 1/2] refactor: restructure the workspace members organization --- Cargo.toml | 26 ++-------------------- {macros => test-context-macros}/Cargo.toml | 0 {macros => test-context-macros}/src/lib.rs | 0 test-context/Cargo.toml | 22 ++++++++++++++++++ {src => test-context/src}/lib.rs | 0 {tests => test-context/tests}/test.rs | 0 6 files changed, 24 insertions(+), 24 deletions(-) rename {macros => test-context-macros}/Cargo.toml (100%) rename {macros => test-context-macros}/src/lib.rs (100%) create mode 100644 test-context/Cargo.toml rename {src => test-context/src}/lib.rs (100%) rename {tests => test-context/tests}/test.rs (100%) diff --git a/Cargo.toml b/Cargo.toml index 9329f3c..83c3595 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,25 +1,3 @@ -[package] -name = "test-context" -version = "0.1.4" -edition = "2021" -description = "A library for providing custom setup/teardown for Rust tests without needing a test harness" -homepage = "https://github.com/JasterV/test-context" -repository = "https://github.com/JasterV/test-context" -readme = "README.md" -authors = [ - "Mark Hildreth ", - "Victor Martinez ", -] -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"] +resolver = "2" +members = ["test-context", "test-context-macros"] diff --git a/macros/Cargo.toml b/test-context-macros/Cargo.toml similarity index 100% rename from macros/Cargo.toml rename to test-context-macros/Cargo.toml diff --git a/macros/src/lib.rs b/test-context-macros/src/lib.rs similarity index 100% rename from macros/src/lib.rs rename to test-context-macros/src/lib.rs diff --git a/test-context/Cargo.toml b/test-context/Cargo.toml new file mode 100644 index 0000000..2cb70e4 --- /dev/null +++ b/test-context/Cargo.toml @@ -0,0 +1,22 @@ +[package] +name = "test-context" +version = "0.1.4" +edition = "2021" +description = "A library for providing custom setup/teardown for Rust tests without needing a test harness" +homepage = "https://github.com/JasterV/test-context" +repository = "https://github.com/JasterV/test-context" +readme = "README.md" +authors = [ + "Mark Hildreth ", + "Victor Martinez ", +] +license = "MIT" +categories = ["development-tools::testing"] + +[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 b/test-context/src/lib.rs similarity index 100% rename from src/lib.rs rename to test-context/src/lib.rs diff --git a/tests/test.rs b/test-context/tests/test.rs similarity index 100% rename from tests/test.rs rename to test-context/tests/test.rs From 58faeefa63bd0300f4a467c52adc899c620bb0a7 Mon Sep 17 00:00:00 2001 From: Victor Martinez <49537445+JasterV@users.noreply.github.com> Date: Mon, 26 Feb 2024 00:27:59 +0100 Subject: [PATCH 2/2] chore: update workspace properties --- Cargo.toml | 11 +++++++++++ test-context-macros/Cargo.toml | 15 ++++++--------- test-context/Cargo.toml | 18 ++++++++---------- 3 files changed, 25 insertions(+), 19 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 83c3595..ff6532b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,3 +1,14 @@ [workspace] resolver = "2" members = ["test-context", "test-context-macros"] + +[workspace.package] +edition = "2021" +version = "0.1.4" +homepage = "https://github.com/JasterV/test-context" +repository = "https://github.com/JasterV/test-context" +authors = [ + "Mark Hildreth ", + "Victor Martinez ", +] +license = "MIT" diff --git a/test-context-macros/Cargo.toml b/test-context-macros/Cargo.toml index 9dc08fe..993a00d 100644 --- a/test-context-macros/Cargo.toml +++ b/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 ", - "Victor Martinez ", -] -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/test-context/Cargo.toml b/test-context/Cargo.toml index 2cb70e4..200a638 100644 --- a/test-context/Cargo.toml +++ b/test-context/Cargo.toml @@ -1,17 +1,15 @@ [package] name = "test-context" -version = "0.1.4" -edition = "2021" description = "A library for providing custom setup/teardown for Rust tests without needing a test harness" -homepage = "https://github.com/JasterV/test-context" -repository = "https://github.com/JasterV/test-context" -readme = "README.md" -authors = [ - "Mark Hildreth ", - "Victor Martinez ", -] -license = "MIT" +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/" }