Merge pull request #170 from matheus-consoli/fix-clippy-warnings

Author: yoshuawuyts

src/future/future_group.rs

@@ -301,6 +301,7 @@ impl<F: Future> FutureGroup<F> {
         for index in this.keys.iter().cloned() {
             if states[index].is_pending() && readiness.clear_ready(index) {
                 // unlock readiness so we don't deadlock when polling
+                #[allow(clippy::drop_non_drop)]
                 drop(readiness);
 
                 // Obtain the intermediate waker.

src/future/join/array.rs

@@ -104,6 +104,7 @@ where
         for (i, mut fut) in this.futures.iter().enumerate() {
             if this.state[i].is_pending() && readiness.clear_ready(i) {
                 // unlock readiness so we don't deadlock when polling
+                #[allow(clippy::drop_non_drop)]
                 drop(readiness);
 
                 // Obtain the intermediate waker.

src/future/join/tuple.rs

@@ -212,6 +212,7 @@ macro_rules! impl_join_tuple {
                     }
 
                     // unlock readiness so we don't deadlock when polling
+                    #[allow(clippy::drop_non_drop)]
                     drop(readiness);
 
                     // obtain the intermediate waker

src/future/join/vec.rs

@@ -1,7 +1,9 @@
 use super::Join as JoinTrait;
 use crate::utils::{FutureVec, OutputVec, PollVec, WakerVec};
 
+#[cfg(all(feature = "alloc", not(feature = "std")))]
 use alloc::vec::Vec;
+
 use core::fmt;
 use core::future::{Future, IntoFuture};
 use core::mem::ManuallyDrop;
@@ -98,6 +100,7 @@ where
         for (i, mut fut) in futures.iter().enumerate() {
             if states[i].is_pending() && readiness.clear_ready(i) {
                 // unlock readiness so we don't deadlock when polling
+                #[allow(clippy::drop_non_drop)]
                 drop(readiness);
 
                 // Obtain the intermediate waker.
@@ -178,8 +181,6 @@ mod test {
     use alloc::sync::Arc;
     use alloc::vec;
     use core::future;
-    use core::future::Future;
-    use core::task::Context;
 
     #[test]
     fn smoke() {

src/future/race/vec.rs

@@ -2,7 +2,9 @@ use crate::utils::{self, Indexer};
 
 use super::Race as RaceTrait;
 
+#[cfg(all(feature = "alloc", not(feature = "std")))]
 use alloc::vec::Vec;
+
 use core::fmt;
 use core::future::{Future, IntoFuture};
 use core::pin::Pin;

src/future/race_ok/tuple/mod.rs

@@ -78,7 +78,7 @@ macro_rules! impl_race_ok_tuple {
             }
         }
 
-        impl<T, ERR, $($F: Future),*> Future for $StructName<T, ERR, $($F),*>
+        impl<T, ERR, $($F),*> Future for $StructName<T, ERR, $($F),*>
         where
             $( $F: Future<Output = Result<T, ERR>>, )*
             ERR: fmt::Debug,
@@ -138,7 +138,7 @@ macro_rules! impl_race_ok_tuple {
         }
 
         #[pinned_drop]
-        impl<T, ERR, $($F: Future,)*> PinnedDrop for $StructName<T, ERR, $($F,)*>
+        impl<T, ERR, $($F,)*> PinnedDrop for $StructName<T, ERR, $($F,)*>
         where
             $( $F: Future<Output = Result<T, ERR>>, )*
             ERR: fmt::Debug,

src/future/race_ok/vec/error.rs

@@ -1,4 +1,6 @@
+#[cfg(all(feature = "alloc", not(feature = "std")))]
 use alloc::vec::Vec;
+
 use core::fmt;
 use core::ops::Deref;
 use core::ops::DerefMut;

src/future/race_ok/vec/mod.rs

@@ -2,8 +2,9 @@ use super::RaceOk as RaceOkTrait;
 use crate::utils::iter_pin_mut;
 use crate::utils::MaybeDone;
 
-use alloc::boxed::Box;
-use alloc::vec::Vec;
+#[cfg(all(feature = "alloc", not(feature = "std")))]
+use alloc::{boxed::Box, vec::Vec};
+
 use core::fmt;
 use core::future::{Future, IntoFuture};
 use core::mem;
@@ -94,7 +95,6 @@ where
 
 #[cfg(test)]
 mod test {
-    use super::error::AggregateError;
     use super::*;
     use alloc::vec;
     use core::future;

src/future/try_join/array.rs

@@ -104,6 +104,7 @@ where
         for (i, mut fut) in this.futures.iter().enumerate() {
             if this.state[i].is_pending() && readiness.clear_ready(i) {
                 // unlock readiness so we don't deadlock when polling
+                #[allow(clippy::drop_non_drop)]
                 drop(readiness);
 
                 // Obtain the intermediate waker.

src/future/try_join/tuple.rs

@@ -245,6 +245,7 @@ macro_rules! impl_try_join_tuple {
                     }
 
                     // unlock readiness so we don't deadlock when polling
+                    #[allow(clippy::drop_non_drop)]
                     drop(readiness);
 
                     // obtain the intermediate waker
@@ -354,7 +355,7 @@ mod test {
             let res: Result<(_, char), ()> = (future::ready(Ok("hello")), future::ready(Err(())))
                 .try_join()
                 .await;
-            assert_eq!(res.unwrap_err(), ());
+            assert_eq!(res, Err(()));
         })
     }