clean dependencies

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 1f9073fbda1e4d46dc383b8c7ec3ea41fd9f222d..a2bb06e651dab4f792500d1379fc546d71d4c561 100644 (file)
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -130,7 +130,6 @@ jobs:
         env:
           CC: clang
         run: |
-          update-alternatives --set ld /usr/bin/lld
           make all
       - uses: actions/upload-artifact@v3
         with:

diff --git a/Cargo.lock b/Cargo.lock
index d47e07f6d490cf0ab539288f1ed32acd43434932..7319bc5ba1be15e1c26745146e206054d1a7ac93 100644 (file)
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1143,9 +1143,9 @@ dependencies = [
 
 [[package]]
 name = "io-lifetimes"
-version = "1.0.3"
+version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "46112a93252b123d31a119a8d1a1ac19deac4fac6e0e8b0df58f0d4e5870e63c"
+checksum = "e7d6c6f8c91b4b9ed43484ad1a938e393caf35960fce7f82a040497207bd8e9e"
 dependencies = [
  "libc",
  "windows-sys 0.42.0",
@@ -1218,7 +1218,6 @@ name = "leash"
 version = "0.1.0"
 dependencies = [
  "anyhow",
- "env_logger 0.10.0",
  "opentelemetry",
  "opentelemetry-otlp",
  "serde",
@@ -1945,6 +1944,7 @@ dependencies = [
  "proto",
  "redis",
  "serde",
+ "serde_json",
  "shared",
  "test-log",
  "tikv-jemallocator",
@@ -1953,6 +1953,7 @@ dependencies = [
  "tokio-test",
  "tonic",
  "tracing",
+ "tracing-futures",
  "tracing-opentelemetry",
  "tracing-subscriber",
  "tracing-test",
@@ -2057,7 +2058,6 @@ dependencies = [
  "dns-lookup",
  "futures-util",
  "hashring",
- "http",
  "hyper",
  "hyper-rustls",
  "lazy_static",
@@ -2066,12 +2066,14 @@ dependencies = [
  "opentelemetry-http",
  "proto",
  "serde",
+ "serde_json",
  "shared",
  "tikv-jemallocator",
  "tokio",
  "tokio-stream",
  "tonic",
  "tracing",
+ "tracing-futures",
  "tracing-opentelemetry",
  "twilight-http-ratelimiting 0.14.0 (git+https://github.com/MatthieuCoder/twilight.git)",
  "xxhash-rust",
@@ -2297,15 +2299,6 @@ dependencies = [
  "syn",
 ]
 
-[[package]]
-name = "serde_test"
-version = "1.0.152"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3611210d2d67e3513204742004d6ac6f589e521861dabb0f649b070eea8bed9e"
-dependencies = [
- "serde",
-]
-
 [[package]]
 name = "sha-1"
 version = "0.10.1"
@@ -2368,9 +2361,6 @@ dependencies = [
  "redis",
  "serde",
  "serde_json",
- "serde_repr",
- "serde_test",
- "thiserror",
  "tokio",
  "tracing",
  "twilight-model",

diff --git a/Cargo.toml b/Cargo.toml
index d1d3ac45cb4126f4bc50de4c73f2cd07f6de0147..18d452d931a7c863f50130dc09448b2dfa624bb9 100644 (file)
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -11,3 +11,29 @@ members = [
     "libs/shared/",\r
     "libs/leash/"\r
 ]\r
+\r
+[workspace.dependencies]\r
+shared = { path = "libs/shared" }\r
+proto =  { path = "libs/proto" }\r
+leash = { path = "libs/leash" }\r
+\r
+tokio = { version = "1", features = ["rt-multi-thread"] }\r
+serde = { version = "1", features = ["derive"] }\r
+serde_json = "1"\r
+hyper = "0.14.23"\r
+\r
+anyhow = "1"\r
+\r
+tracing = "0.1"\r
+tracing-futures = "0.2"\r
+tracing-opentelemetry = "0.18"\r
+opentelemetry = "0.18"\r
+opentelemetry-http = "0.7"\r
+tikv-jemallocator = "0.5"\r
+\r
+criterion = { version = "0.4", features = ["async_tokio"] }\r
+tokio-test = "0.4.2"\r
+tracing-test = "0.2.3"\r
+tracing-subscriber = "0.3.16"\r
+test-log = { version = "*", features = ["trace"] }\r
+env_logger = "0.10.0"
\ No newline at end of file

diff --git a/exes/gateway/Cargo.toml b/exes/gateway/Cargo.toml
index e7a08131f12697d97990c7c18f733a79ebb323fb..375a0201dbec68a206813df8536a511f58c3db19 100644 (file)
--- a/exes/gateway/Cargo.toml
+++ b/exes/gateway/Cargo.toml
@@ -4,30 +4,24 @@ version = "0.1.0"
 edition = "2018"
 
 [dependencies]
-shared = { path = "../../libs/shared" }
-proto = { path = "../../libs/proto" }
-leash = { path = "../../libs/leash" }
+shared = { workspace = true }
+proto = { workspace = true }
+leash = { workspace = true }
+tracing-opentelemetry = { workspace = true }
+opentelemetry = { workspace = true }
+opentelemetry-http = { workspace = true }
+tracing = { workspace = true }
+tracing-futures = { workspace = true }
+tokio = { workspace = true }
+anyhow = { workspace = true }
+serde = { workspace = true }
+serde_json = { workspace = true }
 
-tokio = { version = "1", features = ["rt", "signal"] }
 tokio-stream = "0.1.11"
-
 twilight-gateway = { version = "0.14" }
 twilight-model = "0.14"
-
 bytes = "1.3.0"
-anyhow = "1.0.68"
-
-serde = { version = "1.0.8", features = ["derive"] }
-serde_json = { version = "1.0" }
-
-tracing = "0.1.37"
-tracing-futures = "0.2.5"
-
 async-nats = "0.26.0"
 
-tracing-opentelemetry = "0.18.0"
-opentelemetry = "0.18.0"
-opentelemetry-http = "0.7.0"
-
 [target.'cfg(not(target_os = "windows"))'.dependencies]
-tikv-jemallocator = "0.5"
\ No newline at end of file
+tikv-jemallocator = { workspace = true }
\ No newline at end of file

diff --git a/exes/ratelimit/Cargo.toml b/exes/ratelimit/Cargo.toml
index 1d28f3ba9725f4461a14d2e853db6edea18119f1..d7dc554f01e4b52898a2b0a31d1351d69df69c41 100644 (file)
--- a/exes/ratelimit/Cargo.toml
+++ b/exes/ratelimit/Cargo.toml
@@ -6,39 +6,36 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-shared = { path = "../../libs/shared" }
-proto = { path = "../../libs/proto" }
-leash = { path = "../../libs/leash" }
-
-hyper = "0.14"
-tokio = { version = "1", features = ["rt"] }
-
-serde = { version = "1.0.8", features = ["derive"] }
+shared = { workspace = true }
+proto = { workspace = true }
+leash = { workspace = true }
+tracing-opentelemetry = { workspace = true }
+opentelemetry = { workspace = true }
+opentelemetry-http = { workspace = true }
+tracing = { workspace = true }
+tracing-futures = { workspace = true }
+tokio = { workspace = true }
+anyhow = { workspace = true }
+serde = { workspace = true }
+serde_json = { workspace = true }
+hyper = { workspace = true }
 
 twilight-http-ratelimiting = { git = "https://github.com/MatthieuCoder/twilight.git" }
-anyhow = "*"
-tracing = "*"
-tracing-opentelemetry = "0.18.0"
-opentelemetry = "0.18.0"
-opentelemetry-http = "0.7.0"
-
 tonic = "0.8.3"
 tokio-stream = "0.1.11"
-
-
 redis = { version = "0.22.1", features = ["cluster", "connection-manager", "tokio-comp"] }
 
 [dev-dependencies]
-criterion = { version = "0.4", features = ["async_tokio"] }
-tokio-test = "*"
-tracing-test = "0.2.3"
-tracing-subscriber = "*"
-env_logger = "*"
-test-log = { version = "0.2.11", features = ["log", "trace"] }
+criterion = { workspace = true }
+tokio-test = { workspace = true }
+tracing-test = { workspace = true }
+tracing-subscriber = { workspace = true }
+test-log = { workspace = true }
+env_logger = { workspace = true }
+
+[target.'cfg(not(target_os = "windows"))'.dependencies]
+tikv-jemallocator = { workspace = true }
 
 [[bench]]
 name = "bucket"
 harness = false
-
-[target.'cfg(not(target_os = "windows"))'.dependencies]
-tikv-jemallocator = "0.5"
\ No newline at end of file

diff --git a/exes/rest/Cargo.toml b/exes/rest/Cargo.toml
index fb495a073430fb59d632b29762f4d438270ae852..d37da95b96eb45e1d6190caac1a727b060197152 100644 (file)
--- a/exes/rest/Cargo.toml
+++ b/exes/rest/Cargo.toml
@@ -6,30 +6,30 @@ edition = "2018"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-shared = { path = "../../libs/shared" }
-proto = { path = "../../libs/proto" }
-leash = { path = "../../libs/leash" }
+shared = { workspace = true }
+proto = { workspace = true }
+leash = { workspace = true }
+tracing-opentelemetry = { workspace = true }
+opentelemetry = { workspace = true }
+opentelemetry-http = { workspace = true }
+tracing = { workspace = true }
+tracing-futures = { workspace = true }
+tokio = { workspace = true }
+anyhow = { workspace = true }
+serde = { workspace = true }
+serde_json = { workspace = true }
+hyper = { workspace = true }
 
-hyper= "0.14"
-http = "0.2.8"
-
-tokio = { version = "1", features = ["rt"] }
-serde = { version = "1.0.8", features = ["derive"] }
 futures-util = "0.3.17"
 hyper-rustls = "0.23.2"
 lazy_static = "1.4.0"
 xxhash-rust = { version = "0.8.2", features = ["xxh32"] }
 twilight-http-ratelimiting = { git = "https://github.com/MatthieuCoder/twilight.git" }
 
-tracing = "0.1.37"
-anyhow = "1.0.68"
 hashring = "0.3.0"
 tonic = "0.8.3"
 tokio-stream = "0.1.11"
 dns-lookup = "1.0.8"
-opentelemetry = "0.18.0"
-opentelemetry-http = "0.7.0"
-tracing-opentelemetry = "0.18.0"
 
 [target.'cfg(not(target_os = "windows"))'.dependencies]
-tikv-jemallocator = "0.5"
\ No newline at end of file
+tikv-jemallocator = { workspace = true }
\ No newline at end of file

diff --git a/exes/rest/src/handler.rs b/exes/rest/src/handler.rs
index 3d4793514fecd18bf834d5ca2285060becb1a3dc..5e5425e24aa107cae5380b5a9d71287b3d53b781 100644 (file)
--- a/exes/rest/src/handler.rs
+++ b/exes/rest/src/handler.rs
@@ -1,6 +1,6 @@
 use anyhow::{bail, Context};
-use futures_util::FutureExt;
-use http::{
+use futures_util::future::FutureExt;
+use hyper::http::{
     header::{AUTHORIZATION, CONNECTION, HOST, TRANSFER_ENCODING, UPGRADE},
     HeaderValue, Method as HttpMethod, Request, Response, Uri,
 };

diff --git a/exes/webhook/Cargo.toml b/exes/webhook/Cargo.toml
index e4fc0acb59cce281d8fb8953e547872a8849addb..7b4a185ad066eabc54828da6882db97be1cc7777 100644 (file)
--- a/exes/webhook/Cargo.toml
+++ b/exes/webhook/Cargo.toml
@@ -4,20 +4,19 @@ version = "0.1.0"
 edition = "2018"
 
 [dependencies]
-hyper = "0.14"
-tokio = { version = "1", features = ["rt"] }
-shared = { path = "../../libs/shared" }
-proto = { path = "../../libs/proto" }
-leash = { path = "../../libs/leash" }
-tracing = "0.1.37"
-
-serde = { version = "1.0.8", features = ["derive"] }
-serde_json = { version = "1.0" }
+tokio = { workspace = true }
+shared = { workspace = true }
+proto = { workspace = true }
+leash = { workspace = true }
+tracing = { workspace = true }
+serde = { workspace = true }
+serde_json = { workspace = true }
+hyper = { workspace = true }
+anyhow = { workspace = true }
 
 hex = "0.4.3"
 ed25519-dalek = "1"
 twilight-model = { version = "0.14" }
-anyhow = "1.0.68"
 
 async-nats = "0.26.0"
 

diff --git a/libs/leash/Cargo.toml b/libs/leash/Cargo.toml
index b96f3849fba4b575cac8aa5088e0ea2291008535..7153cf9cb427373188abf7166a4fb05068306247 100644 (file)
--- a/libs/leash/Cargo.toml
+++ b/libs/leash/Cargo.toml
@@ -6,14 +6,14 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-shared = { path = "../shared" }
-anyhow = "1.0.68"
-tokio = { version = "1.23.1", features = ["rt", "signal"] }
-serde = "1.0.152"
+shared = { workspace = true }
+anyhow = { workspace = true }
+tokio = { workspace = true }
+serde = { workspace = true }
+opentelemetry = { workspace = true }
+tracing-opentelemetry = { workspace = true }
+tracing = { workspace = true }
+
 tracing-log = { version = "0.1.3", features = ["env_logger"] }
 tracing-subscriber = { version = "0.3.16", features = ["env-filter"] }
-tracing = "0.1.37"
-env_logger = "0.10.0"
-tracing-opentelemetry = "0.18.0"
-opentelemetry = { version ="0.18.0", features = ["rt-tokio"] }
 opentelemetry-otlp = { version = "0.11.0", features = ["metrics"] }

diff --git a/libs/shared/Cargo.toml b/libs/shared/Cargo.toml
index 9b29bf2d357f3afe86b7296249ee535319c0d172..90e30ce5189cdaf1b28b38ba63506cd09123efb9 100644 (file)
--- a/libs/shared/Cargo.toml
+++ b/libs/shared/Cargo.toml
@@ -4,23 +4,16 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-serde = { version = "1.0.8", features = ["derive"] }
-serde_json = { version = "1.0" }
-serde_repr = "0.1"
+serde = { workspace = true }
+serde_json = { workspace = true }
+opentelemetry = { workspace = true }
+tracing = { workspace = true }
+tokio = { workspace = true }
 
 config = { version = "0.13", default-features = false, features = ["json", "yaml-rust", "ini"] }
-
-async-nats = "0.26.0"
 redis = { version = "0.22.1", features = ["cluster", "connection-manager", "tokio-comp"] }
 
-tokio = { version = "1", features = ["signal", "rt"] }
-
+async-nats = "0.26.0"
 twilight-model = "0.14"
-thiserror = "1.0.38"
 anyhow = "1.0.68"
-
-serde_test = "1.0.152"
-
-tracing = "0.1.37"
-opentelemetry-otlp = "0.11.0"
-opentelemetry = "0.18.0"
\ No newline at end of file
+opentelemetry-otlp = "0.11.0"
\ No newline at end of file