diff --git a/Cargo.lock b/Cargo.lock index 54c570e95..1914988af 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -103,7 +103,7 @@ dependencies = [ "futures-core", "futures-util", "mio", - "socket2 0.5.6", + "socket2", "tokio", "tracing", ] @@ -161,7 +161,7 @@ dependencies = [ "serde_json", "serde_urlencoded", "smallvec", - "socket2 0.5.6", + "socket2", "time", "url", ] @@ -822,8 +822,7 @@ dependencies = [ [[package]] name = "cached" version = "0.49.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f251fd1e72720ca07bf5d8e310f54a193fd053479a1f6342c6663ee4fa01cf96" +source = "git+https://github.com/jqnatividad/cached?branch=bump_redis-directories-serial_test#df13621a93576ee823b25d80ef918d82dff37499" dependencies = [ "ahash 0.8.11", "cached_proc_macro", @@ -844,8 +843,7 @@ dependencies = [ [[package]] name = "cached_proc_macro" version = "0.20.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad9f16c0d84de31a2ab7fdf5f7783c14631f7075cf464eb3bb43119f61c9cb2a" +source = "git+https://github.com/jqnatividad/cached?branch=bump_redis-directories-serial_test#df13621a93576ee823b25d80ef918d82dff37499" dependencies = [ "darling", "proc-macro2", @@ -856,8 +854,7 @@ dependencies = [ [[package]] name = "cached_proc_macro_types" version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ade8366b8bd5ba243f0a58f036cc0ca8a2f069cff1a2351ef1cac6b083e16fc0" +source = "git+https://github.com/jqnatividad/cached?branch=bump_redis-directories-serial_test#df13621a93576ee823b25d80ef918d82dff37499" [[package]] name = "calamine" @@ -1480,22 +1477,23 @@ dependencies = [ [[package]] name = "directories" -version = "4.0.1" +version = "5.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f51c5d4ddabd36886dd3e1438cb358cdcb0d7c499cb99cb4ac2e38e18b5cb210" +checksum = "9a49173b84e034382284f27f1af4dcbbd231ffa358c0fe316541a7337f376a35" dependencies = [ "dirs-sys", ] [[package]] name = "dirs-sys" -version = "0.3.7" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6" +checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c" dependencies = [ "libc", + "option-ext", "redox_users", - "winapi", + "windows-sys 0.48.0", ] [[package]] @@ -2332,7 +2330,7 @@ dependencies = [ "http-body", "hyper", "pin-project-lite", - "socket2 0.5.6", + "socket2", "tokio", "tower", "tower-service", @@ -3238,6 +3236,12 @@ version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" +[[package]] +name = "option-ext" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" + [[package]] name = "ord_subset" version = "3.1.1" @@ -4511,9 +4515,9 @@ dependencies = [ [[package]] name = "redis" -version = "0.24.0" +version = "0.25.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c580d9cbbe1d1b479e8d67cf9daf6a62c957e6846048408b80b43ac3f6af84cd" +checksum = "71d64e978fd98a0e6b105d066ba4889a7301fca65aeac850a877d8797343feeb" dependencies = [ "ahash 0.8.11", "combine", @@ -4522,7 +4526,7 @@ dependencies = [ "r2d2", "ryu", "sha1_smol", - "socket2 0.4.10", + "socket2", "url", ] @@ -4903,7 +4907,7 @@ dependencies = [ [[package]] name = "self_update" version = "0.39.0" -source = "git+https://github.com/jqnatividad/self_update/?branch=bump-reqwest_hyper-http2#85623d4caa4b5ec9afa26955dfcd20cdffaaaa59" +source = "git+https://github.com/jqnatividad/self_update?branch=bump-reqwest_hyper-http2#85623d4caa4b5ec9afa26955dfcd20cdffaaaa59" dependencies = [ "hyper", "indicatif", @@ -5202,16 +5206,6 @@ version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b6b67fb9a61334225b5b790716f609cd58395f895b3fe8b328786812a40bc3b" -[[package]] -name = "socket2" -version = "0.4.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f7916fc008ca5542385b89a3d3ce689953c143e9304a9bf8beec1de48994c0d" -dependencies = [ - "libc", - "winapi", -] - [[package]] name = "socket2" version = "0.5.6" @@ -5617,7 +5611,7 @@ dependencies = [ "parking_lot 0.12.1", "pin-project-lite", "signal-hook-registry", - "socket2 0.5.6", + "socket2", "tokio-macros", "windows-sys 0.48.0", ] @@ -5653,7 +5647,7 @@ dependencies = [ "postgres-protocol", "postgres-types", "rand", - "socket2 0.5.6", + "socket2", "tokio", "tokio-util", "whoami", diff --git a/Cargo.toml b/Cargo.toml index 038e2a9d1..daa57b211 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -169,7 +169,7 @@ rand = "0.8" rand_hc = "0.3" rand_xoshiro = "0.6" rayon = "1.10" -redis = { version = "0.24", features = [ +redis = { version = "0.25", features = [ "ahash", "tcp_nodelay", ], default-features = false, optional = true } @@ -242,11 +242,13 @@ serial_test = { version = "3.0", features = ["file_locks"] } dynfmt = { git = "https://github.com/jqnatividad/dynfmt", branch = "2021-clippy_ptr_as_ptr-bumpdeps" } # needed to get latest dependencies and unreleased fixes grex = { git = "https://github.com/pemistahl/grex", rev = "8021cce" } -# use our fork while we wait for the PR to merge reqwest 0.12 +# use our fork while we wait for the PR to bump reqwest to 0.12 # otherwise, our dependency tree blows up a bit with both reqwest 0.11 and 0.12 jsonschema = { git = "https://github.com/jqnatividad/jsonschema-rs", branch = "deps-bump-reqwest-to-0.12" } -# use our fork while we wait for the PR to merge reqwest 0.12 -self_update = { git = "https://github.com/jqnatividad/self_update/", branch = "bump-reqwest_hyper-http2" } +# use our fork while we wait for the PR to bump reqwest to 0.12 and hyper to 1 +self_update = { git = "https://github.com/jqnatividad/self_update", branch = "bump-reqwest_hyper-http2" } +# use our fork while we wait for the PR to bump redis to 0.25 along with other dependencies +cached = { git = "https://github.com/jqnatividad/cached", branch = "bump_redis-directories-serial_test" } [features] default = ["mimalloc"]