From 52482ad3db2b33102d2ad5772f2f3a2c985a36bf Mon Sep 17 00:00:00 2001 From: Jonathan Johnson Date: Tue, 9 Nov 2021 18:31:20 -0800 Subject: [PATCH] Fixing feature flag dependencies - For convenience, directly including bonsaidb-local works and includes the 'full' features by default. The reference in keystorage-s3 was enabling full again. - cli was enabling client-full, but there is no client cli currently, and that will not be the correct choice if there is one. --- crates/bonsaidb-keystorage-s3/Cargo.toml | 2 +- crates/bonsaidb/Cargo.toml | 10 +--------- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/crates/bonsaidb-keystorage-s3/Cargo.toml b/crates/bonsaidb-keystorage-s3/Cargo.toml index e7b3eadb5d7..95293aa6fd1 100644 --- a/crates/bonsaidb-keystorage-s3/Cargo.toml +++ b/crates/bonsaidb-keystorage-s3/Cargo.toml @@ -17,7 +17,7 @@ rust-s3 = { version = "0.27", default-features = false, features = [ "with-tokio", "tokio-rustls-tls", ] } -bonsaidb-local = { version = "0.1.0-dev.4", path = "../bonsaidb-local" } +bonsaidb-local = { version = "0.1.0-dev.4", path = "../bonsaidb-local", default-features = false } async-trait = "0.1" anyhow = "1" diff --git a/crates/bonsaidb/Cargo.toml b/crates/bonsaidb/Cargo.toml index 6fd4b35c1df..fb7e816ddf2 100644 --- a/crates/bonsaidb/Cargo.toml +++ b/crates/bonsaidb/Cargo.toml @@ -81,15 +81,7 @@ bincode = ["bonsaidb-core/bincode"] keystorage-s3 = ["bonsaidb-keystorage-s3"] -cli = [ - "anyhow", - "tokio", - "structopt", - "url", - "client-full", - "local-cli", - "server-cli", -] +cli = ["anyhow", "tokio", "structopt", "url", "local-cli", "server-cli"] local-cli = ["bonsaidb-local/cli"] server-cli = ["bonsaidb-server/cli"]