Split re-exports into submodules so they don't get mixed with the public API

Author: Andrew J Westlake

pyo3-asyncio-macros/src/lib.rs

@@ -146,7 +146,7 @@ pub fn async_std_test(_attr: TokenStream, item: TokenStream) -> TokenStream {
                     #body
                 }
 
-                Box::pin(pyo3_asyncio::async_std::spawn_blocking(move || {
+                Box::pin(pyo3_asyncio::async_std::re_exports::spawn_blocking(move || {
                     #name()
                 }))
             }

pyo3-asyncio-macros/src/tokio.rs

@@ -221,10 +221,10 @@ fn parse_knobs(
 
     let mut rt = match config.flavor {
         RuntimeFlavor::CurrentThread => quote! {
-            pyo3_asyncio::tokio::runtime::Builder::new_current_thread()
+            pyo3_asyncio::tokio::re_exports::runtime::Builder::new_current_thread()
         },
         RuntimeFlavor::Threaded => quote! {
-            pyo3_asyncio::tokio::runtime::Builder::new_multi_thread()
+            pyo3_asyncio::tokio::re_exports::runtime::Builder::new_multi_thread()
         },
     };
     if let Some(v) = config.worker_threads {
@@ -234,7 +234,7 @@ fn parse_knobs(
     let rt_init = match config.flavor {
         RuntimeFlavor::CurrentThread => quote! {
             std::thread::spawn(|| pyo3_asyncio::tokio::get_runtime().block_on(
-                pyo3_asyncio::tokio::pending::<()>()
+                pyo3_asyncio::tokio::re_exports::pending::<()>()
             ));
         },
         _ => quote! {},

src/async_std.rs

@@ -5,8 +5,13 @@ use pyo3::prelude::*;
 
 use crate::generic::{self, JoinError, Runtime};
 
-/// re-export spawn_blocking for use in `#[test]` macro without external dependency
-pub use async_std::task::spawn_blocking;
+/// <span class="module-item stab portability" style="display: inline; border-radius: 3px; padding: 2px; font-size: 80%; line-height: 1.2;"><code>attributes</code></span>
+/// re-exports for macros
+#[cfg(feature = "attributes")]
+pub mod re_exports {
+    /// re-export spawn_blocking for use in `#[test]` macro without external dependency
+    pub use async_std::task::spawn_blocking;
+}
 
 /// <span class="module-item stab portability" style="display: inline; border-radius: 3px; padding: 2px; font-size: 80%; line-height: 1.2;"><code>attributes</code></span> Provides the boilerplate for the `async-std` runtime and runs an async fn as main
 #[cfg(feature = "attributes")]

src/tokio.rs

@@ -4,15 +4,21 @@ use ::tokio::{
     runtime::{Builder, Runtime},
     task,
 };
+use futures::future::pending;
 use once_cell::sync::OnceCell;
 use pyo3::prelude::*;
 
 use crate::generic;
 
-/// re-export pending to be used in tokio macros without additional dependency
-pub use futures::future::pending;
-/// re-export tokio::runtime to build runtimes in tokio macros without additional dependency
-pub use tokio::runtime;
+/// <span class="module-item stab portability" style="display: inline; border-radius: 3px; padding: 2px; font-size: 80%; line-height: 1.2;"><code>attributes</code></span>
+/// re-exports for macros
+#[cfg(feature = "attributes")]
+pub mod re_exports {
+    /// re-export pending to be used in tokio macros without additional dependency
+    pub use futures::future::pending;
+    /// re-export tokio::runtime to build runtimes in tokio macros without additional dependency
+    pub use tokio::runtime;
+}
 
 /// <span class="module-item stab portability" style="display: inline; border-radius: 3px; padding: 2px; font-size: 80%; line-height: 1.2;"><code>attributes</code></span>
 #[cfg(feature = "attributes")]