Misc fixes except for 1.45 backward compatibility

rust-lang · Mar 12, 2022 · 49f1b08 · 49f1b08
1 parent f415bab
commit 49f1b08
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/futures-util/src/stream/stream/flatten_unordered.rs b/futures-util/src/stream/stream/flatten_unordered.rs
@@ -1,4 +1,4 @@
-use alloc::sync::Arc;
+use alloc::{boxed::Box, sync::Arc};
 use core::{
     cell::UnsafeCell,
     convert::identity,

diff --git a/futures-util/src/stream/try_stream/mod.rs b/futures-util/src/stream/try_stream/mod.rs
@@ -99,7 +99,9 @@ mod try_flatten;
 #[allow(unreachable_pub)] // https://github.com/rust-lang/rust/issues/57411
 pub use self::try_flatten::TryFlatten;
 
+#[cfg(feature = "alloc")]
 mod try_flatten_unordered;
+#[cfg(feature = "alloc")]
 #[allow(unreachable_pub)] // https://github.com/rust-lang/rust/issues/57411
 pub use self::try_flatten_unordered::TryFlattenUnordered;
 
@@ -676,6 +678,7 @@ pub trait TryStreamExt: TryStream {
     /// assert_eq!(values, vec![Ok(1), Ok(2), Ok(4), Err(3), Err(5)]);
     /// # });
     /// ```
+    #[cfg(feature = "alloc")]
     fn try_flatten_unordered(self, limit: impl Into<Option<usize>>) -> TryFlattenUnordered<Self>
     where
         Self: TryStream,

diff --git a/futures-util/src/stream/try_stream/try_flatten_unordered.rs b/futures-util/src/stream/try_stream/try_flatten_unordered.rs
@@ -114,7 +114,6 @@ impl<S, Item> Sink<Item> for TryFlattenSuccessful<S>
 where
     S: TryStream + Sink<Item>,
     S::Ok: TryStream,
-    S::Ok: Stream<Item = Result<<S::Ok as TryStream>::Ok, <S::Ok as TryStream>::Error>>,
     <S::Ok as TryStream>::Error: From<<S as TryStream>::Error>,
 {
     type Error = <S as Sink<Item>>::Error;