From e75a1356330a016ce20ca5dbcab1296488f9045c Mon Sep 17 00:00:00 2001 From: Brandon Thomas Date: Sun, 18 Jan 2026 00:56:02 -0500 Subject: [PATCH] upgrade redis limitation crate --- Cargo.lock | 702 ++++++++-------------------- Cargo.toml | 2 +- crates/vendor/limitation/Cargo.toml | 2 +- crates/vendor/limitation/src/lib.rs | 68 +-- 4 files changed, 224 insertions(+), 550 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 235d43ccc7..4656f8a6ed 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -12,7 +12,7 @@ dependencies = [ "actix-rt", "actix_derive", "bitflags 2.5.0", - "bytes 1.10.1", + "bytes", "crossbeam-channel", "futures-core", "futures-sink", @@ -20,9 +20,9 @@ dependencies = [ "futures-util", "log", "once_cell", - "parking_lot 0.12.2", + "parking_lot", "pin-project-lite", - "smallvec 1.15.1", + "smallvec", "tokio", "tokio-util", ] @@ -34,7 +34,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5f7b0a21988c1bf877cf4759ef5ddaac04c1c9fe808c9142ecb78ba97d97a28a" dependencies = [ "bitflags 2.5.0", - "bytes 1.10.1", + "bytes", "futures-core", "futures-sink", "memchr", @@ -56,7 +56,7 @@ dependencies = [ "futures-util", "log", "once_cell", - "smallvec 1.15.1", + "smallvec", ] [[package]] @@ -73,7 +73,7 @@ dependencies = [ "base64 0.22.1", "bitflags 2.5.0", "brotli 6.0.0", - "bytes 1.10.1", + "bytes", "bytestring", "derive_more 0.99.17", "encoding_rs", @@ -91,7 +91,7 @@ dependencies = [ "pin-project-lite", "rand 0.8.5", "sha1 0.10.6", - "smallvec 1.15.1", + "smallvec", "tokio", "tokio-util", "tracing", @@ -117,7 +117,7 @@ dependencies = [ "actix-multipart-derive", "actix-utils", "actix-web", - "bytes 1.10.1", + "bytes", "derive_more 0.99.17", "futures-core", "futures-util", @@ -154,7 +154,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "13d324164c51f63867b57e73ba5936ea151b8a41a1d23d1031eeb9f70d0236f8" dependencies = [ "bytestring", - "cfg-if 1.0.0", + "cfg-if", "http 0.2.11", "regex", "regex-lite", @@ -226,9 +226,9 @@ dependencies = [ "actix-utils", "actix-web-codegen", "ahash 0.8.12", - "bytes 1.10.1", + "bytes", "bytestring", - "cfg-if 1.0.0", + "cfg-if", "cookie 0.16.2", "derive_more 0.99.17", "encoding_rs", @@ -245,7 +245,7 @@ dependencies = [ "serde", "serde_json", "serde_urlencoded", - "smallvec 1.15.1", + "smallvec", "socket2 0.5.10", "time", "url", @@ -261,7 +261,7 @@ dependencies = [ "actix-codec", "actix-http", "actix-web", - "bytes 1.10.1", + "bytes", "bytestring", "futures-core", "pin-project-lite", @@ -296,7 +296,7 @@ dependencies = [ "ahash 0.8.12", "arc-swap", "async-trait", - "bytes 1.10.1", + "bytes", "bytestring", "csv", "derive_more 0.99.17", @@ -400,7 +400,7 @@ version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9e8b47f52ea9bae42228d07ec09eb676433d7c4ed1ebdf0f1d1c29ed446f1ab8" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "cipher 0.3.0", "cpufeatures", "opaque-debug", @@ -412,7 +412,7 @@ version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b169f7a6d4742236a0a00c541b845991d0ac43e546831af1249753ab4c3aa3a0" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "cipher 0.4.4", "cpufeatures", ] @@ -434,7 +434,7 @@ version = "0.8.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5a15f179cd60c4584b8a8c596927aadc462e27f2ca70c04e0071964a73ba7a75" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "getrandom 0.3.1", "once_cell", "version_check", @@ -658,7 +658,7 @@ dependencies = [ "artcraft_api_defs", "base64 0.22.1", "build_metadata", - "bytes 1.10.1", + "bytes", "chrono", "cookie_store 0.0.1", "directories", @@ -724,12 +724,6 @@ dependencies = [ "workspace-build-acceleration", ] -[[package]] -name = "ascii" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eab1c04a571841102f5345a8fc0f6bb3d31c315dec879b5c6e42e40ce7ffa34e" - [[package]] name = "ashpd" version = "0.9.2" @@ -843,7 +837,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "43a2b323ccce0a1d90b449fd71f2a06ca7faa7c54c2751f06c9bd851fc061059" dependencies = [ "async-lock", - "cfg-if 1.0.0", + "cfg-if", "concurrent-queue", "futures-io", "futures-lite 2.6.0", @@ -878,7 +872,7 @@ dependencies = [ "async-signal", "async-task", "blocking", - "cfg-if 1.0.0", + "cfg-if", "event-listener 5.2.0", "futures-lite 2.6.0", "rustix 0.38.44", @@ -905,7 +899,7 @@ dependencies = [ "async-io", "async-lock", "atomic-waker", - "cfg-if 1.0.0", + "cfg-if", "futures-core", "futures-io", "rustix 0.38.44", @@ -968,7 +962,7 @@ checksum = "a92140fa7152f9dcde7554cb1da37c7ae93b0c724db5214c754c55a9765afbe8" dependencies = [ "async-stripe-client-core", "async-stripe-shared", - "bytes 1.10.1", + "bytes", "http-body-util", "hyper 1.6.0", "hyper-rustls 0.27.3", @@ -1014,7 +1008,7 @@ checksum = "fb1f6b6693946e650a9361feb319389a1408534ec1b618cd9239f1e2e20b8668" dependencies = [ "async-stripe-shared", "async-stripe-types", - "bytes 1.10.1", + "bytes", "futures-util", "miniserde", "serde", @@ -1227,7 +1221,7 @@ dependencies = [ "async-trait", "axum-core", "bitflags 1.3.2", - "bytes 1.10.1", + "bytes", "futures-util", "http 0.2.11", "http-body 0.4.6", @@ -1253,7 +1247,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "759fa577a247914fd3f7f76d62972792636412fbfd634cd452f6a385a74d2d2c" dependencies = [ "async-trait", - "bytes 1.10.1", + "bytes", "futures-util", "http 0.2.11", "http-body 0.4.6", @@ -1284,7 +1278,7 @@ checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" dependencies = [ "addr2line", "cc", - "cfg-if 1.0.0", + "cfg-if", "libc", "miniz_oxide 0.7.2", "object", @@ -1858,16 +1852,6 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f1fe948ff07f4bd06c30984e69f5b4899c516a3ef74f34df92a2df2ab535495" -[[package]] -name = "bytes" -version = "0.4.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "206fdffcfa2df7cbe15601ef46c813fce0965eb3286db6b56c583b814b51c81c" -dependencies = [ - "byteorder", - "iovec", -] - [[package]] name = "bytes" version = "1.10.1" @@ -1883,7 +1867,7 @@ version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "74d80203ea6b29df88012294f62733de21cfeab47f17b41af3a38bc30a03ee72" dependencies = [ - "bytes 1.10.1", + "bytes", ] [[package]] @@ -2037,16 +2021,10 @@ version = "0.15.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d067ad48b8650848b989a59a86c6c36a995d02d2bf778d45c3c5d57bc2718f02" dependencies = [ - "smallvec 1.15.1", + "smallvec", "target-lexicon", ] -[[package]] -name = "cfg-if" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" - [[package]] name = "cfg-if" version = "1.0.0" @@ -2194,15 +2172,6 @@ dependencies = [ "workspace-build-acceleration", ] -[[package]] -name = "cloudabi" -version = "0.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f" -dependencies = [ - "bitflags 1.3.2", -] - [[package]] name = "cloudflare_errors" version = "0.0.1" @@ -2259,26 +2228,13 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b6a852b24ab71dffc585bcb46eaf7959d175cb865a7152e35b348d1b2960422" -[[package]] -name = "combine" -version = "3.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da3da6baa321ec19e1cc41d31bf599f00c783d0517095cdaf0332e3fe8d20680" -dependencies = [ - "ascii", - "byteorder", - "either", - "memchr", - "unreachable", -] - [[package]] name = "combine" version = "4.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "35ed6e9d84f0b51a7f52daf1c7d71dd136fd7a3f41a8462b8cdb8c78d920fad4" dependencies = [ - "bytes 1.10.1", + "bytes", "futures-core", "memchr", "pin-project-lite", @@ -2293,7 +2249,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f86b9c4c00838774a6d902ef931eff7470720c51d90c2e32cfe15dc304737b3f" dependencies = [ "castaway", - "cfg-if 1.0.0", + "cfg-if", "itoa 1.0.11", "ryu", "static_assertions", @@ -2364,7 +2320,7 @@ version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f057a694a54f12365049b0958a1685bb52d567f5593b355fbf685838e873d400" dependencies = [ - "crossbeam-utils 0.8.20", + "crossbeam-utils", ] [[package]] @@ -2592,13 +2548,19 @@ version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "19d374276b40fb8bbdee95aef7c7fa6b5316ec764510eb64b8dd0e2ed0d7e7f5" +[[package]] +name = "crc16" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "338089f42c427b86394a5ee60ff321da23a5c89c9d89514c829687b26359fcff" + [[package]] name = "crc32fast" version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", ] [[package]] @@ -2615,7 +2577,7 @@ version = "0.5.13" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "33480d6946193aa8033910124896ca395333cae7e2d1113d1fef6c3272217df2" dependencies = [ - "crossbeam-utils 0.8.20", + "crossbeam-utils", ] [[package]] @@ -2624,9 +2586,9 @@ version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "crossbeam-epoch", - "crossbeam-utils 0.8.20", + "crossbeam-utils", ] [[package]] @@ -2636,8 +2598,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7" dependencies = [ "autocfg", - "cfg-if 1.0.0", - "crossbeam-utils 0.8.20", + "cfg-if", + "crossbeam-utils", "memoffset", "scopeguard", ] @@ -2648,19 +2610,8 @@ version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d1cfb3ea8a53f37c40dea2c7bedcbd88bdfae54f5e2175d6ecaff1c988353add" dependencies = [ - "cfg-if 1.0.0", - "crossbeam-utils 0.8.20", -] - -[[package]] -name = "crossbeam-utils" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8" -dependencies = [ - "autocfg", - "cfg-if 0.1.10", - "lazy_static", + "cfg-if", + "crossbeam-utils", ] [[package]] @@ -2729,7 +2680,7 @@ dependencies = [ "phf 0.10.1", "proc-macro2", "quote", - "smallvec 1.15.1", + "smallvec", "syn 1.0.109", ] @@ -2743,7 +2694,7 @@ dependencies = [ "dtoa-short", "itoa 1.0.11", "phf 0.11.2", - "smallvec 1.15.1", + "smallvec", ] [[package]] @@ -2756,7 +2707,7 @@ dependencies = [ "dtoa-short", "itoa 1.0.11", "phf 0.11.2", - "smallvec 1.15.1", + "smallvec", ] [[package]] @@ -3354,7 +3305,7 @@ dependencies = [ "dlopen2_derive", "libc", "once_cell", - "winapi 0.3.9", + "winapi", ] [[package]] @@ -3605,7 +3556,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "40d9bd57d914cc66ce878f098f63ed7b5d5b64c30644a5adb950b008f874a6c6" dependencies = [ "base64 0.11.0", - "bytes 1.10.1", + "bytes", "dyn-clone", "lazy_static", "percent-encoding", @@ -3760,7 +3711,7 @@ version = "0.8.34" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b45de904aa0b010bce2ab45264d0631681847fa7b6f2eaa7dab7619943bc4f59" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", ] [[package]] @@ -3925,7 +3876,7 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "136d1b5283a1ab77bd9257427ffd09d8667ced0570b6f938942bc7568ed5b943" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "home", "windows-sys 0.48.0", ] @@ -3979,7 +3930,7 @@ dependencies = [ "lebe", "miniz_oxide 0.8.9", "rayon-core", - "smallvec 1.15.1", + "smallvec", "zune-inflate", ] @@ -4225,7 +4176,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "04412b8935272e3a9bae6f48c7bfff74c2911f60525404edfdd28e49884c3bfb" dependencies = [ "libc", - "winapi 0.3.9", + "winapi", ] [[package]] @@ -4234,22 +4185,6 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba" -[[package]] -name = "fuchsia-zircon" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82" -dependencies = [ - "bitflags 1.3.2", - "fuchsia-zircon-sys", -] - -[[package]] -name = "fuchsia-zircon-sys" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7" - [[package]] name = "funty" version = "2.0.0" @@ -4322,8 +4257,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1d930c203dd0b6ff06e0201a4a2fe9149b43c684fd4420555b26d21b1a02956f" dependencies = [ "futures-core", - "lock_api 0.4.12", - "parking_lot 0.12.2", + "lock_api", + "parking_lot", ] [[package]] @@ -4550,7 +4485,7 @@ version = "0.1.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "libc", "wasi 0.9.0+wasi-snapshot-preview1", ] @@ -4561,7 +4496,7 @@ version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "94b22e06ecb0110981051723910cbf0b5f5e09a2062dd7663334ee79a9d1286c" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "js-sys", "libc", "wasi 0.11.0+wasi-snapshot-preview1", @@ -4574,7 +4509,7 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "43a49c392881ce6d5c3b8cb70f98717b7c07aabbdff06687b9030dbfbe2725f8" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "libc", "wasi 0.13.3+wasi-0.2.2", "windows-targets 0.52.6", @@ -4611,7 +4546,7 @@ dependencies = [ "libc", "once_cell", "pin-project-lite", - "smallvec 1.15.1", + "smallvec", "thiserror 1.0.63", ] @@ -4625,7 +4560,7 @@ dependencies = [ "gobject-sys", "libc", "system-deps", - "winapi 0.3.9", + "winapi", ] [[package]] @@ -4660,7 +4595,7 @@ dependencies = [ "libc", "memchr", "once_cell", - "smallvec 1.15.1", + "smallvec", "thiserror 1.0.63", ] @@ -4838,7 +4773,7 @@ version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8" dependencies = [ - "bytes 1.10.1", + "bytes", "fnv", "futures-core", "futures-sink", @@ -4858,7 +4793,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fa82e28a107a8cc405f0839610bdc9b15f1e25ec7d696aa5cf173edbcb1486ab" dependencies = [ "atomic-waker", - "bytes 1.10.1", + "bytes", "fnv", "futures-core", "futures-sink", @@ -4876,7 +4811,7 @@ version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6dd08c532ae367adf81c312a4580bc67f1d0fe8bc9c460520283f4c0ff277888" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "crunchy", ] @@ -5040,7 +4975,7 @@ checksum = "3c731c3e10504cc8ed35cfe2f1db4c9274c3d35fa486e3b31df46f068ef3e867" dependencies = [ "libc", "match_cfg", - "winapi 0.3.9", + "winapi", ] [[package]] @@ -5049,7 +4984,7 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f9c7c7c8ac16c798734b8a24560c1362120597c40d5e1459f09498f8f6c8f2ba" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "libc", "windows 0.52.0", ] @@ -5097,7 +5032,7 @@ version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8947b1a6fad4393052c7ba1f4cd97bed3e953a95c79c92ad9b051a04611d9fbb" dependencies = [ - "bytes 1.10.1", + "bytes", "fnv", "itoa 1.0.11", ] @@ -5108,7 +5043,7 @@ version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f4a85d31aea989eead29a3aaf9e1115a180df8282431156e533de47660892565" dependencies = [ - "bytes 1.10.1", + "bytes", "fnv", "itoa 1.0.11", ] @@ -5119,7 +5054,7 @@ version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" dependencies = [ - "bytes 1.10.1", + "bytes", "http 0.2.11", "pin-project-lite", ] @@ -5130,7 +5065,7 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184" dependencies = [ - "bytes 1.10.1", + "bytes", "http 1.3.1", ] @@ -5140,7 +5075,7 @@ version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b021d93e26becf5dc7e1b75b1bed1fd93124b374ceb73f43d4d4eafec896a64a" dependencies = [ - "bytes 1.10.1", + "bytes", "futures-core", "http 1.3.1", "http-body 1.0.1", @@ -5175,14 +5110,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0c7ed027cf2bcf07fcd4e27cfba91b8e5fbae47151283406b16391c463e3a6db" dependencies = [ "atomic-waker", - "bytes 1.10.1", + "bytes", "fnv", "futures-core", "futures-sink", "http 1.3.1", "indexmap 2.9.0", "slab", - "smallvec 1.15.1", + "smallvec", "tokio", "tokio-util", ] @@ -5245,7 +5180,7 @@ version = "0.14.28" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bf96e135eb83a2a8ddf766e426a841d8ddd7449d5f00d34ea02b41d2f19eef80" dependencies = [ - "bytes 1.10.1", + "bytes", "futures-channel", "futures-core", "futures-util", @@ -5269,7 +5204,7 @@ version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cc2b571658e38e0c01b1fdca3bbbe93c00d3d71693ff2770043f8c29bc7d6f80" dependencies = [ - "bytes 1.10.1", + "bytes", "futures-channel", "futures-util", "h2 0.4.5", @@ -5278,7 +5213,7 @@ dependencies = [ "httparse", "itoa 1.0.11", "pin-project-lite", - "smallvec 1.15.1", + "smallvec", "tokio", "want", ] @@ -5337,7 +5272,7 @@ version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0" dependencies = [ - "bytes 1.10.1", + "bytes", "http-body-util", "hyper 1.6.0", "hyper-util", @@ -5354,7 +5289,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8d9b05277c7e8da2c93a568989bb6207bef0112e8d17df7a6eda4a3cf143bc5e" dependencies = [ "base64 0.22.1", - "bytes 1.10.1", + "bytes", "futures-channel", "futures-core", "futures-util", @@ -5462,7 +5397,7 @@ dependencies = [ "icu_normalizer_data", "icu_properties", "icu_provider", - "smallvec 1.15.1", + "smallvec", "utf16_iter", "utf8_iter", "write16", @@ -5555,7 +5490,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "686f825264d630750a544639377bae737628043f20d38bbc029e8f29ea968a7e" dependencies = [ "idna_adapter", - "smallvec 1.15.1", + "smallvec", "utf8_iter", ] @@ -5765,7 +5700,7 @@ version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", ] [[package]] @@ -5786,16 +5721,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "046fa2d4d00aea763528b4950358d0ead425372445dc8ff86312b3c69ff7727b" dependencies = [ "bitflags 2.5.0", - "cfg-if 1.0.0", - "libc", -] - -[[package]] -name = "iovec" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2b3ea6ff95e175473f8ffe6a7eb7c00d054240321b84c57051175fe3c1e075e" -dependencies = [ + "cfg-if", "libc", ] @@ -5933,8 +5859,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1a87aa2bb7d2af34197c04845522473242e1aa17c12f4935d5856491a7fb8c97" dependencies = [ "cesu8", - "cfg-if 1.0.0", - "combine 4.6.6", + "cfg-if", + "combine", "jni-sys", "log", "thiserror 1.0.63", @@ -6076,7 +6002,7 @@ version = "0.13.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "956ff9b67e26e1a6a866cb758f12c6f8746208489e3e4a4b5580802f2f0a587b" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "ecdsa", "elliptic-curve", "once_cell", @@ -6093,16 +6019,6 @@ dependencies = [ "cpufeatures", ] -[[package]] -name = "kernel32-sys" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d" -dependencies = [ - "winapi 0.2.8", - "winapi-build", -] - [[package]] name = "keyboard-types" version = "0.7.0" @@ -6264,8 +6180,8 @@ version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" dependencies = [ - "cfg-if 1.0.0", - "winapi 0.3.9", + "cfg-if", + "winapi", ] [[package]] @@ -6274,7 +6190,7 @@ version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fc2f4eb4bc735547cfed7c0a4922cbd04a4655978c09b54f1f7b228750664c34" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "windows-targets 0.52.6", ] @@ -6323,7 +6239,7 @@ version = "0.1.1" dependencies = [ "chrono", "futures 0.1.31", - "redis 0.13.0", + "redis 1.0.2", "time", "version-sync", "workspace-build-acceleration", @@ -6385,15 +6301,6 @@ version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4d873d7c67ce09b42110d801813efbc9364414e356be9935700d368351657487" -[[package]] -name = "lock_api" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4da24a77a3d8a6d4862d95f72e6fdb9c09a643ecdb402d754004a557f2bec75" -dependencies = [ - "scopeguard", -] - [[package]] name = "lock_api" version = "0.4.12" @@ -6442,7 +6349,7 @@ dependencies = [ "log", "log-mdc", "mock_instant", - "parking_lot 0.12.2", + "parking_lot", "rand 0.9.1", "serde", "serde-value", @@ -6452,7 +6359,7 @@ dependencies = [ "thread-id", "typemap-ors", "unicode-segmentation", - "winapi 0.3.9", + "winapi", ] [[package]] @@ -6630,16 +6537,10 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8ea1f30cedd69f0a2954655f7188c6a834246d2bcf1e315e2ac40c4b24dc9519" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "rayon", ] -[[package]] -name = "maybe-uninit" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00" - [[package]] name = "md-5" version = "0.9.1" @@ -6657,7 +6558,7 @@ version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d89e7ee0cfbedfc4da3340218492196241d89eefb6dab27de5df917a6d2e78cf" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "digest 0.10.7", ] @@ -6873,25 +6774,6 @@ dependencies = [ "simd-adler32", ] -[[package]] -name = "mio" -version = "0.6.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4afd66f5b91bf2a3bc13fad0e21caedac168ca4c707504e75585648ae80e4cc4" -dependencies = [ - "cfg-if 0.1.10", - "fuchsia-zircon", - "fuchsia-zircon-sys", - "iovec", - "kernel32-sys", - "libc", - "log", - "miow", - "net2", - "slab", - "winapi 0.2.8", -] - [[package]] name = "mio" version = "0.8.11" @@ -6916,29 +6798,6 @@ dependencies = [ "windows-sys 0.52.0", ] -[[package]] -name = "mio-uds" -version = "0.6.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afcb699eb26d4332647cc848492bbc15eafb26f08d0304550d5aa1f612e066f0" -dependencies = [ - "iovec", - "libc", - "mio 0.6.23", -] - -[[package]] -name = "miow" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebd808424166322d4a38da87083bfddd3ac4c131334ed55856112eb06d46944d" -dependencies = [ - "kernel32-sys", - "net2", - "winapi 0.2.8", - "ws2_32-sys", -] - [[package]] name = "ml_weights_registry" version = "0.0.1" @@ -6959,7 +6818,7 @@ version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "43766c2b5203b10de348ffe19f7e54564b64f3d6018ff7648d1e2d6d3a0f0a48" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "downcast", "fragile", "lazy_static", @@ -6974,7 +6833,7 @@ version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "af7cbce79ec385a1d4f54baa90a76401eb15d9cab93685f62e7e9f942aa00ae2" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "proc-macro2", "quote", "syn 2.0.106", @@ -6987,7 +6846,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c9ef834d5ed55e494a2ae350220314dc4aacd1c43a9498b00e320e0ea352a5c3" dependencies = [ "byteorder", - "bytes 1.10.1", + "bytes", "num-rational", "serde", "serde_json", @@ -7099,17 +6958,6 @@ dependencies = [ "jni-sys", ] -[[package]] -name = "net2" -version = "0.2.39" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b13b648036a2339d06de780866fbdfda0dde886de7b3af2ddeba8b14f4ee34ac" -dependencies = [ - "cfg-if 0.1.10", - "libc", - "winapi 0.3.9", -] - [[package]] name = "never" version = "0.1.0" @@ -7129,7 +6977,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4" dependencies = [ "bitflags 2.5.0", - "cfg-if 1.0.0", + "cfg-if", "cfg_aliases 0.1.1", "libc", "memoffset", @@ -7164,7 +7012,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84" dependencies = [ "overload", - "winapi 0.3.9", + "winapi", ] [[package]] @@ -7204,7 +7052,7 @@ dependencies = [ "num-iter", "num-traits", "rand 0.8.5", - "smallvec 1.15.1", + "smallvec", "zeroize", ] @@ -7691,7 +7539,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5e14130c6a98cd258fdcb0fb6d744152343ff729cbfcb28c656a9d12b999fbcd" dependencies = [ "bitflags 2.5.0", - "cfg-if 1.0.0", + "cfg-if", "foreign-types 0.3.2", "libc", "once_cell", @@ -7920,40 +7768,14 @@ version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" -[[package]] -name = "parking_lot" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f842b1982eb6c2fe34036a4fbfb06dd185a3f5c8edfaacdf7d1ea10b07de6252" -dependencies = [ - "lock_api 0.3.4", - "parking_lot_core 0.6.3", - "rustc_version 0.2.3", -] - [[package]] name = "parking_lot" version = "0.12.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7e4af0ca4f6caed20e900d564c242b8e5d4903fdacf31d3daf527b66fe6f42fb" dependencies = [ - "lock_api 0.4.12", - "parking_lot_core 0.9.10", -] - -[[package]] -name = "parking_lot_core" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bda66b810a62be75176a80873726630147a5ca780cd33921e0b5709033e66b0a" -dependencies = [ - "cfg-if 0.1.10", - "cloudabi", - "libc", - "redox_syscall 0.1.57", - "rustc_version 0.2.3", - "smallvec 0.6.14", - "winapi 0.3.9", + "lock_api", + "parking_lot_core", ] [[package]] @@ -7962,10 +7784,10 @@ version = "0.9.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "libc", "redox_syscall 0.5.2", - "smallvec 1.15.1", + "smallvec", "windows-targets 0.52.6", ] @@ -8296,7 +8118,7 @@ version = "3.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a604568c3202727d1507653cb121dbd627a58684eb09a820fd746bee38b4442f" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "concurrent-queue", "hermit-abi 0.4.0", "pin-project-lite", @@ -8516,7 +8338,7 @@ version = "0.12.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "deb1435c188b76130da55f17a466d252ff7b1418b2ad3e037d127b94e3411f29" dependencies = [ - "bytes 1.10.1", + "bytes", "prost-derive", ] @@ -8668,7 +8490,7 @@ version = "0.11.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8c7c5fdde3cdae7203427dc4f0a68fe0ed09833edc525a03456b153b79828684" dependencies = [ - "bytes 1.10.1", + "bytes", "pin-project-lite", "quinn-proto", "quinn-udp", @@ -8686,7 +8508,7 @@ version = "0.11.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fadfaed2cd7f389d0161bb73eeb07b7b78f8691047a6f3e73caaeae55310a4a6" dependencies = [ - "bytes 1.10.1", + "bytes", "rand 0.8.5", "ring", "rustc-hash", @@ -8732,7 +8554,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "51de85fb3fb6524929c8a2eb85e6b6d363de4e8c48f9e2c2eac4944abc181c93" dependencies = [ "log", - "parking_lot 0.12.2", + "parking_lot", "scheduled-thread-pool", ] @@ -8762,7 +8584,7 @@ dependencies = [ "libc", "rand_core 0.3.1", "rdrand", - "winapi 0.3.9", + "winapi", ] [[package]] @@ -8902,7 +8724,7 @@ dependencies = [ "av1-grain", "bitstream-io", "built", - "cfg-if 1.0.0", + "cfg-if", "interpolate_name", "itertools 0.12.1", "libc", @@ -8963,7 +8785,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2" dependencies = [ "crossbeam-deque", - "crossbeam-utils 0.8.20", + "crossbeam-utils", ] [[package]] @@ -8981,33 +8803,11 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6435842fc2fea44b528719eb8c32203bbc1bb2f5b619fbe0c0a3d8350fd8d2a8" dependencies = [ - "bytes 1.10.1", + "bytes", "futures 0.3.31", "pin-project-lite", ] -[[package]] -name = "redis" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9bb1079bc5692c03e1479bb7086ac870ac2aaf7115b5e72d314c01368f1a747e" -dependencies = [ - "bytes 0.4.12", - "combine 3.8.1", - "dtoa 0.4.8", - "futures 0.1.31", - "itoa 0.4.8", - "percent-encoding", - "sha1 0.6.1", - "tokio-codec", - "tokio-executor", - "tokio-io", - "tokio-sync", - "tokio-tcp", - "tokio-uds", - "url", -] - [[package]] name = "redis" version = "0.20.2" @@ -9015,7 +8815,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d4f0ceb2ec0dd769483ecd283f6615aa83dcd0be556d5294c6e659caefe7cc54" dependencies = [ "async-trait", - "combine 4.6.6", + "combine", "dtoa 0.4.8", "itoa 0.4.8", "percent-encoding", @@ -9030,15 +8830,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5dfe20977fe93830c0e9817a16fbf1ed1cfd8d4bba366087a1841d2c6033c251" dependencies = [ "arcstr", - "bytes 1.10.1", - "cfg-if 1.0.0", - "combine 4.6.6", + "bytes", + "cfg-if", + "combine", + "crc16", "futures-util", "itoa 1.0.11", + "log", "num-bigint", "percent-encoding", "pin-project-lite", "r2d2", + "rand 0.9.1", "rustls 0.23.13", "rustls-native-certs 0.8.0", "ryu", @@ -9093,12 +8896,6 @@ dependencies = [ "workspace-build-acceleration", ] -[[package]] -name = "redox_syscall" -version = "0.1.57" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce" - [[package]] name = "redox_syscall" version = "0.4.1" @@ -9169,7 +8966,7 @@ version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7" dependencies = [ - "winapi 0.3.9", + "winapi", ] [[package]] @@ -9189,7 +8986,7 @@ checksum = "dd67538700a17451e7cba03ac727fb961abb7607553461627b97de0b89cf4a62" dependencies = [ "async-compression", "base64 0.21.7", - "bytes 1.10.1", + "bytes", "encoding_rs", "futures-core", "futures-util", @@ -9232,7 +9029,7 @@ checksum = "d429f34c8092b2d42c7c93cec323bb4adeb7c67698f70839adec842ec10c7ceb" dependencies = [ "async-compression", "base64 0.22.1", - "bytes 1.10.1", + "bytes", "cookie 0.18.1", "cookie_store 0.21.1", "encoding_rs", @@ -9336,7 +9133,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d" dependencies = [ "cc", - "cfg-if 1.0.0", + "cfg-if", "getrandom 0.2.14", "libc", "spin 0.9.8", @@ -9352,7 +9149,7 @@ checksum = "9008cd6385b9e161d8229e1f6549dd23c3d022f132a2ea37ac3a10ac4935779b" dependencies = [ "bitvec", "bytecheck", - "bytes 1.10.1", + "bytes", "hashbrown 0.12.3", "ptr_meta", "rend", @@ -9476,7 +9273,7 @@ version = "0.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4e310ef0e1b6eeb79169a1171daf9abcb87a2e17c03bee2c4bb100b55c75409f" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "ordered-multimap", "trim-in-place", ] @@ -9491,8 +9288,8 @@ dependencies = [ "aws-creds", "aws-region", "base64 0.22.1", - "bytes 1.10.1", - "cfg-if 1.0.0", + "bytes", + "cfg-if", "futures 0.3.31", "hex", "hmac 0.12.1", @@ -9523,7 +9320,7 @@ checksum = "b082d80e3e3cc52b2ed634388d436fe1f4de6af5786cc2de9ba9737527bdf555" dependencies = [ "arrayvec", "borsh", - "bytes 1.10.1", + "bytes", "num-traits", "rand 0.8.5", "rkyv", @@ -9714,7 +9511,7 @@ version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "65bc94b580d0f5a6b7a2d604e597513d3c673154b52ddeccd1d5c32360d945ee" dependencies = [ - "bytes 1.10.1", + "bytes", "rxml_validation", ] @@ -9766,7 +9563,7 @@ version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3cbc66816425a074528352f5789333ecff06ca41b36b0b0efdfbb29edc391a19" dependencies = [ - "parking_lot 0.12.2", + "parking_lot", ] [[package]] @@ -9803,7 +9600,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "356285bbf17bea63d9e52e96bd18f039672ac92b55b8cb997d6162a2a37d1649" dependencies = [ "ahash 0.8.12", - "cfg-if 1.0.0", + "cfg-if", "hashbrown 0.13.2", ] @@ -9843,7 +9640,7 @@ dependencies = [ "html5ever 0.26.0", "once_cell", "selectors 0.25.0", - "smallvec 1.15.1", + "smallvec", "tendril", ] @@ -9936,7 +9733,7 @@ dependencies = [ "phf_codegen 0.8.0", "precomputed-hash", "servo_arc 0.2.0", - "smallvec 1.15.1", + "smallvec", ] [[package]] @@ -9955,7 +9752,7 @@ dependencies = [ "phf_codegen 0.10.0", "precomputed-hash", "servo_arc 0.3.0", - "smallvec 1.15.1", + "smallvec", ] [[package]] @@ -9974,7 +9771,7 @@ dependencies = [ "phf_codegen 0.11.3", "precomputed-hash", "servo_arc 0.4.1", - "smallvec 1.15.1", + "smallvec", ] [[package]] @@ -9993,7 +9790,7 @@ dependencies = [ "phf_codegen 0.11.3", "precomputed-hash", "servo_arc 0.4.1", - "smallvec 1.15.1", + "smallvec", ] [[package]] @@ -10265,7 +10062,7 @@ dependencies = [ "futures 0.3.31", "log", "once_cell", - "parking_lot 0.12.2", + "parking_lot", "scc", "serial_test_derive", ] @@ -10353,7 +10150,7 @@ version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "cpufeatures", "digest 0.10.7", ] @@ -10371,7 +10168,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4d58a1e1bf39749807d89cf2d98ac2dfa0ff1cb3faa38fbb64dd88ac8013d800" dependencies = [ "block-buffer 0.9.0", - "cfg-if 1.0.0", + "cfg-if", "cpufeatures", "digest 0.9.0", "opaque-debug", @@ -10383,7 +10180,7 @@ version = "0.10.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "cpufeatures", "digest 0.10.7", ] @@ -10394,7 +10191,7 @@ version = "0.11.0-rc.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d1e3878ab0f98e35b2df35fe53201d088299b41a6bb63e3e34dada2ac4abd924" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "cpufeatures", "digest 0.11.0-rc.3", ] @@ -10504,15 +10301,6 @@ dependencies = [ "autocfg", ] -[[package]] -name = "smallvec" -version = "0.6.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b97fcaeba89edba30f044a10c6a3cc39df9c3f17d7cd829dd1446cab35f890e0" -dependencies = [ - "maybe-uninit", -] - [[package]] name = "smallvec" version = "1.15.1" @@ -10649,7 +10437,7 @@ version = "0.9.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" dependencies = [ - "lock_api 0.4.12", + "lock_api", ] [[package]] @@ -10716,7 +10504,7 @@ dependencies = [ "atoi", "bigdecimal", "byteorder", - "bytes 1.10.1", + "bytes", "chrono", "crc", "crossbeam-queue", @@ -10740,7 +10528,7 @@ dependencies = [ "serde", "serde_json", "sha2 0.10.8", - "smallvec 1.15.1", + "smallvec", "sqlformat", "thiserror 1.0.63", "tokio", @@ -10800,7 +10588,7 @@ dependencies = [ "bigdecimal", "bitflags 2.5.0", "byteorder", - "bytes 1.10.1", + "bytes", "chrono", "crc", "digest 0.10.7", @@ -10825,7 +10613,7 @@ dependencies = [ "serde", "sha1 0.10.6", "sha2 0.10.8", - "smallvec 1.15.1", + "smallvec", "sqlx-core", "stringprep", "thiserror 1.0.63", @@ -10866,7 +10654,7 @@ dependencies = [ "serde", "serde_json", "sha2 0.10.8", - "smallvec 1.15.1", + "smallvec", "sqlx-core", "stringprep", "thiserror 1.0.63", @@ -10920,10 +10708,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c886bd4480155fd3ef527d45e9ac8dd7118a898a46530b7b94c3e21866259fce" dependencies = [ "cc", - "cfg-if 1.0.0", + "cfg-if", "libc", "psm", - "winapi 0.3.9", + "winapi", ] [[package]] @@ -10954,7 +10742,7 @@ dependencies = [ "billing_component", "bootstrap", "bucket_paths", - "bytes 1.10.1", + "bytes", "chrono", "cloud_storage", "collections", @@ -11082,7 +10870,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bf776ba3fa74f83bf4b63c3dcbbf82173db2632ed8452cb2d891d33f459de70f" dependencies = [ "new_debug_unreachable", - "parking_lot 0.12.2", + "parking_lot", "phf_shared 0.11.3", "precomputed-hash", "serde", @@ -11152,7 +10940,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0c2e86926081dda636c546d8c5e641661049d7562a68f5488be4a1f7f66f6086" dependencies = [ "libc", - "winapi 0.3.9", + "winapi", ] [[package]] @@ -11496,7 +11284,7 @@ dependencies = [ "objc2-app-kit 0.3.1", "objc2-foundation 0.3.1", "once_cell", - "parking_lot 0.12.2", + "parking_lot", "raw-window-handle", "scopeguard", "tao-macros", @@ -11538,7 +11326,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dcead52ec80df0e9e4be671c0f2596a1f3bd7b6b2c9418c1eb7dd737499ff4bd" dependencies = [ "anyhow", - "bytes 1.10.1", + "bytes", "cookie 0.18.1", "dirs", "dunce", @@ -11707,7 +11495,7 @@ dependencies = [ name = "tauri-plugin-http" version = "2.4.3" dependencies = [ - "bytes 1.10.1", + "bytes", "cookie_store 0.21.1", "data-url", "http 1.3.1", @@ -12002,7 +11790,7 @@ version = "1.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "once_cell", ] @@ -12130,11 +11918,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "89e49afdadebb872d3145a5638b59eb0691ea23e46ca484037cfab3b76b95038" dependencies = [ "backtrace", - "bytes 1.10.1", + "bytes", "io-uring", "libc", "mio 1.0.2", - "parking_lot 0.12.2", + "parking_lot", "pin-project-lite", "signal-hook-registry", "slab", @@ -12155,38 +11943,6 @@ dependencies = [ "tokio", ] -[[package]] -name = "tokio-codec" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25b2998660ba0e70d18684de5d06b70b70a3a747469af9dea7618cc59e75976b" -dependencies = [ - "bytes 0.4.12", - "futures 0.1.31", - "tokio-io", -] - -[[package]] -name = "tokio-executor" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb2d1b8f4548dbf5e1f7818512e9c406860678f29c300cdf0ebac72d1a3a1671" -dependencies = [ - "crossbeam-utils 0.7.2", - "futures 0.1.31", -] - -[[package]] -name = "tokio-io" -version = "0.1.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57fc868aae093479e3131e3d165c93b1c7474109d13c90ec0dda2a1bbfff0674" -dependencies = [ - "bytes 0.4.12", - "futures 0.1.31", - "log", -] - [[package]] name = "tokio-io-timeout" version = "1.2.0" @@ -12218,25 +11974,6 @@ dependencies = [ "tokio", ] -[[package]] -name = "tokio-reactor" -version = "0.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09bc590ec4ba8ba87652da2068d150dcada2cfa2e07faae270a5e0409aa51351" -dependencies = [ - "crossbeam-utils 0.7.2", - "futures 0.1.31", - "lazy_static", - "log", - "mio 0.6.23", - "num_cpus", - "parking_lot 0.9.0", - "slab", - "tokio-executor", - "tokio-io", - "tokio-sync", -] - [[package]] name = "tokio-rustls" version = "0.24.1" @@ -12269,30 +12006,6 @@ dependencies = [ "tokio", ] -[[package]] -name = "tokio-sync" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edfe50152bc8164fcc456dab7891fa9bf8beaf01c5ee7e1dd43a397c3cf87dee" -dependencies = [ - "fnv", - "futures 0.1.31", -] - -[[package]] -name = "tokio-tcp" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98df18ed66e3b72e742f185882a9e201892407957e45fbff8da17ae7a7c51f72" -dependencies = [ - "bytes 0.4.12", - "futures 0.1.31", - "iovec", - "mio 0.6.23", - "tokio-io", - "tokio-reactor", -] - [[package]] name = "tokio-tungstenite" version = "0.27.0" @@ -12305,31 +12018,13 @@ dependencies = [ "tungstenite", ] -[[package]] -name = "tokio-uds" -version = "0.2.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab57a4ac4111c8c9dbcf70779f6fc8bc35ae4b2454809febac840ad19bd7e4e0" -dependencies = [ - "bytes 0.4.12", - "futures 0.1.31", - "iovec", - "libc", - "log", - "mio 0.6.23", - "mio-uds", - "tokio-codec", - "tokio-io", - "tokio-reactor", -] - [[package]] name = "tokio-util" version = "0.7.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "14307c986784f72ef81c89db7d9e28d6ac26d16213b109ea501696195e6e3ce5" dependencies = [ - "bytes 1.10.1", + "bytes", "futures-core", "futures-sink", "pin-project-lite", @@ -12474,7 +12169,7 @@ dependencies = [ "async-trait", "axum", "base64 0.21.7", - "bytes 1.10.1", + "bytes", "h2 0.3.26", "http 0.2.11", "http-body 0.4.6", @@ -12534,7 +12229,7 @@ checksum = "adc82fd73de2a9722ac5da747f12383d2bfdb93591ee6c58486e0097890f05f2" dependencies = [ "async-compression", "bitflags 2.5.0", - "bytes 1.10.1", + "bytes", "futures-core", "futures-util", "http 1.3.1", @@ -12613,7 +12308,7 @@ checksum = "e8189decb5ac0fa7bc8b96b7cb9b2701d60d48805aca84a238004d665fcc4008" dependencies = [ "nu-ansi-term", "sharded-slab", - "smallvec 1.15.1", + "smallvec", "thread_local", "tracing-core", "tracing-log", @@ -12741,7 +12436,7 @@ version = "0.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eadc29d668c91fcc564941132e17b28a7ceb2f3ebf0b9dae3e03fd7a6748eb0d" dependencies = [ - "bytes 1.10.1", + "bytes", "data-encoding", "http 1.3.1", "httparse", @@ -12801,7 +12496,7 @@ checksum = "89daebc3e6fd160ac4aa9fc8b3bf71e1f74fbf92367ae71fb83a037e8bf164b9" dependencies = [ "memoffset", "tempfile", - "winapi 0.3.9", + "winapi", ] [[package]] @@ -12896,15 +12591,6 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "39ec24b3121d976906ece63c9daad25b85969647682eee313cb5779fdd69e14e" -[[package]] -name = "unreachable" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "382810877fe448991dfc7f0dd6e3ae5d58088fd0ea5e35189655f84e6814fa56" -dependencies = [ - "void", -] - [[package]] name = "unsafe-any-ors" version = "1.0.0" @@ -13316,7 +13002,7 @@ version = "0.2.100" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1edc8929d7499fc4e8f0be2262a241556cfc54a0bea223790e71446f2aab1ef5" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "once_cell", "rustversion", "wasm-bindgen-macro", @@ -13342,7 +13028,7 @@ version = "0.4.38" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9afec9963e3d0994cac82455b2b3502b81a7f40f9a0d32181f7528d9f4b43e02" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "js-sys", "wasm-bindgen", "web-sys", @@ -13403,7 +13089,7 @@ dependencies = [ "downcast-rs", "rustix 0.38.44", "scoped-tls", - "smallvec 1.15.1", + "smallvec", "wayland-sys", ] @@ -13487,7 +13173,7 @@ dependencies = [ name = "web_scrapers" version = "0.0.1" dependencies = [ - "bytes 1.10.1", + "bytes", "chrono", "enums", "errors", @@ -13632,12 +13318,6 @@ dependencies = [ "wasite", ] -[[package]] -name = "winapi" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a" - [[package]] name = "winapi" version = "0.3.9" @@ -13648,12 +13328,6 @@ dependencies = [ "winapi-x86_64-pc-windows-gnu", ] -[[package]] -name = "winapi-build" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc" - [[package]] name = "winapi-i686-pc-windows-gnu" version = "0.4.0" @@ -13666,7 +13340,7 @@ version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" dependencies = [ - "winapi 0.3.9", + "winapi", ] [[package]] @@ -14225,7 +13899,7 @@ version = "0.50.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "windows-sys 0.48.0", ] @@ -14235,7 +13909,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a277a57398d4bfa075df44f501a17cfdf8542d224f0d36095a2adc7aee4ef0a5" dependencies = [ - "cfg-if 1.0.0", + "cfg-if", "windows-sys 0.48.0", ] @@ -14265,13 +13939,13 @@ dependencies = [ "block-buffer 0.9.0", "bytemuck", "byteorder", - "bytes 1.10.1", + "bytes", "cc", "chrono", "clap", "cookie 0.18.1", "core-foundation-sys", - "crossbeam-utils 0.8.20", + "crossbeam-utils", "crypto-common 0.1.6", "deranged", "derive_more 0.99.17", @@ -14308,7 +13982,7 @@ dependencies = [ "num-rational", "num-traits", "once_cell", - "parking_lot 0.12.2", + "parking_lot", "percent-encoding", "proc-macro2", "quick-xml 0.32.0", @@ -14330,7 +14004,7 @@ dependencies = [ "serde_json", "sha1 0.10.6", "sha2 0.10.8", - "smallvec 1.15.1", + "smallvec", "socket2 0.5.10", "spin 0.9.8", "sqlx-mysql", @@ -14353,7 +14027,7 @@ dependencies = [ "url", "uuid 1.18.1", "void", - "winapi 0.3.9", + "winapi", "windows-sys 0.48.0", "windows-sys 0.52.0", "windows-sys 0.59.0", @@ -14410,7 +14084,7 @@ dependencies = [ "ahash 0.8.12", "boring2", "brotli 8.0.2", - "bytes 1.10.1", + "bytes", "cookie 0.18.1", "flate2", "futures-channel", @@ -14430,7 +14104,7 @@ dependencies = [ "serde", "serde_json", "serde_urlencoded", - "smallvec 1.15.1", + "smallvec", "socket2 0.6.0", "sync_wrapper 1.0.2", "tokio", @@ -14511,16 +14185,6 @@ dependencies = [ "x11-dl", ] -[[package]] -name = "ws2_32-sys" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d59cefebd0c892fa2dd6de581e937301d8552cb44489cdff035c6187cb63fa5e" -dependencies = [ - "winapi 0.2.8", - "winapi-build", -] - [[package]] name = "wyz" version = "0.5.1" @@ -14756,7 +14420,7 @@ dependencies = [ "bzip2", "constant_time_eq 0.1.5", "crc32fast", - "crossbeam-utils 0.8.20", + "crossbeam-utils", "flate2", "hmac 0.12.1", "pbkdf2 0.11.0", @@ -14773,7 +14437,7 @@ checksum = "9cc23c04387f4da0374be4533ad1208cbb091d5c11d070dfef13676ad6497164" dependencies = [ "arbitrary", "crc32fast", - "crossbeam-utils 0.8.20", + "crossbeam-utils", "displaydoc", "flate2", "indexmap 2.9.0", @@ -14792,7 +14456,7 @@ dependencies = [ "bzip2", "constant_time_eq 0.3.0", "crc32fast", - "crossbeam-utils 0.8.20", + "crossbeam-utils", "deflate64", "displaydoc", "flate2", diff --git a/Cargo.toml b/Cargo.toml index b5ab988c10..e61e57c30f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -250,7 +250,7 @@ log = "0.4.27" once_cell = "1.21.3" r2d2 = "0.8.10" rand = "0.9.1" -redis = { version = "1.0.2", features = ["r2d2", "tokio-rustls-comp"] } +redis = { version = "1.0.2", features = ["r2d2", "tokio-rustls-comp", "tokio-comp", "cluster-async", "aio"] } regex = "1.12.2" reqwest = { version = "0.12.23", default-features = false, features = [ "charset", "http2", "system-proxy", "json", "cookies", "rustls-tls" ] } reqwest-websocket = { version = "0.5.0" } diff --git a/crates/vendor/limitation/Cargo.toml b/crates/vendor/limitation/Cargo.toml index 4955aebbfa..5570e89f86 100644 --- a/crates/vendor/limitation/Cargo.toml +++ b/crates/vendor/limitation/Cargo.toml @@ -23,7 +23,7 @@ normal = ["workspace-build-acceleration"] [dependencies] chrono = "0.4.9" futures = "0.1.29" -redis = "0.13.0" +redis.workspace = true time = "0.3.30" # Workspace hack (faster compile times) diff --git a/crates/vendor/limitation/src/lib.rs b/crates/vendor/limitation/src/lib.rs index b5168b6879..50e6c9827f 100644 --- a/crates/vendor/limitation/src/lib.rs +++ b/crates/vendor/limitation/src/lib.rs @@ -194,10 +194,10 @@ impl Limiter { /// - A time computation failed /// /// [`Status`]: struct.Status.html - pub fn count>(&self, key: K) -> impl Future { + pub async fn count>(&self, key: K) -> Result { let limit = self.limit; - self.track(key).and_then(move |(count, reset_epoch_utc)| { + self.track(key).await.and_then(move |(count, reset_epoch_utc)| { let status = build_status(count, limit, reset_epoch_utc); if count > limit { @@ -209,37 +209,47 @@ impl Limiter { } /// Tracks the given key in a period and returns the count and TTL for the key in seconds. - fn track>(&self, key: K) -> impl Future { + async fn track>(&self, key: K) -> Result<(usize, usize), Error> { let key = key.into(); let exipres = self.period.as_secs(); - self.client - .get_async_connection() - .from_err() - .and_then(move |con| { - // The seed of this approach is outlined Atul R in a blog post about rate limiting - // using NodeJS and Redis. For more details, see - // https://blog.atulr.com/rate-limiter/ - let mut pipe = redis::pipe(); - pipe.atomic() - .cmd("SET") - .arg(&key) - .arg(0) - .arg("EX") - .arg(exipres) - .arg("NX") - .ignore() - .cmd("INCR") - .arg(&key) - .cmd("TTL") - .arg(&key); + let mut conn = self.client + .get_multiplexed_async_connection() + .await + .map_err(|err| Error::from(err))?; + + // The seed of this approach is outlined Atul R in a blog post about rate limiting + // using NodeJS and Redis. For more details, see + // https://blog.atulr.com/rate-limiter/ + let mut pipe = redis::pipe(); + pipe.atomic() + .cmd("SET") + .arg(&key) + .arg(0) + .arg("EX") + .arg(exipres) + .arg("NX") + .ignore() + .cmd("INCR") + .arg(&key) + .cmd("TTL") + .arg(&key); - pipe.query_async(con) - .from_err() - .and_then(|(_, (count, ttl)): (_, (usize, u64))| { - Ok((count, epoch_utc_plus(Duration::from_secs(ttl))?)) - }) - }) + //let result = pipe.query_async(&mut conn) + // .await + // .map_err(|err| Error::from(err)) + // .and_then(|(_, (count, ttl)): (_, (usize, u64))| { + // Ok((count, epoch_utc_plus(Duration::from_secs(ttl))?)) + // })?; + + let result = pipe.query_async(&mut conn) + .await + .map_err(|err| Error::from(err)) + .and_then(|(ignore, count, ttl): ((), usize, u64)| { + Ok((count, epoch_utc_plus(Duration::from_secs(ttl))?)) + })?; + + Ok(result) } }