From b4c74c0ecd9776d91b973fe00bb647de7f227727 Mon Sep 17 00:00:00 2001 From: Heikki Linnakangas Date: Wed, 20 Jul 2022 12:12:02 +0300 Subject: [PATCH] Clean up unnecessary dependencies. Just to be tidy. --- Cargo.lock | 8 -------- compute_tools/Cargo.toml | 1 - control_plane/Cargo.toml | 1 - libs/metrics/Cargo.toml | 1 - neon_local/Cargo.toml | 1 - pageserver/Cargo.toml | 1 - pageserver/src/walreceiver/walreceiver_connection.rs | 2 +- safekeeper/Cargo.toml | 3 --- 8 files changed, 1 insertion(+), 17 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 4f453678e6..5031ae02e3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -467,7 +467,6 @@ dependencies = [ "clap 3.2.12", "env_logger", "hyper", - "libc", "log", "postgres", "regex", @@ -517,7 +516,6 @@ dependencies = [ "tar", "thiserror", "toml", - "url", "utils", "workspace_hack", ] @@ -1604,7 +1602,6 @@ version = "0.1.0" dependencies = [ "lazy_static", "libc", - "once_cell", "prometheus", "workspace_hack", ] @@ -1677,7 +1674,6 @@ dependencies = [ "git-version", "pageserver", "postgres", - "postgres_ffi", "safekeeper", "serde_json", "utils", @@ -1905,7 +1901,6 @@ dependencies = [ "thiserror", "tokio", "tokio-postgres", - "tokio-stream", "toml_edit", "tracing", "url", @@ -2764,7 +2759,6 @@ dependencies = [ "daemonize", "etcd_broker", "fs2", - "futures", "git-version", "hex", "humantime", @@ -2784,12 +2778,10 @@ dependencies = [ "tempfile", "tokio", "tokio-postgres", - "tokio-util", "toml_edit", "tracing", "url", "utils", - "walkdir", "workspace_hack", ] diff --git a/compute_tools/Cargo.toml b/compute_tools/Cargo.toml index 1022438c2e..78b85d0e79 100644 --- a/compute_tools/Cargo.toml +++ b/compute_tools/Cargo.toml @@ -4,7 +4,6 @@ version = "0.1.0" edition = "2021" [dependencies] -libc = "0.2" anyhow = "1.0" chrono = "0.4" clap = "3.0" diff --git a/control_plane/Cargo.toml b/control_plane/Cargo.toml index 21311eea9a..26bb577636 100644 --- a/control_plane/Cargo.toml +++ b/control_plane/Cargo.toml @@ -14,7 +14,6 @@ regex = "1" anyhow = "1.0" thiserror = "1" nix = "0.23" -url = "2.2.2" reqwest = { version = "0.11", default-features = false, features = ["blocking", "json", "rustls-tls"] } pageserver = { path = "../pageserver" } diff --git a/libs/metrics/Cargo.toml b/libs/metrics/Cargo.toml index 8ff5d1d421..2879dfed81 100644 --- a/libs/metrics/Cargo.toml +++ b/libs/metrics/Cargo.toml @@ -7,5 +7,4 @@ edition = "2021" prometheus = {version = "0.13", default_features=false, features = ["process"]} # removes protobuf dependency libc = "0.2" lazy_static = "1.4" -once_cell = "1.8.0" workspace_hack = { version = "0.1", path = "../../workspace_hack" } diff --git a/neon_local/Cargo.toml b/neon_local/Cargo.toml index 8ebd7d5c17..2fc38cfe02 100644 --- a/neon_local/Cargo.toml +++ b/neon_local/Cargo.toml @@ -15,6 +15,5 @@ git-version = "0.3.5" pageserver = { path = "../pageserver" } control_plane = { path = "../control_plane" } safekeeper = { path = "../safekeeper" } -postgres_ffi = { path = "../libs/postgres_ffi" } utils = { path = "../libs/utils" } workspace_hack = { version = "0.1", path = "../workspace_hack" } diff --git a/pageserver/Cargo.toml b/pageserver/Cargo.toml index b7d97a67c0..215fa151a0 100644 --- a/pageserver/Cargo.toml +++ b/pageserver/Cargo.toml @@ -29,7 +29,6 @@ postgres-types = { git = "https://github.com/zenithdb/rust-postgres.git", rev="d postgres-protocol = { git = "https://github.com/zenithdb/rust-postgres.git", rev="d052ee8b86fff9897c77b0fe89ea9daba0e1fa38" } postgres = { git = "https://github.com/zenithdb/rust-postgres.git", rev="d052ee8b86fff9897c77b0fe89ea9daba0e1fa38" } tokio-postgres = { git = "https://github.com/zenithdb/rust-postgres.git", rev="d052ee8b86fff9897c77b0fe89ea9daba0e1fa38" } -tokio-stream = "0.1.8" anyhow = { version = "1.0", features = ["backtrace"] } crc32c = "0.6.0" thiserror = "1.0" diff --git a/pageserver/src/walreceiver/walreceiver_connection.rs b/pageserver/src/walreceiver/walreceiver_connection.rs index 98b36dfe48..0c8c0ae2f6 100644 --- a/pageserver/src/walreceiver/walreceiver_connection.rs +++ b/pageserver/src/walreceiver/walreceiver_connection.rs @@ -9,12 +9,12 @@ use std::{ use anyhow::{bail, ensure, Context}; use bytes::BytesMut; use fail::fail_point; +use futures::StreamExt; use postgres::{SimpleQueryMessage, SimpleQueryRow}; use postgres_protocol::message::backend::ReplicationMessage; use postgres_types::PgLsn; use tokio::{pin, select, sync::watch, time}; use tokio_postgres::{replication::ReplicationStream, Client}; -use tokio_stream::StreamExt; use tracing::{debug, error, info, info_span, trace, warn, Instrument}; use super::TaskEvent; diff --git a/safekeeper/Cargo.toml b/safekeeper/Cargo.toml index 373108c61b..f6ae9e75d7 100644 --- a/safekeeper/Cargo.toml +++ b/safekeeper/Cargo.toml @@ -20,7 +20,6 @@ postgres = { git = "https://github.com/zenithdb/rust-postgres.git", rev="d052ee8 anyhow = "1.0" crc32c = "0.6.0" humantime = "2.1.0" -walkdir = "2" url = "2.2.2" signal-hook = "0.3.10" serde = { version = "1.0", features = ["derive"] } @@ -28,11 +27,9 @@ serde_with = "1.12.0" hex = "0.4.3" const_format = "0.2.21" tokio-postgres = { git = "https://github.com/zenithdb/rust-postgres.git", rev="d052ee8b86fff9897c77b0fe89ea9daba0e1fa38" } -tokio-util = { version = "0.7", features = ["io"] } git-version = "0.3.5" async-trait = "0.1" once_cell = "1.10.0" -futures = "0.3.13" toml_edit = { version = "0.13", features = ["easy"] } postgres_ffi = { path = "../libs/postgres_ffi" }