in order to update quinn / rusttls, move config to workspace Cargo.toml

Cargo.toml

@@ -161,6 +161,10 @@ async-trait = "0.1.42"
 sha2 = "0.10"
 hex = "0.4.3"
 
+#TODO add  features = ["std"] in 0.22
+rustls = { version = "0.21", default-features = false }
+quinn = { version = "0.10" }
+
 [patch.crates-io]
 # until next specs release
 specs = { git = "https://github.com/amethyst/specs.git", rev = "4e2da1df29ee840baa9b936593c45592b7c9ae27" }

client/Cargo.toml

@@ -7,30 +7,51 @@ edition = "2021"
 [features]
 simd = ["vek/platform_intrinsics"]
 plugins = ["common-state/plugins"]
-bin_bot = ["serde", "ron", "clap", "rustyline", "common-frontend", "async-channel", "voxygen-i18n-helpers", "client-i18n"]
+bin_bot = [
+    "serde",
+    "ron",
+    "clap",
+    "rustyline",
+    "common-frontend",
+    "async-channel",
+    "voxygen-i18n-helpers",
+    "client-i18n",
+]
 tracy = ["common-base/tracy"]
 tick_network = []
 
 default = ["simd"]
 
 [dependencies]
-common = { package = "veloren-common", path = "../common", features = ["no-assets"] }
+common = { package = "veloren-common", path = "../common", features = [
+    "no-assets",
+] }
 common-base = { package = "veloren-common-base", path = "../common/base" }
 common-state = { package = "veloren-common-state", path = "../common/state", default-features = false }
 common-systems = { package = "veloren-common-systems", path = "../common/systems", default-features = false }
 common-net = { package = "veloren-common-net", path = "../common/net" }
-network = { package = "veloren-network", path = "../network", features = ["compression","quic"], default-features = false }
+network = { package = "veloren-network", path = "../network", features = [
+    "compression",
+    "quic",
+], default-features = false }
 
 byteorder = "1.3.2"
 tokio = { workspace = true, features = ["rt-multi-thread"] }
-quinn = { version = "0.10", features = ["rustls"] }
-rustls = { version = "0.21.6", features = ["dangerous_configuration"] }
-hickory-resolver = { version = "0.24.0", features = ["system-config", "tokio-runtime"] }
+quinn = { workspace = true, features = ["rustls"] }
+rustls = { workspace = true, features = ["dangerous_configuration"] }
+hickory-resolver = { version = "0.24.0", features = [
+    "system-config",
+    "tokio-runtime",
+] }
 image = { workspace = true }
 num = { workspace = true }
 tracing = { workspace = true }
 rayon = { workspace = true }
-specs = { workspace = true, features = ["serde", "storage-event-control", "derive"] }
+specs = { workspace = true, features = [
+    "serde",
+    "storage-event-control",
+    "derive",
+] }
 vek = { workspace = true }
 hashbrown = { workspace = true }
 authc = { git = "https://gitlab.com/veloren/auth.git", rev = "abb1a705827984e11706d7bb97fb7a459e1e6533" } # xMAC94x/current_master_till_refactored branch
@@ -40,7 +61,7 @@ authc = { git = "https://gitlab.com/veloren/auth.git", rev = "abb1a705827984e117
 async-channel = { version = "2.1", optional = true }
 voxygen-i18n-helpers = { package = "veloren-voxygen-i18n-helpers", path = "../voxygen/i18n-helpers", optional = true }
 client-i18n = { package = "veloren-client-i18n", path = "i18n", optional = true }
-serde = { workspace = true, features = [ "rc" ], optional = true }
+serde = { workspace = true, features = ["rc"], optional = true }
 ron = { workspace = true, optional = true }
 clap = { workspace = true, optional = true }
 rustyline = { version = "14.0.0", optional = true }

network/Cargo.toml

@@ -11,7 +11,7 @@ metrics = ["prometheus", "network-protocol/metrics"]
 compression = ["lz-fear"]
 quic = ["quinn"]
 
-default = ["metrics","compression","quic"]
+default = ["metrics", "compression", "quic"]
 
 [dependencies]
 
@@ -31,13 +31,13 @@ tracing = { workspace = true }
 prometheus = { workspace = true, optional = true }
 #async
 futures-util = { workspace = true, features = ["std"] }
-async-channel = "2.1" #use for .close() channels
+async-channel = "2.1"                                   #use for .close() channels
 #mpsc channel registry
 lazy_static = { workspace = true }
 rand = { workspace = true }
 #quic support
-quinn = { version = "0.10", optional = true }
-rustls = "0.21"
+quinn = { workspace = true, optional = true }
+rustls = { workspace = true }
 lz-fear = { version = "0.2", optional = true }
 # async traits
 async-trait = { workspace = true }
@@ -46,16 +46,33 @@ bytes = "^1"
 hashbrown = { workspace = true }
 
 [dev-dependencies]
-tracing-subscriber = { version = "0.3.7", default-features = false, features = ["env-filter", "fmt", "time", "ansi", "smallvec"] }
-tokio = { workspace = true, default-features = false, features = ["io-std", "fs", "rt-multi-thread"] }
-futures-util = { workspace = true, default-features = false, features = ["sink", "std"] }
+tracing-subscriber = { version = "0.3.7", default-features = false, features = [
+    "env-filter",
+    "fmt",
+    "time",
+    "ansi",
+    "smallvec",
+] }
+tokio = { workspace = true, default-features = false, features = [
+    "io-std",
+    "fs",
+    "rt-multi-thread",
+] }
+futures-util = { workspace = true, default-features = false, features = [
+    "sink",
+    "std",
+] }
 clap = { workspace = true }
 shellexpand = "3.1.0"
 serde = { version = "1.0", features = ["derive"] }
 prometheus-hyper = { workspace = true }
-criterion = { version = "0.5.1", default-features=false, features=["rayon", "cargo_bench_support", "async_tokio"]}
+criterion = { version = "0.5.1", default-features = false, features = [
+    "rayon",
+    "cargo_bench_support",
+    "async_tokio",
+] }
 #quic
-rcgen = { version = "0.12"}
+rcgen = { version = "0.12" }
 
 [[bench]]
 name = "speed"

server/Cargo.toml

@@ -46,8 +46,8 @@ tracing = { workspace = true }
 vek = { workspace = true }
 futures-util = { workspace = true }
 tokio = { workspace = true }
-quinn = "0.10"
-rustls = { version = "0.21", default-features = false }
+quinn = { workspace = true }
+rustls = { workspace = true }
 rustls-pemfile = { version = "1", default-features = false }
 atomicwrites = "0.4"
 chrono = { workspace = true }