macros: fix the hygiene issue of join! and try_join! (#7766)

Signed-off-by: ADD-SP <[email protected]>
2026-08-29 00:00:11 +02:00 · 2025-12-08 18:39:29 +08:00
parent b5054e1dff
commit 97d06ae1a6
7 changed files with 227 additions and 23 deletions
@@ -0,0 +1,42 @@
+use tests_build::tokio;
+
+#[tokio::main]
+async fn main() {
+    // do not leak `RotatorSelect`
+    let _ = tokio::join!(async {
+        fn foo(_: impl RotatorSelect) {}
+    });
+
+    // do not leak `std::task::Poll::Pending`
+    let _ = tokio::join!(async { Pending });
+
+    // do not leak `std::task::Poll::Ready`
+    let _ = tokio::join!(async { Ready(0) });
+
+    // do not leak `std::future::Future`
+    let _ = tokio::join!(async {
+        struct MyFuture;
+
+        impl Future for MyFuture {
+            type Output = ();
+
+            fn poll(
+                self: std::pin::Pin<&mut Self>,
+                _cx: &mut std::task::Context<'_>,
+            ) -> std::task::Poll<Self::Output> {
+                todo!()
+            }
+        }
+    });
+
+    // do not leak `std::pin::Pin`
+    let _ = tokio::join!(async {
+        let mut x = 5;
+        let _ = Pin::new(&mut x);
+    });
+
+    // do not leak `std::future::poll_fn`
+    let _ = tokio::join!(async {
+        let _ = poll_fn(|_cx| todo!());
+    });
+}
@@ -0,0 +1,60 @@
+error[E0405]: cannot find trait `RotatorSelect` in this scope
+ --> tests/fail/macros_join.rs:7:24
+  |
+7 |         fn foo(_: impl RotatorSelect) {}
+  |                        ^^^^^^^^^^^^^ not found in this scope
+
+error[E0425]: cannot find value `Pending` in this scope
+  --> tests/fail/macros_join.rs:11:34
+   |
+11 |     let _ = tokio::join!(async { Pending });
+   |                                  ^^^^^^^ not found in this scope
+   |
+help: consider importing this unit variant
+   |
+ 1 + use std::task::Poll::Pending;
+   |
+
+error[E0425]: cannot find function, tuple struct or tuple variant `Ready` in this scope
+  --> tests/fail/macros_join.rs:14:34
+   |
+14 |     let _ = tokio::join!(async { Ready(0) });
+   |                                  ^^^^^ not found in this scope
+   |
+help: consider importing this tuple variant
+   |
+ 1 + use std::task::Poll::Ready;
+   |
+
+error[E0405]: cannot find trait `Future` in this scope
+  --> tests/fail/macros_join.rs:20:14
+   |
+20 |         impl Future for MyFuture {
+   |              ^^^^^^ not found in this scope
+   |
+help: consider importing this trait
+   |
+ 1 + use std::future::Future;
+   |
+
+error[E0433]: failed to resolve: use of undeclared type `Pin`
+  --> tests/fail/macros_join.rs:35:17
+   |
+35 |         let _ = Pin::new(&mut x);
+   |                 ^^^ use of undeclared type `Pin`
+   |
+help: consider importing this struct
+   |
+ 1 + use std::pin::Pin;
+   |
+
+error[E0425]: cannot find function `poll_fn` in this scope
+  --> tests/fail/macros_join.rs:40:17
+   |
+40 |         let _ = poll_fn(|_cx| todo!());
+   |                 ^^^^^^^ not found in this scope
+   |
+help: consider importing this function
+   |
+ 1 + use std::future::poll_fn;
+   |
@@ -0,0 +1,42 @@
+use tests_build::tokio;
+
+#[tokio::main]
+async fn main() {
+    // do not leak `RotatorSelect`
+    let _ = tokio::try_join!(async {
+        fn foo(_: impl RotatorSelect) {}
+    });
+
+    // do not leak `std::task::Poll::Pending`
+    let _ = tokio::try_join!(async { Pending });
+
+    // do not leak `std::task::Poll::Ready`
+    let _ = tokio::try_join!(async { Ready(0) });
+
+    // do not leak `std::future::Future`
+    let _ = tokio::try_join!(async {
+        struct MyFuture;
+
+        impl Future for MyFuture {
+            type Output = ();
+
+            fn poll(
+                self: std::pin::Pin<&mut Self>,
+                _cx: &mut std::task::Context<'_>,
+            ) -> std::task::Poll<Self::Output> {
+                todo!()
+            }
+        }
+    });
+
+    // do not leak `std::pin::Pin`
+    let _ = tokio::try_join!(async {
+        let mut x = 5;
+        let _ = Pin::new(&mut x);
+    });
+
+    // do not leak `std::future::poll_fn`
+    let _ = tokio::try_join!(async {
+        let _ = poll_fn(|_cx| todo!());
+    });
+}
@@ -0,0 +1,60 @@
+error[E0405]: cannot find trait `RotatorSelect` in this scope
+ --> tests/fail/macros_try_join.rs:7:24
+  |
+7 |         fn foo(_: impl RotatorSelect) {}
+  |                        ^^^^^^^^^^^^^ not found in this scope
+
+error[E0425]: cannot find value `Pending` in this scope
+  --> tests/fail/macros_try_join.rs:11:38
+   |
+11 |     let _ = tokio::try_join!(async { Pending });
+   |                                      ^^^^^^^ not found in this scope
+   |
+help: consider importing this unit variant
+   |
+ 1 + use std::task::Poll::Pending;
+   |
+
+error[E0425]: cannot find function, tuple struct or tuple variant `Ready` in this scope
+  --> tests/fail/macros_try_join.rs:14:38
+   |
+14 |     let _ = tokio::try_join!(async { Ready(0) });
+   |                                      ^^^^^ not found in this scope
+   |
+help: consider importing this tuple variant
+   |
+ 1 + use std::task::Poll::Ready;
+   |
+
+error[E0405]: cannot find trait `Future` in this scope
+  --> tests/fail/macros_try_join.rs:20:14
+   |
+20 |         impl Future for MyFuture {
+   |              ^^^^^^ not found in this scope
+   |
+help: consider importing this trait
+   |
+ 1 + use std::future::Future;
+   |
+
+error[E0433]: failed to resolve: use of undeclared type `Pin`
+  --> tests/fail/macros_try_join.rs:35:17
+   |
+35 |         let _ = Pin::new(&mut x);
+   |                 ^^^ use of undeclared type `Pin`
+   |
+help: consider importing this struct
+   |
+ 1 + use std::pin::Pin;
+   |
+
+error[E0425]: cannot find function `poll_fn` in this scope
+  --> tests/fail/macros_try_join.rs:40:17
+   |
+40 |         let _ = poll_fn(|_cx| todo!());
+   |                 ^^^^^^^ not found in this scope
+   |
+help: consider importing this function
+   |
+ 1 + use std::future::poll_fn;
+   |