Merge 3a6e75cc1d into 8947d8e03c

Allow for unused `pub use` in experimental API which doesn't have its mods public for noiw.
MIPS CI is fully broken (doesn't find the MIPS toolchain) so disable it for now.
Reenable powerpc64 which is no longer broken

.github/workflows/ci.yml

@@ -132,8 +132,8 @@ jobs:
         target:
           - i686-unknown-linux-gnu
           - powerpc-unknown-linux-gnu
-#          - powerpc64-unknown-linux-gnu
-          - mips-unknown-linux-gnu
+          - powerpc64-unknown-linux-gnu
+#          - mips-unknown-linux-gnu
           - arm-linux-androideabi
 
     steps:

Cargo.toml

@@ -62,7 +62,7 @@ io_safety = []
 
 [dependencies]
 async-attributes = { version = "1.1.2", optional = true }
-async-lock = { version = "2.7.0", optional = true }
+async-lock = { version = "3.1.0", optional = true }
 crossbeam-utils = { version = "0.8.0", optional = true }
 futures-core = { version = "0.3.4", optional = true, default-features = false }
 futures-io = { version = "0.3.4", optional = true }
@@ -80,10 +80,10 @@ surf = { version = "2.0.0", optional = true }
 
 
 [target.'cfg(not(target_os = "unknown"))'.dependencies]
-async-global-executor = { version = "2.3.1", optional = true, features = ["async-io"] }
-async-io = { version = "1.13.0", optional = true }
-futures-lite = { version = "1.0.0", optional = true }
-async-process = { version = "1.7.0", optional = true }
+async-global-executor = { version = "2.4.0", optional = true, features = ["async-io"] }
+async-io = { version = "2.2.0", optional = true }
+futures-lite = { version = "2.0.0", optional = true }
+async-process = { version = "2.0.0", optional = true }
 
 [target.'cfg(target_arch = "wasm32")'.dependencies]
 gloo-timers = { version = "0.2.1", features = ["futures"], optional = true }

src/collections/mod.rs

@@ -11,10 +11,17 @@ pub mod hash_set;
 pub mod linked_list;
 pub mod vec_deque;
 
+#[allow(unused)]
 pub use binary_heap::BinaryHeap;
+#[allow(unused)]
 pub use btree_map::BTreeMap;
+#[allow(unused)]
 pub use btree_set::BTreeSet;
+#[allow(unused)]
 pub use hash_map::HashMap;
+#[allow(unused)]
 pub use hash_set::HashSet;
+#[allow(unused)]
 pub use linked_list::LinkedList;
+#[allow(unused)]
 pub use vec_deque::VecDeque;

src/option/mod.rs

@@ -5,6 +5,7 @@
 
 mod from_stream;
 
+#[allow(unused)]
 #[doc(inline)]
 pub use std::option::Option;
 

src/result/mod.rs

@@ -5,6 +5,7 @@
 
 mod from_stream;
 
+#[allow(unused)]
 #[doc(inline)]
 pub use std::result::Result;
 

src/stream/interval.rs

@@ -41,8 +41,6 @@ use crate::utils::{timer_after, Timer};
 /// #
 /// # Ok(()) }) }
 /// ```
-#[cfg(feature = "unstable")]
-#[cfg_attr(feature = "docs", doc(cfg(unstable)))]
 pub fn interval(dur: Duration) -> Interval {
     Interval {
         delay: timer_after(dur),
@@ -56,8 +54,6 @@ pub fn interval(dur: Duration) -> Interval {
 /// documentation for more.
 ///
 /// [`interval`]: fn.interval.html
-#[cfg(feature = "unstable")]
-#[cfg_attr(feature = "docs", doc(cfg(unstable)))]
 #[derive(Debug)]
 pub struct Interval {
     delay: Timer,

src/stream/mod.rs

@@ -304,7 +304,9 @@
 pub use empty::{empty, Empty};
 pub use from_fn::{from_fn, FromFn};
 pub use from_iter::{from_iter, FromIter};
+pub use interval::{interval, Interval};
 pub use once::{once, Once};
+pub use pending::{pending, Pending};
 pub use repeat::{repeat, Repeat};
 pub use repeat_with::{repeat_with, RepeatWith};
 pub use stream::*;
@@ -314,7 +316,9 @@ pub(crate) mod stream;
 mod empty;
 mod from_fn;
 mod from_iter;
+mod interval;
 mod once;
+mod pending;
 mod repeat;
 mod repeat_with;
 
@@ -324,9 +328,7 @@ cfg_unstable! {
     mod extend;
     mod from_stream;
     mod fused_stream;
-    mod interval;
     mod into_stream;
-    mod pending;
     mod product;
     mod successors;
     mod sum;
@@ -336,11 +338,8 @@ cfg_unstable! {
     pub use extend::{extend, Extend};
     pub use from_stream::FromStream;
     pub use fused_stream::FusedStream;
-    pub use interval::{interval, Interval};
     pub use into_stream::IntoStream;
-    pub use pending::{pending, Pending};
     pub use product::Product;
-    pub use stream::Merge;
     pub use successors::{successors, Successors};
     pub use sum::Sum;
 }

src/stream/pending.rs

@@ -2,7 +2,11 @@ use core::marker::PhantomData;
 use core::pin::Pin;
 use core::task::{Context, Poll};
 
-use crate::stream::{DoubleEndedStream, ExactSizeStream, FusedStream, Stream};
+cfg_unstable! {
+    use crate::stream::{DoubleEndedStream, ExactSizeStream, FusedStream};
+}
+
+use crate::stream::Stream;
 
 /// A stream that never returns any items.
 ///
@@ -53,14 +57,20 @@ impl<T> Stream for Pending<T> {
     }
 }
 
+#[cfg(feature = "unstable")]
+#[cfg_attr(feature = "docs", doc(cfg(unstable)))]
 impl<T> DoubleEndedStream for Pending<T> {
     fn poll_next_back(self: Pin<&mut Self>, _: &mut Context<'_>) -> Poll<Option<T>> {
         Poll::Pending
     }
 }
 
+#[cfg(feature = "unstable")]
+#[cfg_attr(feature = "docs", doc(cfg(unstable)))]
 impl<T> FusedStream for Pending<T> {}
 
+#[cfg(feature = "unstable")]
+#[cfg_attr(feature = "docs", doc(cfg(unstable)))]
 impl<T> ExactSizeStream for Pending<T> {
     fn len(&self) -> usize {
         0

src/stream/stream/merge.rs

@@ -16,8 +16,6 @@ pin_project! {
     ///
     /// [`merge`]: trait.Stream.html#method.merge
     /// [`Stream`]: trait.Stream.html
-    #[cfg(feature = "unstable")]
-    #[cfg_attr(feature = "docs", doc(cfg(unstable)))]
     #[derive(Debug)]
     pub struct Merge<L, R> {
         #[pin]

src/string/mod.rs

@@ -5,5 +5,6 @@
 mod extend;
 mod from_stream;
 
+#[allow(unused)]
 #[doc(inline)]
 pub use std::string::String;

src/sync/waker_set.rs

@@ -149,7 +149,7 @@ impl WakerSet {
     /// Returns `true` if at least one operation was notified.
     #[cold]
     fn notify(&self, n: Notify) -> bool {
-        let mut inner = &mut *self.lock();
+        let inner = &mut *self.lock();
         let mut notified = false;
 
         for (_, opt_waker) in inner.entries.iter_mut() {

src/vec/mod.rs

@@ -6,5 +6,6 @@
 mod extend;
 mod from_stream;
 
+#[allow(unused)]
 #[doc(inline)]
 pub use std::vec::Vec;