Remove #[allow(clippy::useless_let_if_seq)]

rust-lang · Apr 16, 2019 · 8efde61 · 8efde61
1 parent 845c71e
commit 8efde61
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 10 deletions.
diff --git a/futures-util/src/async_await/join.rs b/futures-util/src/async_await/join.rs
@@ -32,11 +32,8 @@ macro_rules! join {
         await!($crate::future::poll_fn(move |cx| {
             let mut all_done = true;
             $(
-                if $crate::core_reexport::future::Future::poll(
-                    unsafe { $crate::core_reexport::pin::Pin::new_unchecked(&mut $fut) }, cx).is_pending()
-                {
-                    all_done = false;
-                }
+                all_done &= $crate::core_reexport::future::Future::poll(
+                    unsafe { $crate::core_reexport::pin::Pin::new_unchecked(&mut $fut) }, cx).is_ready();
             )*
             if all_done {
                 $crate::core_reexport::task::Poll::Ready(($(

diff --git a/futures-util/src/future/join.rs b/futures-util/src/future/join.rs
@@ -47,15 +47,12 @@ macro_rules! generate {
         impl<$($Fut: Future),*> Future for $Join<$($Fut),*> {
             type Output = ($($Fut::Output),*);
 
-            #[allow(clippy::useless_let_if_seq)]
             fn poll(
                 mut self: Pin<&mut Self>, cx: &mut Context<'_>
             ) -> Poll<Self::Output> {
                 let mut all_done = true;
                 $(
-                    if self.as_mut().$Fut().poll(cx).is_pending() {
-                        all_done = false;
-                    }
+                    all_done &= self.as_mut().$Fut().poll(cx).is_ready();
                 )*
 
                 if all_done {

diff --git a/futures-util/src/try_future/try_join.rs b/futures-util/src/try_future/try_join.rs
@@ -68,7 +68,6 @@ macro_rules! generate {
         {
             type Output = Result<(Fut1::Ok, $($Fut::Ok),*), Fut1::Error>;
 
-            #[allow(clippy::useless_let_if_seq)]
             fn poll(
                 mut self: Pin<&mut Self>, cx: &mut Context<'_>
             ) -> Poll<Self::Output> {