From c1dd0180381ec051e9beb0c9276929ec8df93a79 Mon Sep 17 00:00:00 2001 From: Grant Date: Fri, 27 Sep 2024 14:00:38 +0200 Subject: [PATCH] Update deadpool-redis --- Cargo.lock | 53 +++++++++------------------ Cargo.toml | 2 +- redis-macros-derive/Cargo.lock | 66 ++-------------------------------- 3 files changed, 19 insertions(+), 102 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 6094190..444ab6c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -25,9 +25,9 @@ checksum = "69f7f8c3906b62b754cd5326047894316021dcfe5a194c8ea52bdd94934a3457" [[package]] name = "async-trait" -version = "0.1.82" +version = "0.1.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a27b8a3a6e1a44fa4c8baf1f653e4172e81486d4941f2237e20dc2d0cf4ddff1" +checksum = "721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd" dependencies = [ "proc-macro2", "quote", @@ -36,9 +36,9 @@ dependencies = [ [[package]] name = "autocfg" -version = "1.3.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" +checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" [[package]] name = "backtrace" @@ -63,9 +63,9 @@ checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" [[package]] name = "bytes" -version = "1.7.1" +version = "1.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50" +checksum = "428d9aa8fbc0670b7b8d6030a7fadd0f86151cae55e4dbbece15f3780a3dfaf3" [[package]] name = "cfg-if" @@ -100,12 +100,12 @@ dependencies = [ [[package]] name = "deadpool-redis" -version = "0.17.0" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4cde57b1dcd182bfa749c847c2e3a5e8602a0c448d7aecd9e7b983d28a0eae2b" +checksum = "bfae6799b68a735270e4344ee3e834365f707c72da09c9a8bb89b45cc3351395" dependencies = [ "deadpool", - "redis 0.26.1", + "redis", ] [[package]] @@ -209,9 +209,9 @@ checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" [[package]] name = "libc" -version = "0.2.158" +version = "0.2.159" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439" +checksum = "561d97a539a36e26a9a5fad1ea11a3039a67714694aaa379433e580854bc3dc5" [[package]] name = "lock_api" @@ -356,27 +356,6 @@ dependencies = [ "proc-macro2", ] -[[package]] -name = "redis" -version = "0.26.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e902a69d09078829137b4a5d9d082e0490393537badd7c91a3d69d14639e115f" -dependencies = [ - "arc-swap", - "async-trait", - "bytes", - "combine", - "futures-util", - "itoa", - "num-bigint", - "percent-encoding", - "pin-project-lite", - "ryu", - "tokio", - "tokio-util", - "url", -] - [[package]] name = "redis" version = "0.27.2" @@ -407,7 +386,7 @@ name = "redis-macros" version = "0.4.2" dependencies = [ "deadpool-redis", - "redis 0.27.2", + "redis", "redis-macros-derive", "serde", "serde_json", @@ -426,9 +405,9 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.5.4" +version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0884ad60e090bf1345b93da0a5de8923c93884cd03f40dfcfddd3b4bee661853" +checksum = "355ae415ccd3a04315d3f8246e86d67689ea74d88d915576e1589a351062a13b" dependencies = [ "bitflags", ] @@ -609,9 +588,9 @@ checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" [[package]] name = "unicode-normalization" -version = "0.1.23" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" +checksum = "5033c97c4262335cded6d6fc3e5c18ab755e1a3dc96376350f3d8e9f009ad956" dependencies = [ "tinyvec", ] diff --git a/Cargo.toml b/Cargo.toml index e3cd143..8cec8c9 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -22,7 +22,7 @@ json = ["dep:redis", "dep:serde", "dep:serde_json"] macros = ["dep:redis-macros-derive"] [dev-dependencies] -deadpool-redis = { version = "0.17" } +deadpool-redis = { version = "0.18" } redis = { version = "0.27", features = ["tokio-comp", "json"] } serde_yaml = "0.9" tokio = { version = "1.38", features = ["full"] } diff --git a/redis-macros-derive/Cargo.lock b/redis-macros-derive/Cargo.lock index 14c7fef..a957930 100644 --- a/redis-macros-derive/Cargo.lock +++ b/redis-macros-derive/Cargo.lock @@ -81,36 +81,6 @@ dependencies = [ "tokio-util", ] -[[package]] -name = "deadpool" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6541a3916932fe57768d4be0b1ffb5ec7cbf74ca8c903fdfd5c0fe8aa958f0ed" -dependencies = [ - "deadpool-runtime", - "num_cpus", - "tokio", -] - -[[package]] -name = "deadpool-redis" -version = "0.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4cde57b1dcd182bfa749c847c2e3a5e8602a0c448d7aecd9e7b983d28a0eae2b" -dependencies = [ - "deadpool", - "redis 0.26.1", -] - -[[package]] -name = "deadpool-runtime" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "092966b41edc516079bdf31ec78a2e0588d1d0c08f78b91d8307215928642b2b" -dependencies = [ - "tokio", -] - [[package]] name = "equivalent" version = "1.0.1" @@ -262,16 +232,6 @@ dependencies = [ "autocfg", ] -[[package]] -name = "num_cpus" -version = "1.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" -dependencies = [ - "hermit-abi", - "libc", -] - [[package]] name = "object" version = "0.36.4" @@ -317,27 +277,6 @@ dependencies = [ "proc-macro2", ] -[[package]] -name = "redis" -version = "0.26.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e902a69d09078829137b4a5d9d082e0490393537badd7c91a3d69d14639e115f" -dependencies = [ - "arc-swap", - "async-trait", - "bytes", - "combine", - "futures-util", - "itoa", - "num-bigint", - "percent-encoding", - "pin-project-lite", - "ryu", - "tokio", - "tokio-util", - "url", -] - [[package]] name = "redis" version = "0.27.2" @@ -367,8 +306,7 @@ dependencies = [ name = "redis-macros" version = "0.4.2" dependencies = [ - "deadpool-redis", - "redis 0.27.2", + "redis", "redis-macros-derive", "serde", "serde_json", @@ -380,7 +318,7 @@ version = "0.4.2" dependencies = [ "proc-macro2", "quote", - "redis 0.27.2", + "redis", "redis-macros", "serde", "serde_json",