diff --git a/Cargo.lock b/Cargo.lock index f7a42684..16c9b178 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -499,18 +499,6 @@ dependencies = [ "serde", ] -[[package]] -name = "bb8" -version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d89aabfae550a5c44b43ab941844ffcd2e993cb6900b342debf59e9ea74acdb8" -dependencies = [ - "async-trait", - "futures-util", - "parking_lot", - "tokio", -] - [[package]] name = "bb8" version = "0.9.0" @@ -528,19 +516,18 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e570e6557cd0f88d28d32afa76644873271a70dc22656df565b2021c4036aa9c" dependencies = [ - "bb8 0.9.0", + "bb8", "tokio", "tokio-postgres", ] [[package]] name = "bb8-redis" -version = "0.17.0" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1781f22daa0ae97d934fdf04a5c66646f154a164c4bdc157ec8d3c11166c05cc" +checksum = "5143936af5e1eea1a881e3e3d21b6777da6315e5e307bc3d0c2301c44fa37da9" dependencies = [ - "async-trait", - "bb8 0.8.6", + "bb8", "redis", ] @@ -1107,7 +1094,7 @@ version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7fcc26599f590c7e5b182a05061cfb445f216bb069df72eb31f38cffde8ca598" dependencies = [ - "bb8 0.9.0", + "bb8", "diesel", "futures-core", "futures-util", @@ -1880,7 +1867,7 @@ name = "example-tokio-postgres" version = "0.1.0" dependencies = [ "axum", - "bb8 0.9.0", + "bb8", "bb8-postgres", "tokio", "tokio-postgres", @@ -1893,9 +1880,7 @@ name = "example-tokio-redis" version = "0.1.0" dependencies = [ "axum", - "bb8 0.8.6", "bb8-redis", - "redis", "tokio", "tracing", "tracing-subscriber", @@ -2534,7 +2519,7 @@ dependencies = [ "http-body", "hyper", "pin-project-lite", - "socket2", + "socket2 0.5.8", "tokio", "tower-service", "tracing", @@ -2745,7 +2730,7 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b58db92f96b720de98181bbbe63c831e87005ab460c1bf306eb2622b4707997f" dependencies = [ - "socket2", + "socket2 0.5.8", "widestring", "windows-sys 0.48.0", "winreg", @@ -2842,9 +2827,9 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" [[package]] name = "libc" -version = "0.2.169" +version = "0.2.175" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a" +checksum = "6a82ae493e598baaea5209805c49bbf2ea7de956d50d7da0da1164f9c6d28543" [[package]] name = "libloading" @@ -3110,7 +3095,7 @@ dependencies = [ "serde_with", "sha-1", "sha2 0.10.8", - "socket2", + "socket2 0.5.8", "stringprep", "strsim", "take_mut", @@ -3661,7 +3646,7 @@ dependencies = [ "quinn-udp", "rustc-hash 2.1.0", "rustls 0.23.20", - "socket2", + "socket2 0.5.8", "thiserror 2.0.9", "tokio", "tracing", @@ -3696,7 +3681,7 @@ dependencies = [ "cfg_aliases", "libc", "once_cell", - "socket2", + "socket2 0.5.8", "tracing", "windows-sys 0.59.0", ] @@ -3792,23 +3777,20 @@ dependencies = [ [[package]] name = "redis" -version = "0.27.6" +version = "0.32.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09d8f99a4090c89cc489a94833c901ead69bfbf3877b4867d5482e321ee875bc" +checksum = "7cd3650deebc68526b304898b192fa4102a4ef0b9ada24da096559cb60e0eef8" dependencies = [ - "arc-swap", - "async-trait", "bytes", + "cfg-if 1.0.0", "combine", "futures-util", - "itertools 0.13.0", "itoa", "num-bigint", "percent-encoding", "pin-project-lite", "ryu", - "sha1_smol", - "socket2", + "socket2 0.6.0", "tokio", "tokio-util", "url", @@ -4304,12 +4286,6 @@ dependencies = [ "digest 0.10.7", ] -[[package]] -name = "sha1_smol" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbfa15b3dddfee50a0fff136974b3e1bde555604ba463834a7eb7deb6417705d" - [[package]] name = "sha2" version = "0.9.9" @@ -4420,6 +4396,16 @@ dependencies = [ "windows-sys 0.52.0", ] +[[package]] +name = "socket2" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "233504af464074f9d066d7b5416c5f9b894a5862a6506e306f7b816cdd6f1807" +dependencies = [ + "libc", + "windows-sys 0.59.0", +] + [[package]] name = "spin" version = "0.9.8" @@ -4897,7 +4883,7 @@ dependencies = [ "parking_lot", "pin-project-lite", "signal-hook-registry", - "socket2", + "socket2 0.5.8", "tokio-macros", "windows-sys 0.52.0", ] @@ -4954,7 +4940,7 @@ dependencies = [ "postgres-protocol", "postgres-types", "rand 0.8.5", - "socket2", + "socket2 0.5.8", "tokio", "tokio-util", "whoami", diff --git a/examples/tokio-redis/Cargo.toml b/examples/tokio-redis/Cargo.toml index 86d8513b..440065c9 100644 --- a/examples/tokio-redis/Cargo.toml +++ b/examples/tokio-redis/Cargo.toml @@ -6,9 +6,7 @@ publish = false [dependencies] axum = { path = "../../axum" } -bb8 = "0.8.5" -bb8-redis = "0.17.0" -redis = "0.27.2" +bb8-redis = "0.24" tokio = { version = "1.0", features = ["full"] } tracing = "0.1" tracing-subscriber = { version = "0.3", features = ["env-filter"] } diff --git a/examples/tokio-redis/src/main.rs b/examples/tokio-redis/src/main.rs index 105b1de4..6c32b666 100644 --- a/examples/tokio-redis/src/main.rs +++ b/examples/tokio-redis/src/main.rs @@ -10,13 +10,13 @@ use axum::{ routing::get, Router, }; -use bb8::{Pool, PooledConnection}; -use bb8_redis::RedisConnectionManager; -use redis::AsyncCommands; +use bb8_redis::{ + bb8::{self, Pool, PooledConnection}, + redis::AsyncCommands, + RedisConnectionManager, +}; use tracing_subscriber::{layer::SubscriberExt, util::SubscriberInitExt}; -use bb8_redis::bb8; - #[tokio::main] async fn main() { tracing_subscriber::registry()