From 685ac62cd766945794f5dff2b16f87ded23a4681 Mon Sep 17 00:00:00 2001
From: Jacob Kiesel <kieseljake@live.com>
Date: Thu, 15 Sep 2022 17:05:31 -0600
Subject: [PATCH] fix randomization problems by rearranging modules

---
 futures-macro/src/select.rs                  |  2 +-
 futures-macro/src/stream_select.rs           |  2 +-
 futures-util/src/async_await/mod.rs          |  6 ------
 futures-util/src/future/select.rs            | 14 ++++++++------
 futures-util/src/future/select_ok.rs         |  4 +++-
 futures-util/src/future/try_select.rs        | 10 ++++++----
 futures-util/src/lib.rs                      |  6 ++++++
 futures-util/src/{async_await => }/random.rs |  0
 8 files changed, 25 insertions(+), 19 deletions(-)
 rename futures-util/src/{async_await => }/random.rs (100%)

diff --git a/futures-macro/src/select.rs b/futures-macro/src/select.rs
index b317a4d360..bce2fa82bb 100644
--- a/futures-macro/src/select.rs
+++ b/futures-macro/src/select.rs
@@ -279,7 +279,7 @@ fn select_inner(input: TokenStream, random: bool) -> TokenStream {
 
     let shuffle = if random {
         quote! {
-            __futures_crate::async_await::shuffle(&mut __select_arr);
+            __futures_crate::shuffle(&mut __select_arr);
         }
     } else {
         quote!()
diff --git a/futures-macro/src/stream_select.rs b/futures-macro/src/stream_select.rs
index 9927b53073..7571a565b2 100644
--- a/futures-macro/src/stream_select.rs
+++ b/futures-macro/src/stream_select.rs
@@ -56,7 +56,7 @@ pub(crate) fn stream_select(input: TokenStream) -> Result<TokenStream, syn::Erro
                     let mut any_pending = false;
                     {
                         let mut stream_array = [#(#field_idents.as_mut().map(|f| StreamEnum::#generic_idents(f)).unwrap_or(StreamEnum::None)),*];
-                        __futures_crate::async_await::shuffle(&mut stream_array);
+                        __futures_crate::shuffle(&mut stream_array);
 
                         for mut s in stream_array {
                             if let StreamEnum::None = s {
diff --git a/futures-util/src/async_await/mod.rs b/futures-util/src/async_await/mod.rs
index 94a93e6f4c..eebad8ccd4 100644
--- a/futures-util/src/async_await/mod.rs
+++ b/futures-util/src/async_await/mod.rs
@@ -37,12 +37,6 @@ mod stream_select_mod;
 #[cfg(feature = "async-await-macro")]
 pub use self::stream_select_mod::*;
 
-#[cfg(feature = "std")]
-mod random;
-#[allow(unreachable_pub)] // https://github.com/rust-lang/rust/issues/64762
-#[cfg(feature = "std")]
-pub use self::random::*;
-
 #[doc(hidden)]
 #[inline(always)]
 pub fn assert_unpin<T: Unpin>(_: &T) {}
diff --git a/futures-util/src/future/select.rs b/futures-util/src/future/select.rs
index 3a5a05be4a..686c5c313b 100644
--- a/futures-util/src/future/select.rs
+++ b/futures-util/src/future/select.rs
@@ -113,12 +113,14 @@ where
         }
 
         #[cfg(feature = "std")]
-        if crate::gen_index(2) == 0 {
-            poll_wrap!(a, b, Either::Left);
-            poll_wrap!(b, a, Either::Right);
-        } else {
-            poll_wrap!(b, a, Either::Right);
-            poll_wrap!(a, b, Either::Left);
+        {
+            if crate::gen_index(2) == 0 {
+                poll_wrap!(a, b, Either::Left);
+                poll_wrap!(b, a, Either::Right);
+            } else {
+                poll_wrap!(b, a, Either::Right);
+                poll_wrap!(a, b, Either::Left);
+            }
         }
 
         #[cfg(not(feature = "std"))]
diff --git a/futures-util/src/future/select_ok.rs b/futures-util/src/future/select_ok.rs
index 00349614f2..3d6fa67cc1 100644
--- a/futures-util/src/future/select_ok.rs
+++ b/futures-util/src/future/select_ok.rs
@@ -59,7 +59,9 @@ impl<Fut: TryFuture + Unpin> Future for SelectOk<Fut> {
     fn poll(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
         let Self { inner } = &mut *self;
         #[cfg(feature = "std")]
-        crate::shuffle(inner);
+        {
+            crate::shuffle(inner);
+        }
         // loop until we've either exhausted all errors, a success was hit, or nothing is ready
         loop {
             let item = inner.iter_mut().enumerate().find_map(|(i, f)| match f.try_poll_unpin(cx) {
diff --git a/futures-util/src/future/try_select.rs b/futures-util/src/future/try_select.rs
index f2811bf364..a24525bbdc 100644
--- a/futures-util/src/future/try_select.rs
+++ b/futures-util/src/future/try_select.rs
@@ -90,10 +90,12 @@ where
         }
 
         #[cfg(feature = "std")]
-        if crate::gen_index(2) == 0 {
-            poll_wrap!(a, b, Either::Left, Either::Right)
-        } else {
-            poll_wrap!(b, a, Either::Right, Either::Left)
+        {
+            if crate::gen_index(2) == 0 {
+                poll_wrap!(a, b, Either::Left, Either::Right)
+            } else {
+                poll_wrap!(b, a, Either::Right, Either::Left)
+            }
         }
 
         #[cfg(not(feature = "std"))]
diff --git a/futures-util/src/lib.rs b/futures-util/src/lib.rs
index e00faf4775..210e38fb12 100644
--- a/futures-util/src/lib.rs
+++ b/futures-util/src/lib.rs
@@ -37,6 +37,12 @@ mod async_await;
 #[doc(hidden)]
 pub use self::async_await::*;
 
+#[cfg(feature = "std")]
+mod random;
+#[allow(unreachable_pub)] // https://github.com/rust-lang/rust/issues/64762
+#[cfg(feature = "std")]
+pub use self::random::*;
+
 // Not public API.
 #[cfg(feature = "async-await")]
 #[doc(hidden)]
diff --git a/futures-util/src/async_await/random.rs b/futures-util/src/random.rs
similarity index 100%
rename from futures-util/src/async_await/random.rs
rename to futures-util/src/random.rs