diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2a97f3ab..5e273fcb 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -52,6 +52,7 @@ jobs: - name: fmt uses: actions-rs/cargo@v1 + if: matrix.rust == 'nightly' with: command: fmt args: --all -- --check diff --git a/src/dispatching/dispatchers/filter/mod.rs b/src/dispatching/dispatchers/filter/mod.rs index f11bc141..2f7211f3 100644 --- a/src/dispatching/dispatchers/filter/mod.rs +++ b/src/dispatching/dispatchers/filter/mod.rs @@ -318,12 +318,16 @@ mod tests { let counter2 = &AtomicI32::new(0); let mut dp = FilterDispatcher::::new(|_| async {}) - .message_handler(true, |_mes: Message| async move { - counter.fetch_add(1, Ordering::SeqCst); + .message_handler(true, |_mes: Message| { + async move { + counter.fetch_add(1, Ordering::SeqCst); + } }) - .message_handler(true, |_mes: Message| async move { - counter2.fetch_add(1, Ordering::SeqCst); - Ok::<_, Infallible>(()) + .message_handler(true, |_mes: Message| { + async move { + counter2.fetch_add(1, Ordering::SeqCst); + Ok::<_, Infallible>(()) + } }); dp.dispatch(one_message_updater()).await; diff --git a/src/dispatching/updater.rs b/src/dispatching/updater.rs index fdf4aaf1..64653c96 100644 --- a/src/dispatching/updater.rs +++ b/src/dispatching/updater.rs @@ -136,17 +136,19 @@ where } pub fn polling<'a>(bot: &'a Bot) -> impl Updater + 'a { - let stream = stream::unfold((bot, 0), |(bot, mut offset)| async move { - let updates = match bot.get_updates().offset(offset).send().await { - Ok(updates) => { - if let Some(upd) = updates.last() { - offset = upd.id + 1; + let stream = stream::unfold((bot, 0), |(bot, mut offset)| { + async move { + let updates = match bot.get_updates().offset(offset).send().await { + Ok(updates) => { + if let Some(upd) = updates.last() { + offset = upd.id + 1; + } + updates.into_iter().map(Ok).collect::>() } - updates.into_iter().map(Ok).collect::>() - } - Err(err) => vec![Err(err)], - }; - Some((stream::iter(updates), (bot, offset))) + Err(err) => vec![Err(err)], + }; + Some((stream::iter(updates), (bot, offset))) + } }) .flatten(); diff --git a/src/network/download.rs b/src/network/download.rs index 4ff6c794..47061b6f 100644 --- a/src/network/download.rs +++ b/src/network/download.rs @@ -42,11 +42,13 @@ pub async fn download_file_stream( .await? .error_for_status()?; - Ok(futures::stream::unfold(res, |mut res| async { - match res.chunk().await { - Err(err) => Some((Err(err), res)), - Ok(Some(c)) => Some((Ok(c), res)), - Ok(None) => None, + Ok(futures::stream::unfold(res, |mut res| { + async { + match res.chunk().await { + Err(err) => Some((Err(err), res)), + Ok(Some(c)) => Some((Ok(c), res)), + Ok(None) => None, + } } })) }