YGGverse/aquatic
1
0
Fork 0
mirror of https://github.com/YGGverse/aquatic.git synced 2026-03-31 17:55:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

s/toml_config/aquatic_toml_config/

Browse source
This commit is contained in:
Joakim Frostegård 2022-02-19 15:11:00 +01:00
parent 8abdf702b7
commit 14a4c10546
27 changed files with 77 additions and 77 deletions
Download patch file Download diff file Expand all files Collapse all files

58
Cargo.lock generated
View file

@ -59,10 +59,10 @@ name = "aquatic_cli_helpers"
version = "0.1.0"
dependencies = [
"anyhow",
"aquatic_toml_config",
"serde",
"simplelog",
"toml",
"toml_config",
]
[[package]]
@ -71,6 +71,7 @@ version = "0.1.0"
dependencies = [
"ahash",
"anyhow",
"aquatic_toml_config",
"arc-swap",
"hashbrown 0.12.0",
"hex",
@ -81,7 +82,6 @@ dependencies = [
"privdrop",
"rand",
"serde",
"toml_config",
]
[[package]]
@ -92,6 +92,7 @@ dependencies = [
"aquatic_cli_helpers",
"aquatic_common",
"aquatic_http_protocol",
"aquatic_toml_config",
"cfg-if",
"either",
"futures-lite",
@ -111,7 +112,6 @@ dependencies = [
"signal-hook",
"slab",
"smartstring",
"toml_config",
]
[[package]]
@ -122,6 +122,7 @@ dependencies = [
"aquatic_cli_helpers",
"aquatic_common",
"aquatic_http_protocol",
"aquatic_toml_config",
"futures-lite",
"glommio 0.6.0 (git+https://github.com/DataDog/glommio.git?rev=4e6b14772da2f4325271fbcf12d24cf91ed466e5)",
"hashbrown 0.12.0",
@ -133,7 +134,6 @@ dependencies = [
"rand_distr",
"rustls",
"serde",
"toml_config",
]
[[package]]
@ -157,6 +157,26 @@ dependencies = [
"urlencoding",
]
[[package]]
name = "aquatic_toml_config"
version = "0.1.0"
dependencies = [
"aquatic_toml_config_derive",
"quickcheck",
"quickcheck_macros",
"serde",
"toml",
]
[[package]]
name = "aquatic_toml_config_derive"
version = "0.1.0"
dependencies = [
"proc-macro2",
"quote",
"syn",
]
[[package]]
name = "aquatic_udp"
version = "0.1.0"
@ -164,6 +184,7 @@ dependencies = [
"anyhow",
"aquatic_cli_helpers",
"aquatic_common",
"aquatic_toml_config",
"aquatic_udp_protocol",
"cfg-if",
"chrono",
@ -181,7 +202,6 @@ dependencies = [
"slab",
"socket2 0.4.4",
"tinytemplate",
"toml_config",
]
[[package]]
@ -191,6 +211,7 @@ dependencies = [
"anyhow",
"aquatic_cli_helpers",
"aquatic_common",
"aquatic_toml_config",
"aquatic_udp",
"aquatic_udp_protocol",
"crossbeam-channel",
@ -200,7 +221,6 @@ dependencies = [
"rand",
"rand_distr",
"serde",
"toml_config",
]
[[package]]
@ -210,6 +230,7 @@ dependencies = [
"anyhow",
"aquatic_cli_helpers",
"aquatic_common",
"aquatic_toml_config",
"aquatic_udp_protocol",
"hashbrown 0.12.0",
"mimalloc",
@ -220,7 +241,6 @@ dependencies = [
"rand_distr",
"serde",
"socket2 0.4.4",
"toml_config",
]
[[package]]
@ -240,6 +260,7 @@ dependencies = [
"anyhow",
"aquatic_cli_helpers",
"aquatic_common",
"aquatic_toml_config",
"aquatic_ws_protocol",
"async-tungstenite",
"cfg-if",
@ -265,7 +286,6 @@ dependencies = [
"signal-hook",
"slab",
"socket2 0.4.4",
"toml_config",
"tungstenite",
]
@ -276,6 +296,7 @@ dependencies = [
"anyhow",
"aquatic_cli_helpers",
"aquatic_common",
"aquatic_toml_config",
"aquatic_ws_protocol",
"async-tungstenite",
"futures",
@ -290,7 +311,6 @@ dependencies = [
"rustls",
"serde",
"serde_json",
"toml_config",
"tungstenite",
]
@ -2073,26 +2093,6 @@ dependencies = [
"serde",
]
[[package]]
name = "toml_config"
version = "0.1.0"
dependencies = [
"quickcheck",
"quickcheck_macros",
"serde",
"toml",
"toml_config_derive",
]
[[package]]
name = "toml_config_derive"
version = "0.1.0"
dependencies = [
"proc-macro2",
"quote",
"syn",
]
[[package]]
name = "tracing"
version = "0.1.31"

14
Cargo.toml
View file

@ -7,6 +7,8 @@ members = [
"aquatic_http",
"aquatic_http_load_test",
"aquatic_http_protocol",
"aquatic_toml_config",
"aquatic_toml_config_derive",
"aquatic_udp",
"aquatic_udp_bench",
"aquatic_udp_load_test",
@ -14,26 +16,24 @@ members = [
"aquatic_ws",
"aquatic_ws_load_test",
"aquatic_ws_protocol",
"toml_config",
"toml_config_derive",
]
[patch.crates-io]
aquatic = { path = "aquatic" }
aquatic_cli_helpers = { path = "aquatic_cli_helpers" }
aquatic_common = { path = "aquatic_common" }
aquatic_http = { path = "aquatic_http" }
aquatic_http_load_test = { path = "aquatic_http_load_test" }
aquatic_http = { path = "aquatic_http" }
aquatic_http_protocol = { path = "aquatic_http_protocol" }
aquatic_udp = { path = "aquatic_udp" }
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 = { path = "aquatic_ws" }
aquatic_ws_load_test = { path = "aquatic_ws_load_test" }
aquatic_ws = { path = "aquatic_ws" }
aquatic_ws_protocol = { path = "aquatic_ws_protocol" }
toml_config = { path = "toml_config" }
toml_config_derive = { path = "toml_config_derive" }
[profile.release]
debug = true

2
aquatic_cli_helpers/Cargo.toml
View file

@ -12,4 +12,4 @@ anyhow = "1"
serde = { version = "1", features = ["derive"] }
simplelog = "0.11"
toml = "0.5"
toml_config = "0.1.0"
aquatic_toml_config = "0.1.0"

2
aquatic_cli_helpers/src/lib.rs
View file

@ -4,7 +4,7 @@ use std::io::Read;
use anyhow::Context;
use serde::{de::DeserializeOwned, Deserialize, Serialize};
use simplelog::{ColorChoice, ConfigBuilder, LevelFilter, TermLogger, TerminalMode};
use toml_config::TomlConfig;
use aquatic_toml_config::TomlConfig;
/// Log level. Available values are off, error, warn, info, debug and trace.
#[derive(Debug, Clone, Copy, PartialEq, TomlConfig, Serialize, Deserialize)]

2
aquatic_common/Cargo.toml
View file

@ -24,7 +24,7 @@ log = "0.4"
privdrop = "0.5"
rand = { version = "0.8", features = ["small_rng"] }
serde = { version = "1", features = ["derive"] }
toml_config = "0.1.0"
aquatic_toml_config = "0.1.0"
# cpu-pinning
hwloc = { version = "0.5", optional = true }

2
aquatic_common/src/access_list.rs
View file

@ -7,7 +7,7 @@ use anyhow::Context;
use arc_swap::{ArcSwap, Cache};
use hashbrown::HashSet;
use serde::{Deserialize, Serialize};
use toml_config::TomlConfig;
use aquatic_toml_config::TomlConfig;
/// Access list mode. Available modes are white, black and off.
#[derive(Clone, Copy, Debug, PartialEq, TomlConfig, Serialize, Deserialize)]

2
aquatic_common/src/cpu_pinning.rs
View file

@ -1,6 +1,6 @@
use hwloc::{CpuSet, ObjectType, Topology, CPUBIND_THREAD};
use serde::{Deserialize, Serialize};
use toml_config::TomlConfig;
use aquatic_toml_config::TomlConfig;
#[derive(Clone, Debug, PartialEq, TomlConfig, Serialize, Deserialize)]
#[serde(rename_all = "lowercase")]

2
aquatic_common/src/privileges.rs
View file

@ -8,7 +8,7 @@ use std::{
use privdrop::PrivDrop;
use serde::Deserialize;
use toml_config::TomlConfig;
use aquatic_toml_config::TomlConfig;
#[derive(Clone, Debug, PartialEq, TomlConfig, Deserialize)]
#[serde(default)]

2
aquatic_http/Cargo.toml
View file

@ -38,7 +38,7 @@ serde = { version = "1", features = ["derive"] }
signal-hook = { version = "0.3" }
slab = "0.4"
smartstring = "0.2"
toml_config = "0.1.0"
aquatic_toml_config = "0.1.0"
[dev-dependencies]
quickcheck = "1"

4
aquatic_http/src/config.rs
View file

@ -2,7 +2,7 @@ use std::{net::SocketAddr, path::PathBuf};
use aquatic_common::{access_list::AccessListConfig, privileges::PrivilegeConfig};
use serde::Deserialize;
use toml_config::TomlConfig;
use aquatic_toml_config::TomlConfig;
use aquatic_cli_helpers::LogLevel;
@ -120,5 +120,5 @@ impl Default for CleaningConfig {
mod tests {
use super::Config;
::toml_config::gen_serialize_deserialize_test!(Config);
::aquatic_toml_config::gen_serialize_deserialize_test!(Config);
}

2
aquatic_http_load_test/Cargo.toml
View file

@ -26,7 +26,7 @@ rand = { version = "0.8", features = ["small_rng"] }
rand_distr = "0.4"
rustls = { version = "0.20", features = ["dangerous_configuration"] }
serde = { version = "1", features = ["derive"] }
toml_config = "0.1.0"
aquatic_toml_config = "0.1.0"
[dev-dependencies]
quickcheck = "1"

4
aquatic_http_load_test/src/config.rs
View file

@ -2,7 +2,7 @@ use std::net::SocketAddr;
use aquatic_cli_helpers::LogLevel;
use serde::Deserialize;
use toml_config::TomlConfig;
use aquatic_toml_config::TomlConfig;
/// aquatic_http_load_test configuration
#[derive(Clone, Debug, PartialEq, TomlConfig, Deserialize)]
@ -80,5 +80,5 @@ impl Default for TorrentConfig {
mod tests {
use super::Config;
::toml_config::gen_serialize_deserialize_test!(Config);
::aquatic_toml_config::gen_serialize_deserialize_test!(Config);
}

6
toml_config/Cargo.toml → aquatic_toml_config/Cargo.toml
View file

@ -1,5 +1,5 @@
[package]
name = "toml_config"
name = "aquatic_toml_config"
version = "0.1.0"
authors = ["Joakim Frostegård <joakim.frostegard@gmail.com>"]
edition = "2021"
@ -9,11 +9,11 @@ repository = "https://github.com/greatest-ape/aquatic"
exclude = ["target"]
[lib]
name = "toml_config"
name = "aquatic_toml_config"
[dependencies]
toml = "0.5"
toml_config_derive = { path = "../toml_config_derive" }
aquatic_toml_config_derive = { path = "../aquatic_toml_config_derive" }
[dev-dependencies]
serde = { version = "1.0", features = ["derive"] }

8
toml_config/src/lib.rs → aquatic_toml_config/src/lib.rs
View file

@ -1,5 +1,5 @@
pub use toml;
pub use toml_config_derive::TomlConfig;
pub use aquatic_toml_config_derive::TomlConfig;
/// Run this on your struct implementing TomlConfig to generate a
/// serialization/deserialization test for it.
@ -8,9 +8,9 @@ macro_rules! gen_serialize_deserialize_test {
($ident:ident) => {
#[test]
fn test_cargo_toml_serialize_deserialize() {
use ::toml_config::TomlConfig;
use ::aquatic_toml_config::TomlConfig;
let serialized = $ident::default_to_string();
let deserialized = ::toml_config::toml::de::from_str(&serialized).unwrap();
let deserialized = ::aquatic_toml_config::toml::de::from_str(&serialized).unwrap();
assert_eq!($ident::default(), deserialized);
}
@ -24,7 +24,7 @@ macro_rules! gen_serialize_deserialize_test {
///
/// Usage:
/// ```
/// use toml_config::TomlConfig;
/// use aquatic_toml_config::TomlConfig;
///
/// #[derive(TomlConfig)]
/// struct SubConfig {

2
toml_config/tests/test.rs → aquatic_toml_config/tests/test.rs
View file

@ -1,6 +1,6 @@
use serde::Deserialize;
use toml_config::{gen_serialize_deserialize_test, TomlConfig};
use aquatic_toml_config::{gen_serialize_deserialize_test, TomlConfig};
#[derive(Clone, Debug, PartialEq, Eq, TomlConfig, Deserialize)]
struct TestConfigInnerA {

2
toml_config_derive/Cargo.toml → aquatic_toml_config_derive/Cargo.toml
View file

@ -1,5 +1,5 @@
[package]
name = "toml_config_derive"
name = "aquatic_toml_config_derive"
version = "0.1.0"
authors = ["Joakim Frostegård <joakim.frostegard@gmail.com>"]
edition = "2021"

10
toml_config_derive/src/lib.rs → aquatic_toml_config_derive/src/lib.rs
View file

@ -18,7 +18,7 @@ pub fn derive(input: proc_macro::TokenStream) -> proc_macro::TokenStream {
extract_from_struct(ident.clone(), struct_data, &mut output_stream);
proc_macro::TokenStream::from(quote! {
impl ::toml_config::TomlConfig for #ident {
impl ::aquatic_toml_config::TomlConfig for #ident {
fn default_to_string() -> String {
let mut output = String::new();
@ -40,7 +40,7 @@ pub fn derive(input: proc_macro::TokenStream) -> proc_macro::TokenStream {
output
}
}
impl ::toml_config::__private::Private for #ident {
impl ::aquatic_toml_config::__private::Private for #ident {
fn __to_string(&self, comment: Option<String>, field_name: String) -> String {
let mut output = String::new();
@ -65,7 +65,7 @@ pub fn derive(input: proc_macro::TokenStream) -> proc_macro::TokenStream {
})
}
Data::Enum(_) => proc_macro::TokenStream::from(quote! {
impl ::toml_config::__private::Private for #ident {
impl ::aquatic_toml_config::__private::Private for #ident {
fn __to_string(&self, comment: Option<String>, field_name: String) -> String {
let mut output = String::new();
let wrapping_comment: Option<String> = #comment;
@ -78,7 +78,7 @@ pub fn derive(input: proc_macro::TokenStream) -> proc_macro::TokenStream {
output.push_str(&comment);
}
let value = match ::toml_config::toml::ser::to_string(self) {
let value = match ::aquatic_toml_config::toml::ser::to_string(self) {
Ok(value) => value,
Err(err) => panic!("Couldn't serialize enum to toml: {:#}", err),
};
@ -119,7 +119,7 @@ fn extract_from_struct(
let comment: Option<String> = #comment;
let field_default: #path = struct_default.#ident;
let s: String = ::toml_config::__private::Private::__to_string(
let s: String = ::aquatic_toml_config::__private::Private::__to_string(
&field_default,
comment,
#ident_string.to_string()

2
aquatic_udp/Cargo.toml
View file

@ -35,7 +35,7 @@ slab = "0.4"
signal-hook = { version = "0.3" }
socket2 = { version = "0.4", features = ["all"] }
tinytemplate = "1"
toml_config = "0.1.0"
aquatic_toml_config = "0.1.0"
[dev-dependencies]
quickcheck = "1"

4
aquatic_udp/src/config.rs
View file

@ -4,7 +4,7 @@ use aquatic_common::{access_list::AccessListConfig, privileges::PrivilegeConfig}
use serde::Deserialize;
use aquatic_cli_helpers::LogLevel;
use toml_config::TomlConfig;
use aquatic_toml_config::TomlConfig;
/// aquatic_udp configuration
#[derive(Clone, Debug, PartialEq, TomlConfig, Deserialize)]
@ -199,5 +199,5 @@ impl Default for CleaningConfig {
mod tests {
use super::Config;
::toml_config::gen_serialize_deserialize_test!(Config);
::aquatic_toml_config::gen_serialize_deserialize_test!(Config);
}

2
aquatic_udp_bench/Cargo.toml
View file

@ -22,4 +22,4 @@ num-format = "0.4"
rand = { version = "0.8", features = ["small_rng"] }
rand_distr = "0.4"
serde = { version = "1", features = ["derive"] }
toml_config = "0.1.0"
aquatic_toml_config = "0.1.0"

4
aquatic_udp_bench/src/config.rs
View file

@ -1,5 +1,5 @@
use serde::Deserialize;
use toml_config::TomlConfig;
use aquatic_toml_config::TomlConfig;
#[derive(Clone, Debug, PartialEq, TomlConfig, Deserialize)]
pub struct BenchConfig {
@ -30,5 +30,5 @@ impl aquatic_cli_helpers::Config for BenchConfig {}
mod tests {
use super::BenchConfig;
::toml_config::gen_serialize_deserialize_test!(BenchConfig);
::aquatic_toml_config::gen_serialize_deserialize_test!(BenchConfig);
}

2
aquatic_udp_load_test/Cargo.toml
View file

@ -24,7 +24,7 @@ rand = { version = "0.8", features = ["small_rng"] }
rand_distr = "0.4"
serde = { version = "1", features = ["derive"] }
socket2 = { version = "0.4", features = ["all"] }
toml_config = "0.1.0"
aquatic_toml_config = "0.1.0"
[dev-dependencies]
quickcheck = "1"

4
aquatic_udp_load_test/src/config.rs
View file

@ -5,7 +5,7 @@ use serde::Deserialize;
use aquatic_cli_helpers::LogLevel;
#[cfg(feature = "cpu-pinning")]
use aquatic_common::cpu_pinning::CpuPinningConfig;
use toml_config::TomlConfig;
use aquatic_toml_config::TomlConfig;
/// aquatic_udp_load_test configuration
#[derive(Clone, Debug, PartialEq, TomlConfig, Deserialize)]
@ -131,5 +131,5 @@ impl Default for RequestConfig {
mod tests {
use super::Config;
::toml_config::gen_serialize_deserialize_test!(Config);
::aquatic_toml_config::gen_serialize_deserialize_test!(Config);
}

2
aquatic_ws/Cargo.toml
View file

@ -36,7 +36,7 @@ rustls-pemfile = "0.3"
serde = { version = "1", features = ["derive"] }
signal-hook = { version = "0.3" }
slab = "0.4"
toml_config = "0.1.0"
aquatic_toml_config = "0.1.0"
tungstenite = "0.17"
# mio

4
aquatic_ws/src/config.rs
View file

@ -7,7 +7,7 @@ use aquatic_common::{access_list::AccessListConfig, privileges::PrivilegeConfig}
use serde::Deserialize;
use aquatic_cli_helpers::LogLevel;
use toml_config::TomlConfig;
use aquatic_toml_config::TomlConfig;
/// aquatic_ws configuration
#[derive(Clone, Debug, PartialEq, TomlConfig, Deserialize)]
@ -199,5 +199,5 @@ impl Default for StatisticsConfig {
mod tests {
use super::Config;
::toml_config::gen_serialize_deserialize_test!(Config);
::aquatic_toml_config::gen_serialize_deserialize_test!(Config);
}

2
aquatic_ws_load_test/Cargo.toml
View file

@ -28,7 +28,7 @@ rand_distr = "0.4"
rustls = { version = "0.20", features = ["dangerous_configuration"] }
serde = { version = "1", features = ["derive"] }
serde_json = "1"
toml_config = "0.1.0"
aquatic_toml_config = "0.1.0"
tungstenite = "0.17"
[dev-dependencies]

4
aquatic_ws_load_test/src/config.rs
View file

@ -4,7 +4,7 @@ use aquatic_cli_helpers::LogLevel;
#[cfg(feature = "cpu-pinning")]
use aquatic_common::cpu_pinning::CpuPinningConfig;
use serde::Deserialize;
use toml_config::TomlConfig;
use aquatic_toml_config::TomlConfig;
/// aquatic_ws_load_test configuration
#[derive(Clone, Debug, PartialEq, TomlConfig, Deserialize)]
@ -79,5 +79,5 @@ impl Default for TorrentConfig {
mod tests {
use super::Config;
::toml_config::gen_serialize_deserialize_test!(Config);
::aquatic_toml_config::gen_serialize_deserialize_test!(Config);
}