Merge pull request #282 from teloxide/box-pin

Box::pin -> .boxed()
This commit is contained in:
Waffle Lapkin 2020-10-01 18:15:12 +03:00 committed by GitHub
commit 0c6a81e1b6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 29 additions and 24 deletions

View file

@ -123,3 +123,4 @@ C: Into<String>, { ... }
## Misc
1. Use `Into<...>` only where there exists at least one conversion **and** it will be logically to use.
2. Always mark a function as `#[must_use]` if its return value **must** be used.
3. `Box::pin(async [move] { ... })` instead of `async [move] { ... }.boxed()`.

View file

@ -6,7 +6,7 @@ use crate::dispatching::{
};
use std::{convert::Infallible, marker::PhantomData};
use futures::{future::BoxFuture, StreamExt};
use futures::{future::BoxFuture, FutureExt, StreamExt};
use tokio::sync::mpsc;
use lockfree::map::Map;
@ -137,28 +137,30 @@ where
{
let this = Arc::new(self);
Box::pin(updates.for_each(move |cx| {
let this = Arc::clone(&this);
let chat_id = cx.update.chat_id();
updates
.for_each(move |cx| {
let this = Arc::clone(&this);
let chat_id = cx.update.chat_id();
match this.senders.get(&chat_id) {
// An old dialogue
Some(tx) => {
if tx.1.send(cx).is_err() {
panic!("We are not dropping a receiver or call .close() on it",);
match this.senders.get(&chat_id) {
// An old dialogue
Some(tx) => {
if tx.1.send(cx).is_err() {
panic!("We are not dropping a receiver or call .close() on it",);
}
}
None => {
let tx = this.new_tx();
if tx.send(cx).is_err() {
panic!("We are not dropping a receiver or call .close() on it",);
}
this.senders.insert(chat_id, tx);
}
}
None => {
let tx = this.new_tx();
if tx.send(cx).is_err() {
panic!("We are not dropping a receiver or call .close() on it",);
}
this.senders.insert(chat_id, tx);
}
}
async {}
}))
async {}
})
.boxed()
}
}

View file

@ -30,7 +30,7 @@ where
where
Self: Stream<Item = UpdateWithCx<Message>>,
{
Box::pin(self.filter_map(|cx| async move { cx.update.text_owned().map(|text| (cx, text)) }))
self.filter_map(|cx| async move { cx.update.text_owned().map(|text| (cx, text)) }).boxed()
}
fn commands<C, N>(self, bot_name: N) -> BoxStream<'static, (UpdateWithCx<Message>, C)>
@ -41,10 +41,12 @@ where
{
let bot_name = bot_name.into();
Box::pin(self.text_messages().filter_map(move |(cx, text)| {
let bot_name = bot_name.clone();
self.text_messages()
.filter_map(move |(cx, text)| {
let bot_name = bot_name.clone();
async move { C::parse(&text, &bot_name).map(|command| (cx, command)).ok() }
}))
async move { C::parse(&text, &bot_name).map(|command| (cx, command)).ok() }
})
.boxed()
}
}