OpenSource/teloxide
OpenSource/teloxide
1
0
Fork 0
mirror of https://github.com/teloxide/teloxide.git synced 2025-03-14 11:44:04 +01:00
Code Issues Projects Releases Packages Wiki Activity

Remove PartialOrd, Ord for True, False

Browse source
This commit is contained in:
Temirkhan Myrzamadi 2019-10-20 22:45:22 +06:00
parent 480d1a6f57
commit 10f3ab71c1
5 changed files with 37 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
src/dispatcher/simple/mod.rs
View file

@ -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)

5
src/network/telegram_response.rs
View file

@ -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)]

2
src/types/mod.rs
View file

@ -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::*;

16
src/types/unit_false.rs
View file

@ -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)
}

2
src/types/unit_true.rs
View file

@ -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 {