Re export macros from submodules

Cargo.toml

@@ -25,7 +25,8 @@ docs = ["broadcaster"]
 unstable = ["broadcaster"]
 
 [dependencies]
-async-macros = "1.0.0"
+# async-macros = "1.0.0"
+async-macros = { path = "../async-macros"}
 async-task = "1.0.0"
 cfg-if = "0.1.9"
 crossbeam-channel = "0.3.9"

src/io/mod.rs

@@ -39,9 +39,10 @@ pub use stdout::{stdout, Stdout};
 pub use timeout::timeout;
 pub use write::Write;
 
-// For use in the print macros.
-#[doc(hidden)]
-pub use stdio::{_eprint, _print};
+#[cfg(any(feature = "unstable", feature = "docs"))]
+#[cfg_attr(feature = "docs", doc(cfg(unstable)))]
+#[doc(inline)]
+pub use async_macros::{eprint, eprintln, print, println, write, writeln};
 
 pub mod prelude;
 
@@ -59,6 +60,5 @@ mod repeat;
 mod sink;
 mod stderr;
 mod stdin;
-mod stdio;
 mod stdout;
 mod timeout;

src/lib.rs

@@ -76,10 +76,11 @@ cfg_if! {
     }
 }
 
-mod macros;
 pub(crate) mod utils;
 
 #[cfg(any(feature = "unstable", feature = "docs"))]
 #[cfg_attr(feature = "docs", doc(cfg(unstable)))]
 #[doc(inline)]
-pub use std::{write, writeln};
+pub use async_macros::{eprint, eprintln, print, println, write, writeln};
+
+pub use async_macros::task_local;

src/prelude.rs

@@ -24,7 +24,7 @@ pub use crate::io::Write as _;
 #[doc(no_inline)]
 pub use crate::stream::Stream;
 #[doc(no_inline)]
-pub use crate::task_local;
+pub use async_macros::task_local;
 
 #[doc(hidden)]
 pub use crate::io::buf_read::BufReadExt as _;

src/task/mod.rs

@@ -30,6 +30,11 @@ pub use std::task::{Context, Poll, Waker};
 #[doc(inline)]
 pub use async_macros::ready;
 
+#[cfg(any(feature = "unstable", feature = "docs"))]
+#[cfg_attr(feature = "docs", doc(cfg(unstable)))]
+#[doc(inline)]
+pub use async_macros::task_local;
+
 pub use block_on::block_on;
 pub use builder::Builder;
 pub use pool::spawn;

src/task/task_local.rs

@@ -10,57 +10,6 @@ use super::worker;
 use crate::future::Future;
 use crate::utils::abort_on_panic;
 
-/// Declares task-local values.
-///
-/// The macro wraps any number of static declarations and makes them task-local. Attributes and
-/// visibility modifiers are allowed.
-///
-/// Each declared value is of the accessor type [`LocalKey`].
-///
-/// [`LocalKey`]: task/struct.LocalKey.html
-///
-/// # Examples
-///
-/// ```
-/// #
-/// use std::cell::Cell;
-///
-/// use async_std::task;
-/// use async_std::prelude::*;
-///
-/// task_local! {
-///     static VAL: Cell<u32> = Cell::new(5);
-/// }
-///
-/// task::block_on(async {
-///     let v = VAL.with(|c| c.get());
-///     assert_eq!(v, 5);
-/// });
-/// ```
-#[macro_export]
-macro_rules! task_local {
-    () => ();
-
-    ($(#[$attr:meta])* $vis:vis static $name:ident: $t:ty = $init:expr) => (
-        $(#[$attr])* $vis static $name: $crate::task::LocalKey<$t> = {
-            #[inline]
-            fn __init() -> $t {
-                $init
-            }
-
-            $crate::task::LocalKey {
-                __init,
-                __key: ::std::sync::atomic::AtomicUsize::new(0),
-            }
-        };
-    );
-
-    ($(#[$attr:meta])* $vis:vis static $name:ident: $t:ty = $init:expr; $($rest:tt)*) => (
-        $crate::task_local!($(#[$attr])* $vis static $name: $t = $init);
-        $crate::task_local!($($rest)*);
-    );
-}
-
 /// The key for accessing a task-local value.
 ///
 /// Every task-local value is lazily initialized on first access and destroyed when the task