Move all crates to new crates dir

2026-03-31 09:45:31 +00:00 · 2023-10-18 23:53:41 +02:00 · 2023-10-18 23:53:41 +02:00 · 9b032f7e24
commit 9b032f7e24
parent 3835da22ac
128 changed files with 27 additions and 26 deletions
--- a/Cargo.toml
+++ b/Cargo.toml
@ -1,21 +1,22 @@
 [workspace]
 members = [ 
-    "aquatic",
-    "aquatic_common",
-    "aquatic_http",
-    "aquatic_http_load_test",
-    "aquatic_http_protocol",
-    "aquatic_peer_id",
-    "aquatic_toml_config",
-    "aquatic_toml_config_derive",
-    "aquatic_udp",
-    "aquatic_udp_bench",
-    "aquatic_udp_load_test",
-    "aquatic_udp_protocol",
-    "aquatic_ws",
-    "aquatic_ws_load_test",
-    "aquatic_ws_protocol",
+    "crates/combined_binary",
+    "crates/common",
+    "crates/http",
+    "crates/http_load_test",
+    "crates/http_protocol",
+    "crates/peer_id",
+    "crates/toml_config",
+    "crates/toml_config_derive",
+    "crates/udp",
+    "crates/udp_bench",
+    "crates/udp_load_test",
+    "crates/udp_protocol",
+    "crates/ws",
+    "crates/ws_load_test",
+    "crates/ws_protocol",
 ]
+resolver = "2"

 [workspace.package]
 version = "0.8.0"
@ -27,16 +28,16 @@ readme = "./README.md"
 rust-version = "1.64"

 [workspace.dependencies]
-aquatic_common = { version = "0.8.0", path = "./aquatic_common" }
-aquatic_http_protocol = { version = "0.8.0", path = "./aquatic_http_protocol" }
-aquatic_http = { version = "0.8.0", path = "./aquatic_http" }
-aquatic_peer_id = { version = "0.8.0", path = "./aquatic_peer_id" }
-aquatic_toml_config = { version = "0.8.0", path = "./aquatic_toml_config" }
-aquatic_toml_config_derive = { version = "0.8.0", path = "./aquatic_toml_config_derive" }
-aquatic_udp_protocol = { version = "0.8.0", path = "./aquatic_udp_protocol" }
-aquatic_udp = { version = "0.8.0", path = "./aquatic_udp" }
-aquatic_ws_protocol = { version = "0.8.0", path = "./aquatic_ws_protocol" }
-aquatic_ws = { version = "0.8.0", path = "./aquatic_ws" }
+aquatic_common = { version = "0.8.0", path = "./crates/common" }
+aquatic_http_protocol = { version = "0.8.0", path = "./crates/http_protocol" }
+aquatic_http = { version = "0.8.0", path = "./crates/http" }
+aquatic_peer_id = { version = "0.8.0", path = "./crates/peer_id" }
+aquatic_toml_config = { version = "0.8.0", path = "./crates/toml_config" }
+aquatic_toml_config_derive = { version = "0.8.0", path = "./crates/toml_config_derive" }
+aquatic_udp_protocol = { version = "0.8.0", path = "./crates/udp_protocol" }
+aquatic_udp = { version = "0.8.0", path = "./crates/udp" }
+aquatic_ws_protocol = { version = "0.8.0", path = "./crates/ws_protocol" }
+aquatic_ws = { version = "0.8.0", path = "./crates/ws" }

 [profile.release]
 debug = false
--- a/crates/combined_binary/Cargo.toml
+++ b/crates/combined_binary/Cargo.toml
--- a/crates/combined_binary/src/main.rs
+++ b/crates/combined_binary/src/main.rs
--- a/aquatic_common/Cargo.toml
+++ b/aquatic_common/Cargo.toml
--- a/aquatic_common/src/access_list.rs
+++ b/aquatic_common/src/access_list.rs
--- a/aquatic_common/src/cli.rs
+++ b/aquatic_common/src/cli.rs
--- a/aquatic_common/src/cpu_pinning.rs
+++ b/aquatic_common/src/cpu_pinning.rs
--- a/aquatic_common/src/lib.rs
+++ b/aquatic_common/src/lib.rs
--- a/aquatic_common/src/privileges.rs
+++ b/aquatic_common/src/privileges.rs
--- a/aquatic_common/src/rustls_config.rs
+++ b/aquatic_common/src/rustls_config.rs
--- a/aquatic_http/Cargo.toml
+++ b/aquatic_http/Cargo.toml
--- a/aquatic_http/src/common.rs
+++ b/aquatic_http/src/common.rs
--- a/aquatic_http/src/config.rs
+++ b/aquatic_http/src/config.rs
--- a/aquatic_http/src/lib.rs
+++ b/aquatic_http/src/lib.rs
--- a/aquatic_http/src/main.rs
+++ b/aquatic_http/src/main.rs
--- a/aquatic_http/src/workers/mod.rs
+++ b/aquatic_http/src/workers/mod.rs
--- a/aquatic_http/src/workers/socket.rs
+++ b/aquatic_http/src/workers/socket.rs
--- a/aquatic_http/src/workers/swarm.rs
+++ b/aquatic_http/src/workers/swarm.rs
--- a/aquatic_http_load_test/Cargo.toml
+++ b/aquatic_http_load_test/Cargo.toml
--- a/aquatic_http_load_test/src/common.rs
+++ b/aquatic_http_load_test/src/common.rs
--- a/aquatic_http_load_test/src/config.rs
+++ b/aquatic_http_load_test/src/config.rs
--- a/aquatic_http_load_test/src/main.rs
+++ b/aquatic_http_load_test/src/main.rs
--- a/aquatic_http_load_test/src/network.rs
+++ b/aquatic_http_load_test/src/network.rs
--- a/aquatic_http_load_test/src/utils.rs
+++ b/aquatic_http_load_test/src/utils.rs
--- a/aquatic_http_protocol/Cargo.toml
+++ b/aquatic_http_protocol/Cargo.toml
--- a/aquatic_http_protocol/benches/bench_announce_response_to_bytes.rs
+++ b/aquatic_http_protocol/benches/bench_announce_response_to_bytes.rs
--- a/aquatic_http_protocol/benches/bench_request_from_bytes.rs
+++ b/aquatic_http_protocol/benches/bench_request_from_bytes.rs
--- a/aquatic_http_protocol/src/common.rs
+++ b/aquatic_http_protocol/src/common.rs
--- a/aquatic_http_protocol/src/lib.rs
+++ b/aquatic_http_protocol/src/lib.rs
--- a/aquatic_http_protocol/src/request.rs
+++ b/aquatic_http_protocol/src/request.rs
--- a/aquatic_http_protocol/src/response.rs
+++ b/aquatic_http_protocol/src/response.rs
--- a/aquatic_http_protocol/src/utils.rs
+++ b/aquatic_http_protocol/src/utils.rs
--- a/aquatic_http_protocol/target/criterion/announce-response-to-bytes/bendy/benchmark.json
+++ b/aquatic_http_protocol/target/criterion/announce-response-to-bytes/bendy/benchmark.json
--- a/aquatic_http_protocol/target/criterion/announce-response-to-bytes/bendy/estimates.json
+++ b/aquatic_http_protocol/target/criterion/announce-response-to-bytes/bendy/estimates.json
--- a/aquatic_http_protocol/target/criterion/announce-response-to-bytes/bendy/raw.csv
+++ b/aquatic_http_protocol/target/criterion/announce-response-to-bytes/bendy/raw.csv
--- a/aquatic_http_protocol/target/criterion/announce-response-to-bytes/bendy/sample.json
+++ b/aquatic_http_protocol/target/criterion/announce-response-to-bytes/bendy/sample.json
--- a/aquatic_http_protocol/target/criterion/announce-response-to-bytes/bendy/tukey.json
+++ b/aquatic_http_protocol/target/criterion/announce-response-to-bytes/bendy/tukey.json
--- a/aquatic_http_protocol/target/criterion/announce-response-to-bytes/latest/benchmark.json
+++ b/aquatic_http_protocol/target/criterion/announce-response-to-bytes/latest/benchmark.json
--- a/aquatic_http_protocol/target/criterion/announce-response-to-bytes/latest/estimates.json
+++ b/aquatic_http_protocol/target/criterion/announce-response-to-bytes/latest/estimates.json
--- a/aquatic_http_protocol/target/criterion/announce-response-to-bytes/latest/raw.csv
+++ b/aquatic_http_protocol/target/criterion/announce-response-to-bytes/latest/raw.csv
--- a/aquatic_http_protocol/target/criterion/announce-response-to-bytes/latest/sample.json
+++ b/aquatic_http_protocol/target/criterion/announce-response-to-bytes/latest/sample.json
--- a/aquatic_http_protocol/target/criterion/announce-response-to-bytes/latest/tukey.json
+++ b/aquatic_http_protocol/target/criterion/announce-response-to-bytes/latest/tukey.json
--- a/aquatic_http_protocol/target/criterion/request-from-bytes/latest/benchmark.json
+++ b/aquatic_http_protocol/target/criterion/request-from-bytes/latest/benchmark.json
--- a/aquatic_http_protocol/target/criterion/request-from-bytes/latest/estimates.json
+++ b/aquatic_http_protocol/target/criterion/request-from-bytes/latest/estimates.json
--- a/aquatic_http_protocol/target/criterion/request-from-bytes/latest/raw.csv
+++ b/aquatic_http_protocol/target/criterion/request-from-bytes/latest/raw.csv
--- a/aquatic_http_protocol/target/criterion/request-from-bytes/latest/sample.json
+++ b/aquatic_http_protocol/target/criterion/request-from-bytes/latest/sample.json
--- a/aquatic_http_protocol/target/criterion/request-from-bytes/latest/tukey.json
+++ b/aquatic_http_protocol/target/criterion/request-from-bytes/latest/tukey.json
--- a/aquatic_peer_id/Cargo.toml
+++ b/aquatic_peer_id/Cargo.toml
--- a/aquatic_peer_id/src/lib.rs
+++ b/aquatic_peer_id/src/lib.rs
--- a/aquatic_toml_config/Cargo.toml
+++ b/aquatic_toml_config/Cargo.toml
--- a/aquatic_toml_config/src/lib.rs
+++ b/aquatic_toml_config/src/lib.rs
--- a/aquatic_toml_config/tests/test.rs
+++ b/aquatic_toml_config/tests/test.rs
--- a/aquatic_toml_config_derive/Cargo.toml
+++ b/aquatic_toml_config_derive/Cargo.toml
--- a/aquatic_toml_config_derive/src/lib.rs
+++ b/aquatic_toml_config_derive/src/lib.rs
--- a/aquatic_udp/Cargo.toml
+++ b/aquatic_udp/Cargo.toml
--- a/aquatic_udp/src/common.rs
+++ b/aquatic_udp/src/common.rs
--- a/aquatic_udp/src/config.rs
+++ b/aquatic_udp/src/config.rs
--- a/aquatic_udp/src/lib.rs
+++ b/aquatic_udp/src/lib.rs
--- a/aquatic_udp/src/main.rs
+++ b/aquatic_udp/src/main.rs
--- a/aquatic_udp/src/workers/mod.rs
+++ b/aquatic_udp/src/workers/mod.rs
--- a/aquatic_udp/src/workers/socket/mio.rs
+++ b/aquatic_udp/src/workers/socket/mio.rs
--- a/aquatic_udp/src/workers/socket/mod.rs
+++ b/aquatic_udp/src/workers/socket/mod.rs
--- a/aquatic_udp/src/workers/socket/storage.rs
+++ b/aquatic_udp/src/workers/socket/storage.rs
--- a/aquatic_udp/src/workers/socket/uring/buf_ring.rs
+++ b/aquatic_udp/src/workers/socket/uring/buf_ring.rs
--- a/aquatic_udp/src/workers/socket/uring/mod.rs
+++ b/aquatic_udp/src/workers/socket/uring/mod.rs
--- a/aquatic_udp/src/workers/socket/uring/recv_helper.rs
+++ b/aquatic_udp/src/workers/socket/uring/recv_helper.rs
--- a/aquatic_udp/src/workers/socket/uring/send_buffers.rs
+++ b/aquatic_udp/src/workers/socket/uring/send_buffers.rs
--- a/aquatic_udp/src/workers/socket/validator.rs
+++ b/aquatic_udp/src/workers/socket/validator.rs
--- a/aquatic_udp/src/workers/statistics/collector.rs
+++ b/aquatic_udp/src/workers/statistics/collector.rs
--- a/aquatic_udp/src/workers/statistics/mod.rs
+++ b/aquatic_udp/src/workers/statistics/mod.rs
--- a/aquatic_udp/src/workers/swarm/mod.rs
+++ b/aquatic_udp/src/workers/swarm/mod.rs
--- a/aquatic_udp/src/workers/swarm/storage.rs
+++ b/aquatic_udp/src/workers/swarm/storage.rs
--- a/aquatic_udp/templates/statistics.css
+++ b/aquatic_udp/templates/statistics.css
--- a/aquatic_udp/templates/statistics.html
+++ b/aquatic_udp/templates/statistics.html
--- a/aquatic_udp/tests/access_list.rs
+++ b/aquatic_udp/tests/access_list.rs
--- a/aquatic_udp/tests/common/mod.rs
+++ b/aquatic_udp/tests/common/mod.rs
--- a/aquatic_udp/tests/invalid_connection_id.rs
+++ b/aquatic_udp/tests/invalid_connection_id.rs
--- a/aquatic_udp/tests/requests_responses.rs
+++ b/aquatic_udp/tests/requests_responses.rs
--- a/aquatic_udp_bench/Cargo.toml
+++ b/aquatic_udp_bench/Cargo.toml
--- a/aquatic_udp_bench/src/announce.rs
+++ b/aquatic_udp_bench/src/announce.rs
--- a/aquatic_udp_bench/src/common.rs
+++ b/aquatic_udp_bench/src/common.rs
--- a/aquatic_udp_bench/src/config.rs
+++ b/aquatic_udp_bench/src/config.rs
--- a/aquatic_udp_bench/src/main.rs
+++ b/aquatic_udp_bench/src/main.rs
--- a/aquatic_udp_bench/src/scrape.rs
+++ b/aquatic_udp_bench/src/scrape.rs
--- a/aquatic_udp_load_test/Cargo.toml
+++ b/aquatic_udp_load_test/Cargo.toml
--- a/aquatic_udp_load_test/src/common.rs
+++ b/aquatic_udp_load_test/src/common.rs
--- a/aquatic_udp_load_test/src/config.rs
+++ b/aquatic_udp_load_test/src/config.rs
--- a/aquatic_udp_load_test/src/main.rs
+++ b/aquatic_udp_load_test/src/main.rs
--- a/aquatic_udp_load_test/src/utils.rs
+++ b/aquatic_udp_load_test/src/utils.rs
--- a/aquatic_udp_load_test/src/worker/mod.rs
+++ b/aquatic_udp_load_test/src/worker/mod.rs
--- a/aquatic_udp_load_test/src/worker/request_gen.rs
+++ b/aquatic_udp_load_test/src/worker/request_gen.rs
--- a/aquatic_udp_protocol/Cargo.toml
+++ b/aquatic_udp_protocol/Cargo.toml
--- a/aquatic_udp_protocol/src/common.rs
+++ b/aquatic_udp_protocol/src/common.rs
--- a/aquatic_udp_protocol/src/lib.rs
+++ b/aquatic_udp_protocol/src/lib.rs
--- a/aquatic_udp_protocol/src/request.rs
+++ b/aquatic_udp_protocol/src/request.rs
--- a/aquatic_udp_protocol/src/response.rs
+++ b/aquatic_udp_protocol/src/response.rs
--- a/aquatic_ws/Cargo.toml
+++ b/aquatic_ws/Cargo.toml
@ -8,7 +8,7 @@ edition.workspace = true
 license.workspace = true
 repository.workspace = true
 readme.workspace = true
-rust-version.workspace = true
+rust-version = "1.70"

 [lib]
 name = "aquatic_ws"
--- a/aquatic_ws/src/common.rs
+++ b/aquatic_ws/src/common.rs
--- a/aquatic_ws/src/config.rs
+++ b/aquatic_ws/src/config.rs
--- a/aquatic_ws/src/lib.rs
+++ b/aquatic_ws/src/lib.rs
--- a/Show more
+++ b/Show more