Edition 2024

Author: rossnomann

Cargo.toml

@@ -3,7 +3,7 @@ name = "carapax"
 description = "A Telegram Bot Framework"
 version = "0.29.0"
 authors = ["Ross Nomann <rossnomann@protonmail.com>"]
-edition = "2021"
+edition = "2024"
 readme = "./README.md"
 license = "MIT"
 documentation = "https://docs.rs/carapax"

src/access/principal/mod.rs

@@ -94,7 +94,7 @@ impl Resolver for UserId {
     fn accepts(&self, update: &Update) -> bool {
         match self {
             UserId::Id(user_id) => update.get_user().map(|u| u.id == *user_id),
-            UserId::Username(ref username) => update
+            UserId::Username(username) => update
                 .get_user()
                 .and_then(|u| u.username.as_ref().map(|x| x == username)),
         }
@@ -106,7 +106,7 @@ impl Resolver for ChatId {
     fn accepts(&self, update: &Update) -> bool {
         match self {
             ChatId::Id(chat_id) => update.get_chat_id().map(|x| x == *chat_id),
-            ChatId::Username(ref chat_username) => update.get_chat_username().map(|x| x == chat_username),
+            ChatId::Username(chat_username) => update.get_chat_username().map(|x| x == chat_username),
         }
         .unwrap_or(false)
     }

src/core/app/mod.rs

@@ -49,7 +49,7 @@ where
         }
     }
 
-    fn handle_update(&self, update: Update) -> impl Future<Output = ()> {
+    fn handle_update(&self, update: Update) -> impl Future<Output = ()> + use<H, HI, HO> {
         let input = HandlerInput {
             update,
             context: self.context.clone(),

src/core/chain/mod.rs

@@ -68,7 +68,7 @@ impl Chain {
         self
     }
 
-    fn handle_input(&self, input: HandlerInput) -> impl Future<Output = HandlerResult> {
+    fn handle_input(&self, input: HandlerInput) -> impl Future<Output = HandlerResult> + use<> {
         let handlers = self.handlers.clone();
         let strategy = self.strategy;
         async move {

src/core/predicate/base/mod.rs

@@ -51,11 +51,11 @@ where
 
     async fn handle(&self, (predicate_input, handler_input): (PI, HI)) -> Self::Output {
         let predicate_result = self.predicate.handle(predicate_input).await.into();
-        if let PredicateResult::True = predicate_result {
+        match predicate_result { PredicateResult::True => {
             self.handler.handle(handler_input).await.into_result().into()
-        } else {
+        } _ => {
             predicate_result.into()
-        }
+        }}
     }
 }
 

src/ratelimit/key.rs

@@ -72,11 +72,11 @@ impl TryFromInput for KeyChatUser {
     type Error = Infallible;
 
     async fn try_from_input(input: HandlerInput) -> Result<Option<Self>, Self::Error> {
-        Ok(if let Some(chat_id) = input.update.get_chat_id() {
+        Ok(match input.update.get_chat_id() { Some(chat_id) => {
             input.update.get_user().map(|user| Self(chat_id, user.id))
-        } else {
+        } _ => {
             None
-        })
+        }})
     }
 }