From fca8cc8695a35065a880797c45b6d20a0356bd1e Mon Sep 17 00:00:00 2001 From: kukabi Date: Wed, 14 Aug 2024 11:50:46 +0300 Subject: [PATCH] Dependency updates. Fix clippy. --- Cargo.lock | 141 ++++++++++++------ subvt-network-status-server/Cargo.toml | 2 +- subvt-network-status-updater/Cargo.toml | 2 +- subvt-notification-generator/Cargo.toml | 2 +- subvt-notification-processor/Cargo.toml | 2 +- .../src/sender/telegram.rs | 1 + subvt-persistence/Cargo.toml | 2 +- subvt-plotter/Cargo.toml | 4 +- subvt-report-service/Cargo.toml | 2 +- subvt-telegram-bot/Cargo.toml | 4 +- subvt-telegram-bot/src/messenger/mod.rs | 5 + subvt-telemetry-processor/Cargo.toml | 2 +- subvt-validator-details-server/Cargo.toml | 2 +- subvt-validator-list-server/Cargo.toml | 2 +- subvt-validator-list-updater/Cargo.toml | 2 +- subvt-validator-list-updater/src/lib.rs | 2 +- 16 files changed, 118 insertions(+), 59 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index faa7496c..c1ffd837 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -391,6 +391,12 @@ dependencies = [ "syn 2.0.74", ] +[[package]] +name = "arc-swap" +version = "1.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69f7f8c3906b62b754cd5326047894316021dcfe5a194c8ea52bdd94934a3457" + [[package]] name = "ark-bls12-377" version = "0.4.0" @@ -618,9 +624,9 @@ dependencies = [ [[package]] name = "async-tungstenite" -version = "0.26.2" +version = "0.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb786dab48e539c5f17b23bac20d812ac027c01732ed7c7b58850c69a684e46c" +checksum = "c5359381fd414fbdb272c48f2111c16cb0bb3447bfacd59311ff3736da9f6664" dependencies = [ "futures-io", "futures-util", @@ -916,6 +922,12 @@ version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" +[[package]] +name = "byteorder-lite" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f1fe948ff07f4bd06c30984e69f5b4899c516a3ef74f34df92a2df2ab535495" + [[package]] name = "bytes" version = "1.7.1" @@ -1233,6 +1245,15 @@ version = "0.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" +[[package]] +name = "core_maths" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3b02505ccb8c50b0aa21ace0fc08c3e53adebd4e58caa18a36152803c7709a3" +dependencies = [ + "libm", +] + [[package]] name = "cpufeatures" version = "0.2.13" @@ -2029,9 +2050,9 @@ dependencies = [ [[package]] name = "fontdb" -version = "0.18.0" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e32eac81c1135c1df01d4e6d4233c47ba11f6a6d07f33e0bba09d18797077770" +checksum = "37be9fc20d966be438cd57a45767f73349477fb0f85ce86e000557f787298afb" dependencies = [ "fontconfig-parser", "log", @@ -2259,9 +2280,9 @@ dependencies = [ [[package]] name = "frankenstein" -version = "0.31.0" +version = "0.32.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79d7e758b1bd494b293cebe9138cc0081e2f22478e2c727aac46871b7fac5488" +checksum = "f59e04d7c8ffa72d2e2956f9b6a171b964bbc227ef8068be2cf02e3372aec61f" dependencies = [ "async-trait", "reqwest 0.12.5", @@ -2999,11 +3020,21 @@ dependencies = [ "winapi-util", ] +[[package]] +name = "image-webp" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f79afb8cbee2ef20f59ccd477a218c12a93943d075b492015ecb1bb81f8ee904" +dependencies = [ + "byteorder-lite", + "quick-error", +] + [[package]] name = "imagesize" -version = "0.12.0" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "029d73f573d8e8d63e6d5020011d3255b28c3ba85d6cf870a07184ed23de9284" +checksum = "edcd27d72f2f071c64249075f42e205ff93c9a4c5f6c6da53e79ed9f9832c285" [[package]] name = "impl-codec" @@ -3061,9 +3092,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.3.0" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de3fc2e30ba82dd1b3911c8de1ffc143c74a914a14e99514d7637e3099df5ea0" +checksum = "93ead53efc7ea8ed3cfb0c79fc8023fbb782a5432b52830b6518941cebe6505c" dependencies = [ "equivalent", "hashbrown 0.14.5", @@ -3172,12 +3203,6 @@ dependencies = [ "libc", ] -[[package]] -name = "jpeg-decoder" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5d4a7da358eff58addd2877a45865158f0d78c911d43a5784ceb7bbf52833b0" - [[package]] name = "js-sys" version = "0.3.70" @@ -3754,14 +3779,13 @@ dependencies = [ [[package]] name = "mockall" -version = "0.12.1" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43766c2b5203b10de348ffe19f7e54564b64f3d6018ff7648d1e2d6d3a0f0a48" +checksum = "d4c28b3fb6d753d28c20e826cd46ee611fda1cf3cde03a443a974043247c065a" dependencies = [ "cfg-if", "downcast", "fragile", - "lazy_static", "mockall_derive", "predicates", "predicates-tree", @@ -3769,9 +3793,9 @@ dependencies = [ [[package]] name = "mockall_derive" -version = "0.12.1" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af7cbce79ec385a1d4f54baa90a76401eb15d9cab93685f62e7e9f942aa00ae2" +checksum = "341014e7f530314e9a1fdbc7400b244efea7122662c96bfa248c31da5bfb2020" dependencies = [ "cfg-if", "proc-macro2", @@ -5143,6 +5167,12 @@ dependencies = [ "cc", ] +[[package]] +name = "quick-error" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3" + [[package]] name = "quinn" version = "0.11.3" @@ -5378,15 +5408,17 @@ dependencies = [ [[package]] name = "redis" -version = "0.25.4" +version = "0.26.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0d7a6955c7511f60f3ba9e86c6d02b3c3f144f8c24b288d1f4e18074ab8bbec" +checksum = "e902a69d09078829137b4a5d9d082e0490393537badd7c91a3d69d14639e115f" dependencies = [ + "arc-swap", "async-trait", "bytes", "combine", "futures-util", "itoa", + "num-bigint", "percent-encoding", "pin-project-lite", "ryu", @@ -5580,18 +5612,19 @@ dependencies = [ [[package]] name = "resvg" -version = "0.42.0" +version = "0.43.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "944d052815156ac8fa77eaac055220e95ba0b01fa8887108ca710c03805d9051" +checksum = "c7314563c59c7ce31c18e23ad3dd092c37b928a0fa4e1c0a1a6504351ab411d1" dependencies = [ "gif", - "jpeg-decoder", + "image-webp", "log", "pico-args", "rgb", "svgtypes", "tiny-skia", "usvg", + "zune-jpeg", ] [[package]] @@ -5856,12 +5889,14 @@ checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6" [[package]] name = "rustybuzz" -version = "0.14.1" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfb9cf8877777222e4a3bc7eb247e398b56baba500c38c1c46842431adc8b55c" +checksum = "c85d1ccd519e61834798eb52c4e886e8c2d7d698dd3d6ce0b1b47eb8557f1181" dependencies = [ "bitflags 2.6.0", "bytemuck", + "core_maths", + "log", "smallvec", "ttf-parser", "unicode-bidi-mirroring", @@ -8255,15 +8290,15 @@ dependencies = [ [[package]] name = "tower-layer" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0" +checksum = "121c2a6cda46980bb0fcd1647ffaf6cd3fc79a013de288782836f6df9c48780e" [[package]] name = "tower-service" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" +checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3" [[package]] name = "tracing" @@ -8362,9 +8397,12 @@ checksum = "f4f195fd851901624eee5a58c4bb2b4f06399148fcd0ed336e6f1cb60a9881df" [[package]] name = "ttf-parser" -version = "0.21.1" +version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c591d83f69777866b9126b24c6dd9a18351f177e49d625920d19f989fd31cf8" +checksum = "5be21190ff5d38e8b4a2d3b6a3ae57f612cc39c96e83cedeaf7abc338a8bac4a" +dependencies = [ + "core_maths", +] [[package]] name = "tungstenite" @@ -8400,18 +8438,18 @@ dependencies = [ [[package]] name = "typed-builder" -version = "0.18.2" +version = "0.19.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77739c880e00693faef3d65ea3aad725f196da38b22fdc7ea6ded6e1ce4d3add" +checksum = "a06fbd5b8de54c5f7c91f6fe4cebb949be2125d7758e630bb58b1d831dbce600" dependencies = [ "typed-builder-macro", ] [[package]] name = "typed-builder-macro" -version = "0.18.2" +version = "0.19.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f718dfaf347dcb5b983bfc87608144b0bad87970aebcbea5ce44d2a30c08e63" +checksum = "f9534daa9fd3ed0bd911d462a37f172228077e7abf18c18a5f67199d959205f8" dependencies = [ "proc-macro2", "quote", @@ -8509,15 +8547,15 @@ checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" [[package]] name = "unicode-bidi-mirroring" -version = "0.2.0" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23cb788ffebc92c5948d0e997106233eeb1d8b9512f93f41651f52b6c5f5af86" +checksum = "64af057ad7466495ca113126be61838d8af947f41d93a949980b2389a118082f" [[package]] name = "unicode-ccc" -version = "0.2.0" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1df77b101bcc4ea3d78dafc5ad7e4f58ceffe0b2b16bf446aeb50b6cb4157656" +checksum = "260bc6647b3893a9a90668360803a15f96b85a5257b1c3a0c3daf6ae2496de42" [[package]] name = "unicode-ident" @@ -8595,9 +8633,9 @@ checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da" [[package]] name = "usvg" -version = "0.42.0" +version = "0.43.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b84ea542ae85c715f07b082438a4231c3760539d902e11d093847a0b22963032" +checksum = "6803057b5cbb426e9fb8ce2216f3a9b4ca1dd2c705ba3cbebc13006e437735fd" dependencies = [ "base64 0.22.1", "data-url", @@ -9281,3 +9319,18 @@ dependencies = [ "cc", "pkg-config", ] + +[[package]] +name = "zune-core" +version = "0.4.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f423a2c17029964870cfaabb1f13dfab7d092a62a29a89264f4d36990ca414a" + +[[package]] +name = "zune-jpeg" +version = "0.4.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "16099418600b4d8f028622f73ff6e3deaabdff330fb9a2a131dea781ee8b0768" +dependencies = [ + "zune-core", +] diff --git a/subvt-network-status-server/Cargo.toml b/subvt-network-status-server/Cargo.toml index 5505ca48..762278bb 100644 --- a/subvt-network-status-server/Cargo.toml +++ b/subvt-network-status-server/Cargo.toml @@ -17,7 +17,7 @@ jsonrpsee = { version = "0.24", features = ["full"] } lazy_static = { workspace = true } log = { workspace = true } once_cell = "1" -redis = { version = "0.25", features = ["tokio-comp"] } +redis = { version = "0.26", features = ["tokio-comp"] } serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" subvt-config = { path = "../subvt-config" } diff --git a/subvt-network-status-updater/Cargo.toml b/subvt-network-status-updater/Cargo.toml index a8f237b0..e573ed44 100644 --- a/subvt-network-status-updater/Cargo.toml +++ b/subvt-network-status-updater/Cargo.toml @@ -11,7 +11,7 @@ chrono = "0.4" lazy_static = { workspace = true } log = { workspace = true } once_cell = "1" -redis = { version = "0.25", features = ["tokio-comp"] } +redis = { version = "0.26", features = ["tokio-comp"] } serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" subvt-config = { path = "../subvt-config" } diff --git a/subvt-notification-generator/Cargo.toml b/subvt-notification-generator/Cargo.toml index 4d0d36ee..2f51a653 100644 --- a/subvt-notification-generator/Cargo.toml +++ b/subvt-notification-generator/Cargo.toml @@ -14,7 +14,7 @@ futures-util = "0.3" lazy_static = { workspace = true } log = { workspace = true } once_cell = "1" -redis = "0.25" +redis = "0.26" rustc-hash = "2.0" serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" diff --git a/subvt-notification-processor/Cargo.toml b/subvt-notification-processor/Cargo.toml index 78990f76..8bfb9883 100644 --- a/subvt-notification-processor/Cargo.toml +++ b/subvt-notification-processor/Cargo.toml @@ -21,7 +21,7 @@ lettre = { version = "0.11", default-features = true, features = ["tokio1-native lettre_email = "0.9" log = { workspace = true } once_cell = "1" -redis = { version = "0.25", features = ["tokio-comp"] } +redis = { version = "0.26", features = ["tokio-comp"] } rustc-hash = "2.0" serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" diff --git a/subvt-notification-processor/src/sender/telegram.rs b/subvt-notification-processor/src/sender/telegram.rs index 97601c44..5f45ce7a 100644 --- a/subvt-notification-processor/src/sender/telegram.rs +++ b/subvt-notification-processor/src/sender/telegram.rs @@ -35,6 +35,7 @@ impl TelegramSender { link_preview_options: Some(LinkPreviewOptions::builder().is_disabled(true).build()), disable_notification: None, protect_content: None, + message_effect_id: None, reply_parameters: None, reply_markup: None, message_thread_id: None, diff --git a/subvt-persistence/Cargo.toml b/subvt-persistence/Cargo.toml index f87c396d..04e5643d 100644 --- a/subvt-persistence/Cargo.toml +++ b/subvt-persistence/Cargo.toml @@ -11,7 +11,7 @@ hex = "0.4" lazy_static = { workspace = true } log = { workspace = true } parity-scale-codec = "3.6" -redis = { version = "0.25", features = ["tokio-comp"] } +redis = { version = "0.26", features = ["tokio-comp"] } rustc-hash = "2.0" serde = { version = "1.0" } serde_json = "1.0" diff --git a/subvt-plotter/Cargo.toml b/subvt-plotter/Cargo.toml index a8314a83..4be12aef 100644 --- a/subvt-plotter/Cargo.toml +++ b/subvt-plotter/Cargo.toml @@ -14,11 +14,11 @@ log = { workspace = true } lazy_static = { workspace = true } thiserror = { workspace = true } rand = "0.8.5" -resvg = "0.42" +resvg = "0.43" rustc-hash = "2.0" subvt-config = { path = "../subvt-config" } subvt-types = { path = "../subvt-types" } subvt-utility = { path = "../subvt-utility" } svg = "0.17" tiny-skia = "0.11" -usvg = "0.42" \ No newline at end of file +usvg = "0.43" \ No newline at end of file diff --git a/subvt-report-service/Cargo.toml b/subvt-report-service/Cargo.toml index a51d1fdb..9ff15da8 100644 --- a/subvt-report-service/Cargo.toml +++ b/subvt-report-service/Cargo.toml @@ -14,7 +14,7 @@ hex = "0.4" lazy_static = { workspace = true } log = { workspace = true } once_cell = "1" -redis = { version = "0.25", features = ["tokio-comp"] } +redis = { version = "0.26", features = ["tokio-comp"] } rustc-hash = "2.0" serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" diff --git a/subvt-telegram-bot/Cargo.toml b/subvt-telegram-bot/Cargo.toml index 7cb34f87..9eb5ca70 100644 --- a/subvt-telegram-bot/Cargo.toml +++ b/subvt-telegram-bot/Cargo.toml @@ -10,7 +10,7 @@ async-recursion = "1.0" async-trait = "0.1" chrono = "0.4" enum-iterator = "2.0" -frankenstein = { version = "0.31", default-features = false, features = ["async-http-client", "async-telegram-trait"] } +frankenstein = { version = "0.32", default-features = false, features = ["async-http-client", "async-telegram-trait"] } futures = "0.3" itertools = { workspace = true } lazy_static = { workspace = true } @@ -36,6 +36,6 @@ thiserror = { workspace = true } tokio = { version = "1.35", features = ["full"] } [dev-dependencies] -mockall = "0.12" +mockall = "0.13" mockito = "1" rand = "0.8.5" \ No newline at end of file diff --git a/subvt-telegram-bot/src/messenger/mod.rs b/subvt-telegram-bot/src/messenger/mod.rs index 81636935..13cc4a61 100644 --- a/subvt-telegram-bot/src/messenger/mod.rs +++ b/subvt-telegram-bot/src/messenger/mod.rs @@ -168,9 +168,11 @@ impl Messenger for MessengerImpl { caption: None, parse_mode: Some(ParseMode::Html), caption_entities: None, + show_caption_above_media: None, has_spoiler: None, disable_notification: None, protect_content: None, + message_effect_id: None, reply_parameters: None, reply_markup: None, message_thread_id: None, @@ -258,6 +260,7 @@ impl Messenger for MessengerImpl { link_preview_options: Some(LinkPreviewOptions::builder().is_disabled(true).build()), disable_notification: None, protect_content: None, + message_effect_id: None, reply_parameters: None, reply_markup: inline_keyboard, message_thread_id: None, @@ -334,6 +337,7 @@ impl Messenger for MessengerImpl { } }; let params = EditMessageTextParams { + business_connection_id: None, chat_id: Some(ChatId::Integer(chat_id)), message_id: Some(settings_message_id), inline_message_id: None, @@ -365,6 +369,7 @@ impl Messenger for MessengerImpl { has_next: bool, ) -> anyhow::Result { let params = EditMessageTextParams { + business_connection_id: None, chat_id: Some(ChatId::Integer(chat_id)), message_id: Some(message_id), inline_message_id: None, diff --git a/subvt-telemetry-processor/Cargo.toml b/subvt-telemetry-processor/Cargo.toml index c312d4bf..c4fd0047 100644 --- a/subvt-telemetry-processor/Cargo.toml +++ b/subvt-telemetry-processor/Cargo.toml @@ -8,7 +8,7 @@ rust-version = "1.67.0" anyhow = { workspace = true } async-lock = "3.3" async-trait = "0.1" -async-tungstenite = { version = "0.26", features = ["tokio-runtime", "tokio-native-tls"] } +async-tungstenite = { version = "0.27", features = ["tokio-runtime", "tokio-native-tls"] } futures = "0.3" lazy_static = { workspace = true } log = { workspace = true } diff --git a/subvt-validator-details-server/Cargo.toml b/subvt-validator-details-server/Cargo.toml index 256885d7..a6899511 100644 --- a/subvt-validator-details-server/Cargo.toml +++ b/subvt-validator-details-server/Cargo.toml @@ -16,7 +16,7 @@ jsonrpsee-core = "0.24" lazy_static = { workspace = true } log = { workspace = true } once_cell = "1" -redis = { version = "0.25", features = ["tokio-comp"] } +redis = { version = "0.26", features = ["tokio-comp"] } serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" subvt-config = { path = "../subvt-config" } diff --git a/subvt-validator-list-server/Cargo.toml b/subvt-validator-list-server/Cargo.toml index 44835369..38bdd051 100644 --- a/subvt-validator-list-server/Cargo.toml +++ b/subvt-validator-list-server/Cargo.toml @@ -18,7 +18,7 @@ jsonrpsee = { version = "0.24", features = ["full"] } lazy_static = { workspace = true } log = { workspace = true } once_cell = "1" -redis = { version = "0.25", features = ["tokio-comp"] } +redis = { version = "0.26", features = ["tokio-comp"] } rustc-hash = "2.0" serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" diff --git a/subvt-validator-list-updater/Cargo.toml b/subvt-validator-list-updater/Cargo.toml index eeb7350c..acc628f5 100644 --- a/subvt-validator-list-updater/Cargo.toml +++ b/subvt-validator-list-updater/Cargo.toml @@ -15,7 +15,7 @@ hex = "0.4" lazy_static = { workspace = true } log = { workspace = true } once_cell = "1" -redis = { version = "0.25", features = ["tokio-comp"] } +redis = { version = "0.26", features = ["tokio-comp"] } rustc-hash = "2.0" serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" diff --git a/subvt-validator-list-updater/src/lib.rs b/subvt-validator-list-updater/src/lib.rs index f551704c..443b0517 100644 --- a/subvt-validator-list-updater/src/lib.rs +++ b/subvt-validator-list-updater/src/lib.rs @@ -317,7 +317,7 @@ impl ValidatorListUpdater { Ok(serde_json::from_str( &redis::cmd("GET") .arg(&key) - .query_async::<_, String>(&mut redis_connection) + .query_async::(&mut redis_connection) .await?, )?) } else {