From 2041853a832ffe6416d5c47079d00641910d4d62 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20V=C3=B6gele?= Date: Thu, 26 Sep 2024 10:25:34 +0200 Subject: [PATCH] Bump dependency versions --- Cargo.lock | 83 +++++++++++++++++++++++++++++----------------- Cargo.toml | 8 ++--- src/appointment.rs | 6 ++-- src/bot.rs | 12 +++---- 4 files changed, 66 insertions(+), 43 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 1430da3..ddcaf32 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -49,15 +49,16 @@ checksum = "86fdf8605db99b54d3cd748a44c6d04df638eb5dafb219b135d0149bd0db01f6" [[package]] name = "aquamarine" -version = "0.1.12" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a941c39708478e8eea39243b5983f1c42d2717b3620ee91f4a52115fd02ac43f" +checksum = "21cc1548309245035eb18aa7f0967da6bc65587005170c56e6ef2788a4cf3f4e" dependencies = [ - "itertools 0.9.0", + "include_dir", + "itertools 0.10.5", "proc-macro-error", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.77", ] [[package]] @@ -198,7 +199,7 @@ dependencies = [ "diesel", "diesel_migrations", "ical", - "itertools 0.12.1", + "itertools 0.13.0", "log", "once_cell", "pretty_env_logger", @@ -245,9 +246,9 @@ dependencies = [ [[package]] name = "chrono-tz" -version = "0.8.6" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d59ae0466b83e838b81a54256c39d5d7c20b9d7daa10510a242d9b75abd5936e" +checksum = "93698b29de5e97ad0ae26447b344c482a7284c737d9ddc5f9e52b74a336671bb" dependencies = [ "chrono", "chrono-tz-build", @@ -256,9 +257,9 @@ dependencies = [ [[package]] name = "chrono-tz-build" -version = "0.2.1" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "433e39f13c9a060046954e0592a8d0a4bcb1040125cbf91cb8ee58964cfb350f" +checksum = "0c088aee841df9c3041febbb73934cfc39708749bf96dc827e3359cd39ef11b1" dependencies = [ "parse-zoneinfo", "phf", @@ -1059,6 +1060,25 @@ dependencies = [ "winapi-util", ] +[[package]] +name = "include_dir" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "923d117408f1e49d914f1a379a309cffe4f18c05cf4e3d12e613a15fc81bd0dd" +dependencies = [ + "include_dir_macros", +] + +[[package]] +name = "include_dir_macros" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7cab85a7ed0bd5f0e76d93846e0147172bed2e2d3f859bcc33a8d9699cad1a75" +dependencies = [ + "proc-macro2", + "quote", +] + [[package]] name = "indexmap" version = "2.5.0" @@ -1088,9 +1108,9 @@ dependencies = [ [[package]] name = "itertools" -version = "0.9.0" +version = "0.10.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "284f18f85651fe11e8a991b2adb42cb078325c996ed026d994719efcfca1d54b" +checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" dependencies = [ "either", ] @@ -1106,9 +1126,9 @@ dependencies = [ [[package]] name = "itertools" -version = "0.12.1" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" +checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186" dependencies = [ "either", ] @@ -1249,12 +1269,6 @@ dependencies = [ "tempfile", ] -[[package]] -name = "never" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c96aba5aa877601bb3f6dd6a63a969e1f82e60646e81e71b14496995e9853c91" - [[package]] name = "normpath" version = "1.3.0" @@ -1660,9 +1674,9 @@ dependencies = [ [[package]] name = "rrule" -version = "0.12.0" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa903a94a0360e2b693d30028605c10105c5a830e6fc39d489dd3cc4e05f1cac" +checksum = "cff1ca93145ff07cdc878b5f6bb90391a299cc8712538af0ad73ebf37613e46a" dependencies = [ "chrono", "chrono-tz", @@ -1921,6 +1935,16 @@ dependencies = [ "serde", ] +[[package]] +name = "serde_with" +version = "1.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "678b5a069e50bf00ecd22d0cd8ddf7c236f68581b03db652061ed5eb13a312ff" +dependencies = [ + "serde", + "serde_with_macros", +] + [[package]] name = "serde_with_macros" version = "1.5.2" @@ -2160,21 +2184,21 @@ checksum = "20f34339676cdcab560c9a82300c4c2581f68b9369aedf0fae86f2ff9565ff3e" [[package]] name = "teloxide" -version = "0.12.2" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c63345cf32a8850ebddcdd769dc2d5193d5e231262d5dada264b79da01a664da" +checksum = "5f79dd283eb21b90451c03fa7c7f83b9985130efb876b33bad89a2c208ccbc16" dependencies = [ "aquamarine", "bytes", "derive_more", "dptree", + "either", "futures", "log", "mime", "pin-project", "serde", "serde_json", - "serde_with_macros", "teloxide-core", "teloxide-macros", "thiserror", @@ -2186,9 +2210,9 @@ dependencies = [ [[package]] name = "teloxide-core" -version = "0.9.1" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "303db260110c238e3af77bb9dff18bf7a5b5196f783059b0852aab75f91d5a16" +checksum = "9e1642a7ef10e7af63b8298c8d13c0f986d4fc646d42649ff060359607f62f69" dependencies = [ "bitflags 1.3.2", "bytes", @@ -2198,14 +2222,13 @@ dependencies = [ "futures", "log", "mime", - "never", "once_cell", "pin-project", "rc-box", "reqwest 0.11.27", "serde", "serde_json", - "serde_with_macros", + "serde_with", "take_mut", "takecell", "thiserror", @@ -2218,9 +2241,9 @@ dependencies = [ [[package]] name = "teloxide-macros" -version = "0.7.1" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f1d653b093dba5e44cada57a516f572167df37b8a619443e59c8c517bb6d804" +checksum = "7e2d33d809c3e7161a9ab18bedddf98821245014f0a78fa4d2c9430b2ec018c1" dependencies = [ "heck 0.4.1", "proc-macro2", diff --git a/Cargo.toml b/Cargo.toml index 05d6113..04c7c86 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -11,22 +11,22 @@ async-mutex = "1.4.0" blocking = "1.2.0" bytes = "1.2.1" chrono = "0.4.22" -chrono-tz = "0.8.5" +chrono-tz = "0.9.0" diesel = { version = "2.0.2", features = ["chrono", "sqlite"] } diesel_migrations = "2.0.0" ical = { version = "0.11.0", features = ["ical"], default-features = false } -itertools = "0.12.0" +itertools = "0.13.0" log = "0.4.17" once_cell = "1.17.0" pretty_env_logger = "0.5.0" regex = "1.6.0" reqwest = "0.12.4" -rrule = "0.12.0" +rrule = "0.13.0" rust-i18n = "3.0.1" serde = { version = "1.0.145", features = ["derive"] } serde_yaml = "0.9.13" strum = { version = "0.26.1", features = ["derive"] } -teloxide = { version = "0.12.2", features = ["macros", "throttle"] } +teloxide = { version = "0.13.0", features = ["macros", "throttle"] } thiserror = "1.0.56" tokio = { version = "1.21.2", features = ["macros"] } diff --git a/src/appointment.rs b/src/appointment.rs index 3b4d23b..9be560e 100644 --- a/src/appointment.rs +++ b/src/appointment.rs @@ -15,12 +15,12 @@ struct RRuleWithReplacements { } struct RRuleWithReplacementsIter<'a> { - inner: RRuleSetIter<'a>, + inner: RRuleSetIter, rrule_set: &'a RRuleWithReplacements, } impl<'a> Iterator for RRuleWithReplacementsIter<'a> { - type Item = as IntoIterator>::Item; + type Item = ::Item; fn next(&mut self) -> Option { self.inner.next().map(|mut next_appointment| { @@ -33,7 +33,7 @@ impl<'a> Iterator for RRuleWithReplacementsIter<'a> { } impl<'a> IntoIterator for &'a RRuleWithReplacements { - type Item = as IntoIterator>::Item; + type Item = ::Item; type IntoIter = RRuleWithReplacementsIter<'a>; fn into_iter(self) -> Self::IntoIter { diff --git a/src/bot.rs b/src/bot.rs index 39033dc..79a8050 100644 --- a/src/bot.rs +++ b/src/bot.rs @@ -22,10 +22,10 @@ use teloxide::payloads::SendMessageSetters; use teloxide::prelude::Dispatcher; use teloxide::requests::Request; use teloxide::requests::Requester; -use teloxide::types::ChatId; use teloxide::types::ChatMemberKind; use teloxide::types::ChatMemberUpdated; use teloxide::types::MessageId; +use teloxide::types::{ChatId, ReplyParameters}; use teloxide::types::{Message, Update}; use teloxide::utils::command::BotCommands; use teloxide::Bot; @@ -177,7 +177,7 @@ async fn set_reminders(bot: Throttle, msg: Message, db: Database) -> Result if params.len() == 0 || params.contains(&"help") { bot.send_message(msg.chat.id, t!("help.setreminders", locale = &chat.locale)) .parse_mode(teloxide::types::ParseMode::Html) - .reply_to_message_id(msg.id) + .reply_parameters(ReplyParameters::new(msg.id)) .send() .await?; return Ok(()); @@ -189,7 +189,7 @@ async fn set_reminders(bot: Throttle, msg: Message, db: Database) -> Result t!("errors.cannot_mix_delete", locale = &chat.locale), ) .parse_mode(teloxide::types::ParseMode::Html) - .reply_to_message_id(msg.id) + .reply_parameters(ReplyParameters::new(msg.id)) .send() .await?; return Ok(()); @@ -204,7 +204,7 @@ async fn set_reminders(bot: Throttle, msg: Message, db: Database) -> Result msg.chat.id, t!("messages.reminders_deleted", locale = &chat.locale), ) - .reply_to_message_id(msg.id) + .reply_parameters(ReplyParameters::new(msg.id)) .send() .await?; return Ok(()); @@ -224,7 +224,7 @@ async fn set_reminders(bot: Throttle, msg: Message, db: Database) -> Result ParseReminderError::DeltaZero => "errors.delta_zero", }; bot.send_message(msg.chat.id, t!(reminder_text, locale = &chat.locale)) - .reply_to_message_id(msg.id) + .reply_parameters(ReplyParameters::new(msg.id)) .send() .await?; return Ok(()); @@ -256,7 +256,7 @@ async fn set_reminders(bot: Throttle, msg: Message, db: Database) -> Result let text = t!("messages.reminders_set", locale = &chat.locale).into_owned() + &reminders_text; bot.send_message(msg.chat.id, text) - .reply_to_message_id(msg.id) + .reply_parameters(ReplyParameters::new(msg.id)) .send() .await?; return Ok(());