From 7b4e884f02e1456c0c81914ce103da3bd2bc8308 Mon Sep 17 00:00:00 2001 From: Ryan Daum Date: Sat, 10 Feb 2024 09:57:31 -0500 Subject: [PATCH] More dependency pruning --- Cargo.lock | 81 ------------------------------ crates/console-host/Cargo.toml | 1 - crates/daemon/Cargo.toml | 1 - crates/db/Cargo.toml | 1 - crates/db/src/util.rs | 2 + crates/db/tests/jepsen.rs | 2 + crates/db/tests/rdb_restore.rs | 2 + crates/db/tests/test-support.rs | 14 ++++++ crates/rpc-async-client/Cargo.toml | 1 - crates/rpc-common/Cargo.toml | 2 - crates/rpc-sync-client/Cargo.toml | 1 - crates/telnet-host/Cargo.toml | 3 -- crates/values/Cargo.toml | 1 - crates/web-host/Cargo.toml | 4 -- 14 files changed, 20 insertions(+), 96 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 9ae2f9d53..5c919fc0d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -213,27 +213,6 @@ dependencies = [ "tracing", ] -[[package]] -name = "axum-extra" -version = "0.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "895ff42f72016617773af68fb90da2a9677d89c62338ec09162d4909d86fdd8f" -dependencies = [ - "axum", - "axum-core", - "bytes", - "futures-util", - "http", - "http-body", - "http-body-util", - "mime", - "pin-project-lite", - "serde", - "tower", - "tower-layer", - "tower-service", -] - [[package]] name = "backtrace" version = "0.3.69" @@ -1014,7 +993,6 @@ checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0" dependencies = [ "futures-channel", "futures-core", - "futures-executor", "futures-io", "futures-sink", "futures-task", @@ -1037,17 +1015,6 @@ version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" -[[package]] -name = "futures-executor" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" -dependencies = [ - "futures-core", - "futures-task", - "futures-util", -] - [[package]] name = "futures-io" version = "0.3.30" @@ -1083,13 +1050,10 @@ version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" dependencies = [ - "futures-channel", "futures-core", - "futures-io", "futures-macro", "futures-sink", "futures-task", - "memchr", "pin-project-lite", "pin-utils", "slab", @@ -1605,7 +1569,6 @@ dependencies = [ name = "moor-console-host" version = "0.1.0" dependencies = [ - "bincode", "clap", "clap_derive", "color-eyre", @@ -1637,7 +1600,6 @@ dependencies = [ "rand", "rpc-common", "rusty_paseto", - "serde", "serde_json", "strum", "tracing", @@ -1653,7 +1615,6 @@ dependencies = [ "arc-swap", "atomic-wait", "binary-layout", - "bincode", "criterion", "hi_sparse_bitset", "human_bytes", @@ -1714,17 +1675,14 @@ dependencies = [ name = "moor-telnet-host" version = "0.1.0" dependencies = [ - "bincode", "clap", "clap_derive", "color-eyre", "eyre", - "futures", "futures-util", "moor-values", "rpc-async-client", "rpc-common", - "strum", "tmq", "tokio", "tokio-util", @@ -1749,7 +1707,6 @@ dependencies = [ "thiserror", "uuid", "yoke", - "yoke-derive", ] [[package]] @@ -1757,8 +1714,6 @@ name = "moor-web-host" version = "0.1.0" dependencies = [ "axum", - "axum-extra", - "bincode", "clap", "clap_derive", "color-eyre", @@ -1770,11 +1725,9 @@ dependencies = [ "serde", "serde_derive", "serde_json", - "strum", "thiserror", "tmq", "tokio", - "tokio-util", "tracing", "tracing-subscriber", "uuid", @@ -2337,7 +2290,6 @@ dependencies = [ "bincode", "futures-util", "rpc-common", - "thiserror", "tmq", "tracing", "uuid", @@ -2350,8 +2302,6 @@ dependencies = [ "bincode", "moor-values", "thiserror", - "tracing", - "uuid", ] [[package]] @@ -2360,7 +2310,6 @@ version = "0.1.0" dependencies = [ "bincode", "rpc-common", - "thiserror", "tracing", "uuid", "zmq", @@ -2744,18 +2693,6 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" -[[package]] -name = "synstructure" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "285ba80e733fac80aa4270fbcdf83772a79b80aa35c97075320abfee4a915b06" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.48", - "unicode-xid", -] - [[package]] name = "system-deps" version = "6.2.0" @@ -3224,12 +3161,6 @@ version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" -[[package]] -name = "unicode-xid" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" - [[package]] name = "unindent" version = "0.2.3" @@ -3655,18 +3586,6 @@ dependencies = [ "zerofrom", ] -[[package]] -name = "yoke-derive" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e6936f0cce458098a201c245a11bef556c6a0181129c7034d10d76d1ec3a2b8" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.48", - "synstructure", -] - [[package]] name = "zerocopy" version = "0.7.32" diff --git a/crates/console-host/Cargo.toml b/crates/console-host/Cargo.toml index 99b7666a7..9b5627d01 100644 --- a/crates/console-host/Cargo.toml +++ b/crates/console-host/Cargo.toml @@ -17,7 +17,6 @@ clap.workspace = true clap_derive.workspace = true # General. -bincode.workspace = true color-eyre.workspace = true eyre.workspace = true diff --git a/crates/daemon/Cargo.toml b/crates/daemon/Cargo.toml index 3bb7e08e0..90e8cc80e 100644 --- a/crates/daemon/Cargo.toml +++ b/crates/daemon/Cargo.toml @@ -28,7 +28,6 @@ tracing-subscriber.workspace = true tracing.workspace = true ## RPC daemon support -serde.workspace = true serde_json.workspace = true uuid.workspace = true zmq.workspace = true diff --git a/crates/db/Cargo.toml b/crates/db/Cargo.toml index c40918194..5197f2287 100644 --- a/crates/db/Cargo.toml +++ b/crates/db/Cargo.toml @@ -38,7 +38,6 @@ tracing.workspace = true arc-swap.workspace = true atomic-wait.workspace = true binary-layout.workspace = true -bincode.workspace = true hi_sparse_bitset.workspace = true im.workspace = true io-uring.workspace = true diff --git a/crates/db/src/util.rs b/crates/db/src/util.rs index 24d258ab1..937cdc704 100644 --- a/crates/db/src/util.rs +++ b/crates/db/src/util.rs @@ -11,3 +11,5 @@ // You should have received a copy of the GNU General Public License along with // this program. If not, see . // + + diff --git a/crates/db/tests/jepsen.rs b/crates/db/tests/jepsen.rs index 77c76f2aa..5fa02e5a4 100644 --- a/crates/db/tests/jepsen.rs +++ b/crates/db/tests/jepsen.rs @@ -11,6 +11,8 @@ // You should have received a copy of the GNU General Public License along with // this program. If not, see . // + + #[path = "./test-support.rs"] mod support; diff --git a/crates/db/tests/rdb_restore.rs b/crates/db/tests/rdb_restore.rs index 7c40eb116..3dc777dfa 100644 --- a/crates/db/tests/rdb_restore.rs +++ b/crates/db/tests/rdb_restore.rs @@ -11,6 +11,8 @@ // You should have received a copy of the GNU General Public License along with // this program. If not, see . // + + #[path = "./test-support.rs"] mod support; diff --git a/crates/db/tests/test-support.rs b/crates/db/tests/test-support.rs index ad5c59813..27e85a7cd 100644 --- a/crates/db/tests/test-support.rs +++ b/crates/db/tests/test-support.rs @@ -1,3 +1,17 @@ +// Copyright (C) 2024 Ryan Daum +// +// This program is free software: you can redistribute it and/or modify it under +// the terms of the GNU General Public License as published by the Free Software +// Foundation, version 3. +// +// This program is distributed in the hope that it will be useful, but WITHOUT +// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS +// FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License along with +// this program. If not, see . +// + use moor_db::rdb::{RelBox, RelationInfo}; use std::path::PathBuf; use std::sync::Arc; diff --git a/crates/rpc-async-client/Cargo.toml b/crates/rpc-async-client/Cargo.toml index 0cdabf0bf..16508af36 100644 --- a/crates/rpc-async-client/Cargo.toml +++ b/crates/rpc-async-client/Cargo.toml @@ -13,7 +13,6 @@ rpc-common = { path = "../rpc-common" } bincode.workspace = true futures-util.workspace = true -thiserror.workspace = true tmq.workspace = true tracing.workspace = true uuid.workspace = true diff --git a/crates/rpc-common/Cargo.toml b/crates/rpc-common/Cargo.toml index eab573862..84c8daf8c 100644 --- a/crates/rpc-common/Cargo.toml +++ b/crates/rpc-common/Cargo.toml @@ -13,5 +13,3 @@ moor-values = { path = "../values" } bincode.workspace = true thiserror.workspace = true -tracing.workspace = true -uuid.workspace = true diff --git a/crates/rpc-sync-client/Cargo.toml b/crates/rpc-sync-client/Cargo.toml index 44cbb53c6..64529ff1f 100644 --- a/crates/rpc-sync-client/Cargo.toml +++ b/crates/rpc-sync-client/Cargo.toml @@ -12,7 +12,6 @@ rust-version.workspace = true rpc-common = { path = "../rpc-common" } bincode.workspace = true -thiserror.workspace = true tracing.workspace = true uuid.workspace = true zmq.workspace = true diff --git a/crates/telnet-host/Cargo.toml b/crates/telnet-host/Cargo.toml index a5a362286..79805e8f9 100644 --- a/crates/telnet-host/Cargo.toml +++ b/crates/telnet-host/Cargo.toml @@ -15,14 +15,11 @@ rpc-common = { path = "../rpc-common" } ## Command line arguments parsing. clap.workspace = true clap_derive.workspace = true -strum.workspace = true ## General. -bincode.workspace = true color-eyre.workspace = true eyre.workspace = true futures-util.workspace = true -futures.workspace = true ## Asynchronous transaction processing & networking tokio-util.workspace = true diff --git a/crates/values/Cargo.toml b/crates/values/Cargo.toml index b038bceb7..08732d3bf 100644 --- a/crates/values/Cargo.toml +++ b/crates/values/Cargo.toml @@ -19,5 +19,4 @@ num-traits.workspace = true strum.workspace = true thiserror.workspace = true uuid.workspace = true -yoke-derive.workspace = true yoke.workspace = true \ No newline at end of file diff --git a/crates/web-host/Cargo.toml b/crates/web-host/Cargo.toml index 3b76ad684..b420dc6cf 100644 --- a/crates/web-host/Cargo.toml +++ b/crates/web-host/Cargo.toml @@ -15,17 +15,14 @@ rpc-common = { path = "../rpc-common" } ## Command line arguments parsing. clap.workspace = true clap_derive.workspace = true -strum.workspace = true # General. -bincode.workspace = true color-eyre.workspace = true eyre.workspace = true futures-util.workspace = true thiserror.workspace = true ## Asynchronous transaction processing & networking -tokio-util.workspace = true tokio.workspace = true ## Logging & tracing @@ -37,7 +34,6 @@ tmq.workspace = true uuid.workspace = true # HTTP/websockets layer -axum-extra.workspace = true axum.workspace = true serde.workspace = true serde_derive.workspace = true