From 2f13e1e1a8c5305a34f944556f3b1b1acc7701db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joakim=20Frosteg=C3=A5rd?= Date: Mon, 25 May 2020 19:27:22 +0200 Subject: [PATCH] rename crate "cli_helpers" to "aquatic_cli_helpers" --- Cargo.lock | 28 +++++++++---------- Cargo.toml | 2 +- .../Cargo.toml | 2 +- .../src/lib.rs | 0 aquatic_udp/Cargo.toml | 2 +- aquatic_udp/src/bin/aquatic_udp.rs | 4 +-- aquatic_udp_bench/Cargo.toml | 2 +- .../bin/aquatic_udp_bench_handlers/main.rs | 2 +- aquatic_udp_load_test/Cargo.toml | 2 +- aquatic_udp_load_test/src/main.rs | 2 +- aquatic_ws/Cargo.toml | 2 +- aquatic_ws/src/bin/main.rs | 2 +- 12 files changed, 25 insertions(+), 25 deletions(-) rename {cli_helpers => aquatic_cli_helpers}/Cargo.toml (89%) rename {cli_helpers => aquatic_cli_helpers}/src/lib.rs (100%) diff --git a/Cargo.lock b/Cargo.lock index 117a028..c11bb2f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -21,6 +21,16 @@ version = "1.0.31" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "85bb70cc08ec97ca5450e6eba421deeea5f172c0fc61f78b5357b2a8e8be195f" +[[package]] +name = "aquatic_cli_helpers" +version = "0.1.0" +dependencies = [ + "anyhow", + "gumdrop", + "serde", + "toml", +] + [[package]] name = "aquatic_common" version = "0.1.0" @@ -34,9 +44,9 @@ name = "aquatic_udp" version = "0.1.0" dependencies = [ "anyhow", + "aquatic_cli_helpers", "aquatic_common", "aquatic_udp_protocol", - "cli_helpers", "crossbeam-channel", "hashbrown", "histogram", @@ -57,8 +67,8 @@ name = "aquatic_udp_bench" version = "0.1.0" dependencies = [ "anyhow", + "aquatic_cli_helpers", "aquatic_udp", - "cli_helpers", "crossbeam-channel", "indicatif", "mimalloc", @@ -74,8 +84,8 @@ name = "aquatic_udp_load_test" version = "0.1.0" dependencies = [ "anyhow", + "aquatic_cli_helpers", "aquatic_udp_protocol", - "cli_helpers", "crossbeam-channel", "hashbrown", "mimalloc", @@ -103,8 +113,8 @@ name = "aquatic_ws" version = "0.1.0" dependencies = [ "anyhow", + "aquatic_cli_helpers", "aquatic_common", - "cli_helpers", "either", "flume", "hashbrown", @@ -257,16 +267,6 @@ dependencies = [ "time", ] -[[package]] -name = "cli_helpers" -version = "0.1.0" -dependencies = [ - "anyhow", - "gumdrop", - "serde", - "toml", -] - [[package]] name = "cloudabi" version = "0.0.3" diff --git a/Cargo.toml b/Cargo.toml index fe3cff5..d9d9e67 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,13 +1,13 @@ [workspace] members = [ + "aquatic_cli_helpers", "aquatic_common", "aquatic_udp", "aquatic_udp_bench", "aquatic_udp_load_test", "aquatic_udp_protocol", "aquatic_ws", - "cli_helpers", ] [profile.release] diff --git a/cli_helpers/Cargo.toml b/aquatic_cli_helpers/Cargo.toml similarity index 89% rename from cli_helpers/Cargo.toml rename to aquatic_cli_helpers/Cargo.toml index e50ebc2..a454f92 100644 --- a/cli_helpers/Cargo.toml +++ b/aquatic_cli_helpers/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "cli_helpers" +name = "aquatic_cli_helpers" version = "0.1.0" authors = ["Joakim Frostegård "] edition = "2018" diff --git a/cli_helpers/src/lib.rs b/aquatic_cli_helpers/src/lib.rs similarity index 100% rename from cli_helpers/src/lib.rs rename to aquatic_cli_helpers/src/lib.rs diff --git a/aquatic_udp/Cargo.toml b/aquatic_udp/Cargo.toml index 5ad50e9..fa49366 100644 --- a/aquatic_udp/Cargo.toml +++ b/aquatic_udp/Cargo.toml @@ -14,9 +14,9 @@ name = "aquatic_udp" [dependencies] anyhow = "1" +aquatic_cli_helpers = { path = "../aquatic_cli_helpers" } aquatic_common = { path = "../aquatic_common" } aquatic_udp_protocol = { path = "../aquatic_udp_protocol" } -cli_helpers = { path = "../cli_helpers" } crossbeam-channel = "0.4" hashbrown = "0.7" histogram = "0.6" diff --git a/aquatic_udp/src/bin/aquatic_udp.rs b/aquatic_udp/src/bin/aquatic_udp.rs index 65ffeee..21957d5 100644 --- a/aquatic_udp/src/bin/aquatic_udp.rs +++ b/aquatic_udp/src/bin/aquatic_udp.rs @@ -1,5 +1,5 @@ use aquatic_udp; -use cli_helpers; +use aquatic_cli_helpers; #[global_allocator] @@ -7,7 +7,7 @@ static GLOBAL: mimalloc::MiMalloc = mimalloc::MiMalloc; fn main(){ - cli_helpers::run_app_with_cli_and_config::( + aquatic_cli_helpers::run_app_with_cli_and_config::( "aquatic: udp bittorrent tracker", aquatic_udp::run, ) diff --git a/aquatic_udp_bench/Cargo.toml b/aquatic_udp_bench/Cargo.toml index aa17288..6da3f10 100644 --- a/aquatic_udp_bench/Cargo.toml +++ b/aquatic_udp_bench/Cargo.toml @@ -16,8 +16,8 @@ name = "plot_pareto" [dependencies] anyhow = "1" +aquatic_cli_helpers = { path = "../aquatic_cli_helpers" } aquatic_udp = { path = "../aquatic_udp" } -cli_helpers = { path = "../cli_helpers" } crossbeam-channel = "0.4" indicatif = "0.14" mimalloc = { version = "0.1", default-features = false } diff --git a/aquatic_udp_bench/src/bin/aquatic_udp_bench_handlers/main.rs b/aquatic_udp_bench/src/bin/aquatic_udp_bench_handlers/main.rs index c450134..0005fa0 100644 --- a/aquatic_udp_bench/src/bin/aquatic_udp_bench_handlers/main.rs +++ b/aquatic_udp_bench/src/bin/aquatic_udp_bench_handlers/main.rs @@ -22,7 +22,7 @@ use rand::{Rng, thread_rng, rngs::SmallRng, SeedableRng}; use aquatic_udp::common::*; use aquatic_udp::config::Config; use aquatic_udp::handlers; -use cli_helpers::run_app_with_cli_and_config; +use aquatic_cli_helpers::run_app_with_cli_and_config; use config::BenchConfig; diff --git a/aquatic_udp_load_test/Cargo.toml b/aquatic_udp_load_test/Cargo.toml index 8750cb5..d5c3ccb 100644 --- a/aquatic_udp_load_test/Cargo.toml +++ b/aquatic_udp_load_test/Cargo.toml @@ -10,8 +10,8 @@ name = "aquatic_udp_load_test" [dependencies] anyhow = "1" +aquatic_cli_helpers = { path = "../aquatic_cli_helpers" } aquatic_udp_protocol = { path = "../aquatic_udp_protocol" } -cli_helpers = { path = "../cli_helpers" } crossbeam-channel = "0.4" hashbrown = "0.7" mimalloc = { version = "0.1", default-features = false } diff --git a/aquatic_udp_load_test/src/main.rs b/aquatic_udp_load_test/src/main.rs index f8a6127..40ba061 100644 --- a/aquatic_udp_load_test/src/main.rs +++ b/aquatic_udp_load_test/src/main.rs @@ -25,7 +25,7 @@ static GLOBAL: mimalloc::MiMalloc = mimalloc::MiMalloc; pub fn main(){ - cli_helpers::run_app_with_cli_and_config::( + aquatic_cli_helpers::run_app_with_cli_and_config::( "aquatic: udp bittorrent tracker: load tester", run, ) diff --git a/aquatic_ws/Cargo.toml b/aquatic_ws/Cargo.toml index 7459e2a..9cf714b 100644 --- a/aquatic_ws/Cargo.toml +++ b/aquatic_ws/Cargo.toml @@ -15,8 +15,8 @@ path = "src/bin/main.rs" [dependencies] anyhow = "1" +aquatic_cli_helpers = { path = "../aquatic_cli_helpers" } aquatic_common = { path = "../aquatic_common" } -cli_helpers = { path = "../cli_helpers" } either = "1" flume = "0.7" hashbrown = { version = "0.7", features = ["serde"] } diff --git a/aquatic_ws/src/bin/main.rs b/aquatic_ws/src/bin/main.rs index 0044f59..3d5b353 100644 --- a/aquatic_ws/src/bin/main.rs +++ b/aquatic_ws/src/bin/main.rs @@ -1,5 +1,5 @@ use anyhow::Context; -use cli_helpers::run_app_with_cli_and_config; +use aquatic_cli_helpers::run_app_with_cli_and_config; use simplelog::{ConfigBuilder, LevelFilter, TermLogger, TerminalMode}; use aquatic_ws::config::{Config, LogLevel};