diff --git a/src/dispatcher/simple/mod.rs b/src/dispatcher/simple/mod.rs index d9301228..2c4bdbb3 100644 --- a/src/dispatcher/simple/mod.rs +++ b/src/dispatcher/simple/mod.rs @@ -227,16 +227,29 @@ where match kind { UpdateKind::Message(mes) => { - self.handle_message(mes, &self.message_handlers).await; + self.handle_message(mes, &self.message_handlers) + .await; } UpdateKind::EditedMessage(mes) => { - self.handle_message(mes, &self.edited_message_handlers).await; + self.handle_message( + mes, + &self.edited_message_handlers, + ) + .await; } UpdateKind::ChannelPost(post) => { - self.handle_message(post, &self.channel_post_handlers).await; + self.handle_message( + post, + &self.channel_post_handlers, + ) + .await; } UpdateKind::EditedChannelPost(post) => { - self.handle_message(post, &self.edited_channel_post_handlers).await; + self.handle_message( + post, + &self.edited_channel_post_handlers, + ) + .await; } UpdateKind::InlineQuery(query) => { call!(self.inline_query_handlers, query) @@ -253,8 +266,12 @@ where .await; } - async fn handle_message(&self, message: Message, handlers: &Handlers<'a, Message, E>) { - let handler = handlers.iter().find_map(|e|{ + async fn handle_message( + &self, + message: Message, + handlers: &Handlers<'a, Message, E>, + ) { + let handler = handlers.iter().find_map(|e| { let (filter, handler) = e; if filter.test(&message) { Some(handler) diff --git a/src/network/telegram_response.rs b/src/network/telegram_response.rs index a3c77b4e..82185c0c 100644 --- a/src/network/telegram_response.rs +++ b/src/network/telegram_response.rs @@ -1,8 +1,9 @@ use reqwest::StatusCode; use crate::{ - requests::ResponseResult, types::ResponseParameters, RequestError, - types::{True, False} + requests::ResponseResult, + types::{False, ResponseParameters, True}, + RequestError, }; #[derive(Deserialize)] diff --git a/src/types/mod.rs b/src/types/mod.rs index eadb5942..4205e755 100644 --- a/src/types/mod.rs +++ b/src/types/mod.rs @@ -46,8 +46,8 @@ pub use shipping_query::*; pub use sticker::*; pub use sticker_set::*; pub use successful_payment::*; -pub use unit_true::*; pub use unit_false::*; +pub use unit_true::*; pub use update::*; pub use user::*; pub use user_profile_photos::*; diff --git a/src/types/unit_false.rs b/src/types/unit_false.rs index 78299be1..f5039f8e 100644 --- a/src/types/unit_false.rs +++ b/src/types/unit_false.rs @@ -1,7 +1,6 @@ -use serde::{Deserialize, Deserializer, Serialize, Serializer}; -use serde::de::Visitor; +use serde::{de::Visitor, Deserialize, Deserializer, Serialize, Serializer}; -#[derive(Copy, Clone, Debug, Default, Eq, Hash, PartialEq, PartialOrd, Ord)] +#[derive(Copy, Clone, Debug, Default, Eq, Hash, PartialEq)] pub struct False; impl std::convert::TryFrom<bool> for False { @@ -19,7 +18,7 @@ impl std::convert::TryFrom<bool> for False { impl<'de> Deserialize<'de> for False { fn deserialize<D>(deserializer: D) -> Result<Self, D::Error> where - D: Deserializer<'de> + D: Deserializer<'de>, { deserializer.deserialize_bool(FalseVisitor) } @@ -30,7 +29,10 @@ struct FalseVisitor; impl<'de> Visitor<'de> for FalseVisitor { type Value = False; - fn expecting(&self, formatter: &mut std::fmt::Formatter) -> std::fmt::Result { + fn expecting( + &self, + formatter: &mut std::fmt::Formatter, + ) -> std::fmt::Result { write!(formatter, "bool, equal to `false`") } @@ -41,7 +43,7 @@ impl<'de> Visitor<'de> for FalseVisitor { #[allow(clippy::match_bool)] match value { true => Err(E::custom("expected `false`, found `true`")), - false => Ok(False) + false => Ok(False), } } } @@ -49,7 +51,7 @@ impl<'de> Visitor<'de> for FalseVisitor { impl Serialize for False { fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error> where - S: Serializer + S: Serializer, { serializer.serialize_bool(false) } diff --git a/src/types/unit_true.rs b/src/types/unit_true.rs index a953dcb2..ed953d46 100644 --- a/src/types/unit_true.rs +++ b/src/types/unit_true.rs @@ -3,7 +3,7 @@ use serde::{ ser::{Serialize, Serializer}, }; -#[derive(Copy, Clone, Debug, Default, Eq, Hash, PartialEq, PartialOrd, Ord)] +#[derive(Copy, Clone, Debug, Default, Eq, Hash, PartialEq)] pub struct True; impl std::convert::TryFrom<bool> for True {