From 41a63de6a9b8272f06eb9c80d6a90f6f48748fbe Mon Sep 17 00:00:00 2001 From: edmondwinston <132081506+edmondwinston@users.noreply.github.com> Date: Fri, 22 Dec 2023 12:08:38 +0700 Subject: [PATCH 1/5] define flags --- redis/Cargo.toml | 30 +++++++++++++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) diff --git a/redis/Cargo.toml b/redis/Cargo.toml index f53328b..2d94c99 100644 --- a/redis/Cargo.toml +++ b/redis/Cargo.toml @@ -10,8 +10,36 @@ repository = "https://github.com/djc/bb8" [dependencies] async-trait = "0.1" bb8 = { version = "0.8", path = "../bb8" } -redis = { version = "0.24", default-features = false, features = ["tokio-comp"] } +redis = { version = "0.24" } +# redis = { version = "0.24", default-features = false, features = [ +# "tokio-comp", +# ] } [dev-dependencies] futures-util = "0.3.15" tokio = { version = "1.0.0", features = ["macros", "rt-multi-thread"] } + +[features] +default = ["redis/default"] +acl = [] +aio = ["redis/aio"] +geospatial = [] +json = ["redis/json"] +cluster = ["redis/cluster"] +script = ["redis/script"] +tls-native-tls = ["redis/tls-native-tls"] +tls-rustls = ["redis/tls-rustls"] +tls-rustls-insecure = ["redis/tls-rustls-insecure"] +tls-rustls-webpki-roots = ["redis/tls-rustls-webpki-roots"] +async-std-comp = ["redis/async-std-comp"] +async-std-native-tls-comp = ["redis/async-std-native-tls-comp"] +async-std-rustls-comp = ["redis/async-std-rustls-comp"] +tokio-comp = ["redis/tokio-comp"] +tokio-native-tls-comp = ["redis/tokio-native-tls-comp"] +tokio-rustls-comp = ["redis/tokio-rustls-comp"] +connection-manager = ["redis/connection-manager"] +streams = [] +cluster-async = ["redis/cluster-async"] +keep-alive = ["redis/keep-alive"] +sentinel = ["redis/sentinel"] +tcp_nodelay = [] From 8c81c4b0811201b08b78f015ca3ca014598a37ca Mon Sep 17 00:00:00 2001 From: edmondwinston <132081506+edmondwinston@users.noreply.github.com> Date: Fri, 22 Dec 2023 21:08:44 +0700 Subject: [PATCH 2/5] revert: back to no default features --- redis/Cargo.toml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/redis/Cargo.toml b/redis/Cargo.toml index 2d94c99..bedd0ce 100644 --- a/redis/Cargo.toml +++ b/redis/Cargo.toml @@ -10,10 +10,9 @@ repository = "https://github.com/djc/bb8" [dependencies] async-trait = "0.1" bb8 = { version = "0.8", path = "../bb8" } -redis = { version = "0.24" } -# redis = { version = "0.24", default-features = false, features = [ -# "tokio-comp", -# ] } +redis = { version = "0.24", default-features = false, features = [ + "tokio-comp", +] } [dev-dependencies] futures-util = "0.3.15" From 1cbe0bd621e648d7b2caebf4fdfd88c6f89f8880 Mon Sep 17 00:00:00 2001 From: edmondwinston <132081506+edmondwinston@users.noreply.github.com> Date: Fri, 22 Dec 2023 21:11:38 +0700 Subject: [PATCH 3/5] remove async-std-* exposes --- redis/Cargo.toml | 3 --- 1 file changed, 3 deletions(-) diff --git a/redis/Cargo.toml b/redis/Cargo.toml index bedd0ce..3b7e700 100644 --- a/redis/Cargo.toml +++ b/redis/Cargo.toml @@ -30,9 +30,6 @@ tls-native-tls = ["redis/tls-native-tls"] tls-rustls = ["redis/tls-rustls"] tls-rustls-insecure = ["redis/tls-rustls-insecure"] tls-rustls-webpki-roots = ["redis/tls-rustls-webpki-roots"] -async-std-comp = ["redis/async-std-comp"] -async-std-native-tls-comp = ["redis/async-std-native-tls-comp"] -async-std-rustls-comp = ["redis/async-std-rustls-comp"] tokio-comp = ["redis/tokio-comp"] tokio-native-tls-comp = ["redis/tokio-native-tls-comp"] tokio-rustls-comp = ["redis/tokio-rustls-comp"] From b187027bfcf0fcd63e2cec174dd83aef2dc95748 Mon Sep 17 00:00:00 2001 From: edmondwinston <132081506+edmondwinston@users.noreply.github.com> Date: Fri, 22 Dec 2023 21:35:03 +0700 Subject: [PATCH 4/5] remove *-comp features --- redis/Cargo.toml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/redis/Cargo.toml b/redis/Cargo.toml index 3b7e700..a112132 100644 --- a/redis/Cargo.toml +++ b/redis/Cargo.toml @@ -26,13 +26,10 @@ geospatial = [] json = ["redis/json"] cluster = ["redis/cluster"] script = ["redis/script"] -tls-native-tls = ["redis/tls-native-tls"] -tls-rustls = ["redis/tls-rustls"] +tls-native-tls = ["redis/tls-native-tls", "redis/tokio-native-tls"] +tls-rustls = ["redis/tls-rustls", "redis/tokio-rustls"] tls-rustls-insecure = ["redis/tls-rustls-insecure"] tls-rustls-webpki-roots = ["redis/tls-rustls-webpki-roots"] -tokio-comp = ["redis/tokio-comp"] -tokio-native-tls-comp = ["redis/tokio-native-tls-comp"] -tokio-rustls-comp = ["redis/tokio-rustls-comp"] connection-manager = ["redis/connection-manager"] streams = [] cluster-async = ["redis/cluster-async"] From 408267cce6ab0f9d38f360c951cc37902f30d7eb Mon Sep 17 00:00:00 2001 From: edmondwinston <132081506+edmondwinston@users.noreply.github.com> Date: Fri, 22 Dec 2023 21:38:44 +0700 Subject: [PATCH 5/5] add missed upstream features --- redis/Cargo.toml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/redis/Cargo.toml b/redis/Cargo.toml index a112132..7913cc9 100644 --- a/redis/Cargo.toml +++ b/redis/Cargo.toml @@ -20,9 +20,9 @@ tokio = { version = "1.0.0", features = ["macros", "rt-multi-thread"] } [features] default = ["redis/default"] -acl = [] +acl = ["redis/acl"] aio = ["redis/aio"] -geospatial = [] +geospatial = ["redis/geospatial"] json = ["redis/json"] cluster = ["redis/cluster"] script = ["redis/script"] @@ -31,8 +31,8 @@ tls-rustls = ["redis/tls-rustls", "redis/tokio-rustls"] tls-rustls-insecure = ["redis/tls-rustls-insecure"] tls-rustls-webpki-roots = ["redis/tls-rustls-webpki-roots"] connection-manager = ["redis/connection-manager"] -streams = [] +streams = ["redis/streams"] cluster-async = ["redis/cluster-async"] keep-alive = ["redis/keep-alive"] sentinel = ["redis/sentinel"] -tcp_nodelay = [] +tcp_nodelay = ["redis/tcp_nodelay"]