OpenSource/teloxide
OpenSource/teloxide
1
0
Fork 0
mirror of https://github.com/teloxide/teloxide.git synced 2025-01-08 19:33:53 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fix build after resolving conflicts

Browse source
This commit is contained in:
Waffle 2019-09-21 01:22:31 +03:00
parent 78988205e9
commit 36f146580e
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -5,7 +5,7 @@ use crate::{
filter::Filter, filter::Filter,
handler::Handler, handler::Handler,
}, },
core::types::{ types::{
Update, Update,
Message, Message,
UpdateKind, UpdateKind,
@ -110,7 +110,7 @@ impl Dispatcher {
where where
S: Stream<Item=Update> S: Stream<Item=Update>
{ {
use futures_util::stream::StreamExt; use futures::StreamExt;
let dp = &*self; let dp = &*self;
@ -202,7 +202,7 @@ mod tests {
#[tokio::test] #[tokio::test]
async fn test() { async fn test() {
use crate::{ use crate::{
core::types::{ types::{
Message, ChatKind, MessageKind, Sender, ForwardKind, MediaKind, Chat, User, Update, UpdateKind Message, ChatKind, MessageKind, Sender, ForwardKind, MediaKind, Chat, User, Update, UpdateKind
}, },
dispatcher::simple::Dispatcher, dispatcher::simple::Dispatcher,
@ -221,7 +221,7 @@ mod tests {
username: Some("WaffleLapkin".to_string()), username: Some("WaffleLapkin".to_string()),
}, },
}, },
message_kind: MessageKind::IncomingMessage { kind: MessageKind::Common {
from: Sender::User(User { from: Sender::User(User {
id: 457569668, id: 457569668,
is_bot: true, is_bot: true,