From 931aa3005cb201fe4477f1fc39b632f4b454fdd0 Mon Sep 17 00:00:00 2001 From: Conrad Ludgate Date: Thu, 9 May 2024 13:29:36 +0100 Subject: [PATCH] couple mode --- Cargo.lock | 5 +---- libs/postgres_backend/Cargo.toml | 3 +-- libs/pq_proto/Cargo.toml | 1 - proxy/Cargo.toml | 2 +- workspace_hack/Cargo.toml | 3 +-- 5 files changed, 4 insertions(+), 10 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 2d5a104e37..7245dc439f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4065,7 +4065,6 @@ dependencies = [ "anyhow", "async-trait", "bytes", - "futures", "once_cell", "pq_proto", "rustls 0.22.4", @@ -4143,7 +4142,6 @@ dependencies = [ "serde", "thiserror", "tokio", - "tracing", "workspace_hack", ] @@ -7371,11 +7369,10 @@ dependencies = [ "crossbeam-utils", "either", "fail", + "futures", "futures-channel", - "futures-core", "futures-executor", "futures-io", - "futures-sink", "futures-util", "getrandom 0.2.11", "hashbrown 0.14.5", diff --git a/libs/postgres_backend/Cargo.toml b/libs/postgres_backend/Cargo.toml index 8e249c09f7..c00e406123 100644 --- a/libs/postgres_backend/Cargo.toml +++ b/libs/postgres_backend/Cargo.toml @@ -8,7 +8,6 @@ license.workspace = true async-trait.workspace = true anyhow.workspace = true bytes.workspace = true -futures.workspace = true rustls.workspace = true serde.workspace = true thiserror.workspace = true @@ -23,4 +22,4 @@ workspace_hack.workspace = true once_cell.workspace = true rustls-pemfile.workspace = true tokio-postgres.workspace = true -tokio-postgres-rustls.workspace = true \ No newline at end of file +tokio-postgres-rustls.workspace = true diff --git a/libs/pq_proto/Cargo.toml b/libs/pq_proto/Cargo.toml index 6eeb3bafef..d268c66c98 100644 --- a/libs/pq_proto/Cargo.toml +++ b/libs/pq_proto/Cargo.toml @@ -11,7 +11,6 @@ pin-project-lite.workspace = true postgres-protocol.workspace = true rand.workspace = true tokio.workspace = true -tracing.workspace = true thiserror.workspace = true serde.workspace = true diff --git a/proxy/Cargo.toml b/proxy/Cargo.toml index 965f36fef8..b3b37896b9 100644 --- a/proxy/Cargo.toml +++ b/proxy/Cargo.toml @@ -25,7 +25,6 @@ chrono.workspace = true clap.workspace = true consumption_metrics.workspace = true dashmap.workspace = true -env_logger.workspace = true futures.workspace = true git-version.workspace = true hashbrown.workspace = true @@ -101,6 +100,7 @@ workspace_hack.workspace = true [dev-dependencies] camino-tempfile.workspace = true +env_logger.workspace = true fallible-iterator.workspace = true rcgen.workspace = true tokio-postgres-rustls.workspace = true diff --git a/workspace_hack/Cargo.toml b/workspace_hack/Cargo.toml index b86c74c1c8..5f1070fb58 100644 --- a/workspace_hack/Cargo.toml +++ b/workspace_hack/Cargo.toml @@ -29,11 +29,10 @@ clap_builder = { version = "4", default-features = false, features = ["color", " crossbeam-utils = { version = "0.8" } either = { version = "1" } fail = { version = "0.5", default-features = false, features = ["failpoints"] } +futures = { version = "0.3" } futures-channel = { version = "0.3", features = ["sink"] } -futures-core = { version = "0.3" } futures-executor = { version = "0.3" } futures-io = { version = "0.3" } -futures-sink = { version = "0.3" } futures-util = { version = "0.3", features = ["channel", "io", "sink"] } getrandom = { version = "0.2", default-features = false, features = ["std"] } hashbrown = { version = "0.14", features = ["raw"] }