From fbcdb3860ae951083a65f40ca001e265ea6e51b3 Mon Sep 17 00:00:00 2001 From: Jason Volk Date: Wed, 12 Jun 2024 01:13:19 +0000 Subject: [PATCH] eliminate dep:rust-rocksdb et al from admin crate Signed-off-by: Jason Volk --- Cargo.lock | 1 - src/admin/Cargo.toml | 15 +-------------- src/main/Cargo.toml | 4 ---- 3 files changed, 1 insertion(+), 19 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 3294de97..929fc542 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -610,7 +610,6 @@ dependencies = [ "loole", "regex", "ruma", - "rust-rocksdb-uwu", "serde", "serde_json", "serde_yaml", diff --git a/src/admin/Cargo.toml b/src/admin/Cargo.toml index 42327430..98e3a5b4 100644 --- a/src/admin/Cargo.toml +++ b/src/admin/Cargo.toml @@ -24,18 +24,7 @@ release_max_log_level = [ "log/max_level_trace", "log/release_max_level_info", ] -rocksdb = [ - "dep:rust-rocksdb", -] -jemalloc = [ - "rust-rocksdb/jemalloc", -] -io_uring = [ - "rust-rocksdb/io-uring", -] -zstd_compression = [ - "rust-rocksdb/zstd", -] +rocksdb = [] [dependencies] clap.workspace = true @@ -48,8 +37,6 @@ log.workspace = true loole.workspace = true regex.workspace = true ruma.workspace = true -rust-rocksdb.optional = true -rust-rocksdb.workspace = true serde_json.workspace = true serde.workspace = true serde_yaml.workspace = true diff --git a/src/main/Cargo.toml b/src/main/Cargo.toml index cb7cb9a9..b2ead09e 100644 --- a/src/main/Cargo.toml +++ b/src/main/Cargo.toml @@ -82,11 +82,9 @@ hardened_malloc = [ "conduit-core/hardened_malloc", ] io_uring = [ - "conduit-admin/io_uring", "conduit-database/io_uring", ] jemalloc = [ - "conduit-admin/jemalloc", "conduit-core/jemalloc", "conduit-database/jemalloc", ] @@ -117,7 +115,6 @@ release_max_log_level = [ "conduit-service/release_max_log_level", ] rocksdb = [ - "conduit-admin/rocksdb", "conduit-database/rocksdb", ] sentry_telemetry = [ @@ -136,7 +133,6 @@ tokio_console = [ "tokio/tracing", ] zstd_compression = [ - "conduit-admin/zstd_compression", "conduit-core/zstd_compression", "conduit-database/zstd_compression", "conduit-router/zstd_compression",