Use proper workspace path declarations, remove workspace patch section

This commit is contained in:
Joakim Frostegård 2022-04-04 12:46:42 +02:00
parent 44b50204e2
commit c18a59b0cb
12 changed files with 40 additions and 57 deletions

View file

@ -20,23 +20,6 @@ members = [
] ]
[patch.crates-io] [patch.crates-io]
aquatic = { path = "aquatic" }
aquatic_cli_helpers = { path = "aquatic_cli_helpers" }
aquatic_common = { path = "aquatic_common" }
aquatic_http_load_test = { path = "aquatic_http_load_test" }
aquatic_http = { path = "aquatic_http" }
aquatic_http_private = { path = "aquatic_http_private" }
aquatic_http_protocol = { path = "aquatic_http_protocol" }
aquatic_toml_config_derive = { path = "aquatic_toml_config_derive" }
aquatic_toml_config = { path = "aquatic_toml_config" }
aquatic_udp_bench = { path = "aquatic_udp_bench" }
aquatic_udp_load_test = { path = "aquatic_udp_load_test" }
aquatic_udp = { path = "aquatic_udp" }
aquatic_udp_protocol = { path = "aquatic_udp_protocol" }
aquatic_ws_load_test = { path = "aquatic_ws_load_test" }
aquatic_ws = { path = "aquatic_ws" }
aquatic_ws_protocol = { path = "aquatic_ws_protocol" }
membarrier = { git = "https://github.com/glommer/membarrier-rs.git", branch = "issue-22" } membarrier = { git = "https://github.com/glommer/membarrier-rs.git", branch = "issue-22" }
[profile.release] [profile.release]

View file

@ -13,8 +13,8 @@ readme = "../README.md"
name = "aquatic" name = "aquatic"
[dependencies] [dependencies]
aquatic_cli_helpers = "0.2.0" aquatic_cli_helpers = { version = "0.2.0", path = "../aquatic_cli_helpers" }
aquatic_http = "0.2.0" aquatic_http = { version = "0.2.0", path = "../aquatic_http" }
aquatic_udp = "0.2.0" aquatic_udp = { version = "0.2.0", path = "../aquatic_udp" }
aquatic_ws = "0.2.0" aquatic_ws = { version = "0.2.0", path = "../aquatic_ws" }
mimalloc = { version = "0.1", default-features = false } mimalloc = { version = "0.1", default-features = false }

View file

@ -9,7 +9,7 @@ repository = "https://github.com/greatest-ape/aquatic"
readme = "../README.md" readme = "../README.md"
[dependencies] [dependencies]
aquatic_toml_config = "0.2.0" aquatic_toml_config = { version = "0.2.0", path = "../aquatic_toml_config" }
anyhow = "1" anyhow = "1"
git-testament = "0.2" git-testament = "0.2"

View file

@ -16,7 +16,7 @@ cpu-pinning = ["hwloc", "libc"]
rustls-config = ["rustls", "rustls-pemfile"] rustls-config = ["rustls", "rustls-pemfile"]
[dependencies] [dependencies]
aquatic_toml_config = "0.2.0" aquatic_toml_config = { version = "0.2.0", path = "../aquatic_toml_config" }
ahash = "0.7" ahash = "0.7"
anyhow = "1" anyhow = "1"

View file

@ -19,10 +19,10 @@ name = "aquatic_http"
cpu-pinning = ["aquatic_common/cpu-pinning"] cpu-pinning = ["aquatic_common/cpu-pinning"]
[dependencies] [dependencies]
aquatic_cli_helpers = "0.2.0" aquatic_cli_helpers = { version = "0.2.0", path = "../aquatic_cli_helpers" }
aquatic_common = { version = "0.2.0", features = ["rustls-config"] } aquatic_common = { version = "0.2.0", path = "../aquatic_common", features = ["rustls-config"] }
aquatic_http_protocol = "0.2.0" aquatic_http_protocol = { version = "0.2.0", path = "../aquatic_http_protocol" }
aquatic_toml_config = "0.2.0" aquatic_toml_config = { version = "0.2.0", path = "../aquatic_toml_config" }
anyhow = "1" anyhow = "1"
cfg-if = "1" cfg-if = "1"

View file

@ -16,10 +16,10 @@ name = "aquatic_http_load_test"
cpu-pinning = ["aquatic_common/cpu-pinning"] cpu-pinning = ["aquatic_common/cpu-pinning"]
[dependencies] [dependencies]
aquatic_cli_helpers = "0.2.0" aquatic_cli_helpers = { version = "0.2.0", path = "../aquatic_cli_helpers" }
aquatic_common = "0.2.0" aquatic_common = { version = "0.2.0", path = "../aquatic_common" }
aquatic_http_protocol = "0.2.0" aquatic_http_protocol = { version = "0.2.0", path = "../aquatic_http_protocol" }
aquatic_toml_config = "0.2.0" aquatic_toml_config = { version = "0.2.0", path = "../aquatic_toml_config" }
anyhow = "1" anyhow = "1"
futures-lite = "1" futures-lite = "1"

View file

@ -10,10 +10,10 @@ name = "aquatic_http_private"
name = "aquatic_http_private" name = "aquatic_http_private"
[dependencies] [dependencies]
aquatic_cli_helpers = "0.2.0" aquatic_cli_helpers = { version = "0.2.0", path = "../aquatic_cli_helpers" }
aquatic_common = { version = "0.2.0", features = ["rustls-config"] } aquatic_common = { version = "0.2.0", path = "../aquatic_common", features = ["rustls-config"] }
aquatic_http_protocol = { version = "0.2.0", features = ["with-axum"] } aquatic_http_protocol = { version = "0.2.0", path = "../aquatic_http_protocol", features = ["with-axum"] }
aquatic_toml_config = "0.2.0" aquatic_toml_config = { version = "0.2.0", path = "../aquatic_toml_config" }
anyhow = "1" anyhow = "1"
axum = { version = "0.5", default-features = false, features = ["headers", "http1", "matched-path", "original-uri"] } axum = { version = "0.5", default-features = false, features = ["headers", "http1", "matched-path", "original-uri"] }

View file

@ -19,10 +19,10 @@ name = "aquatic_udp"
cpu-pinning = ["aquatic_common/cpu-pinning"] cpu-pinning = ["aquatic_common/cpu-pinning"]
[dependencies] [dependencies]
aquatic_cli_helpers = "0.2.0" aquatic_cli_helpers = { version = "0.2.0", path = "../aquatic_cli_helpers" }
aquatic_common = "0.2.0" aquatic_common = { version = "0.2.0", path = "../aquatic_common" }
aquatic_toml_config = "0.2.0" aquatic_toml_config = { version = "0.2.0", path = "../aquatic_toml_config" }
aquatic_udp_protocol = "0.2.0" aquatic_udp_protocol = { version = "0.2.0", path = "../aquatic_udp_protocol" }
anyhow = "1" anyhow = "1"
cfg-if = "1" cfg-if = "1"

View file

@ -11,11 +11,11 @@ readme = "../README.md"
name = "aquatic_udp_bench" name = "aquatic_udp_bench"
[dependencies] [dependencies]
aquatic_cli_helpers = "0.2.0" aquatic_cli_helpers = { version = "0.2.0", path = "../aquatic_cli_helpers" }
aquatic_common = "0.2.0" aquatic_common = { version = "0.2.0", path = "../aquatic_common" }
aquatic_toml_config = "0.2.0" aquatic_toml_config = { version = "0.2.0", path = "../aquatic_toml_config" }
aquatic_udp = "0.2.0" aquatic_udp = { version = "0.2.0", path = "../aquatic_udp" }
aquatic_udp_protocol = "0.2.0" aquatic_udp_protocol = { version = "0.2.0", path = "../aquatic_udp_protocol" }
anyhow = "1" anyhow = "1"
crossbeam-channel = "0.5" crossbeam-channel = "0.5"

View file

@ -16,10 +16,10 @@ name = "aquatic_udp_load_test"
cpu-pinning = ["aquatic_common/cpu-pinning"] cpu-pinning = ["aquatic_common/cpu-pinning"]
[dependencies] [dependencies]
aquatic_cli_helpers = "0.2.0" aquatic_cli_helpers = { version = "0.2.0", path = "../aquatic_cli_helpers" }
aquatic_common = "0.2.0" aquatic_common = { version = "0.2.0", path = "../aquatic_common" }
aquatic_toml_config = "0.2.0" aquatic_toml_config = { version = "0.2.0", path = "../aquatic_toml_config" }
aquatic_udp_protocol = "0.2.0" aquatic_udp_protocol = { version = "0.2.0", path = "../aquatic_udp_protocol" }
anyhow = "1" anyhow = "1"
hashbrown = "0.12" hashbrown = "0.12"

View file

@ -20,10 +20,10 @@ name = "aquatic_ws"
cpu-pinning = ["aquatic_common/cpu-pinning"] cpu-pinning = ["aquatic_common/cpu-pinning"]
[dependencies] [dependencies]
aquatic_cli_helpers = "0.2.0" aquatic_cli_helpers = { version = "0.2.0", path = "../aquatic_cli_helpers" }
aquatic_common = { version = "0.2.0", features = ["rustls-config"] } aquatic_common = { version = "0.2.0", path = "../aquatic_common", features = ["rustls-config"] }
aquatic_toml_config = "0.2.0" aquatic_toml_config = { version = "0.2.0", path = "../aquatic_toml_config" }
aquatic_ws_protocol = "0.2.0" aquatic_ws_protocol = { version = "0.2.0", path = "../aquatic_ws_protocol" }
anyhow = "1" anyhow = "1"
async-tungstenite = "0.17" async-tungstenite = "0.17"

View file

@ -16,13 +16,13 @@ name = "aquatic_ws_load_test"
cpu-pinning = ["aquatic_common/cpu-pinning"] cpu-pinning = ["aquatic_common/cpu-pinning"]
[dependencies] [dependencies]
async-tungstenite = "0.17" aquatic_cli_helpers = { version = "0.2.0", path = "../aquatic_cli_helpers" }
aquatic_cli_helpers = "0.2.0" aquatic_common = { version = "0.2.0", path = "../aquatic_common", features = ["rustls-config"] }
aquatic_common = "0.2.0" aquatic_toml_config = { version = "0.2.0", path = "../aquatic_toml_config" }
aquatic_toml_config = "0.2.0" aquatic_ws_protocol = { version = "0.2.0", path = "../aquatic_ws_protocol" }
aquatic_ws_protocol = "0.2.0"
anyhow = "1" anyhow = "1"
async-tungstenite = "0.17"
futures = "0.3" futures = "0.3"
futures-rustls = "0.22" futures-rustls = "0.22"
glommio = "0.7" glommio = "0.7"