diff --git a/tokio-util/src/time/mod.rs b/tokio-util/src/time/mod.rs index c6c8799d9..2d3400836 100644 --- a/tokio-util/src/time/mod.rs +++ b/tokio-util/src/time/mod.rs @@ -12,9 +12,9 @@ use std::time::Duration; mod wheel; -#[doc(inline)] pub mod delay_queue; +#[doc(inline)] pub use delay_queue::DelayQueue; // ===== Internal utils ===== diff --git a/tokio/src/lib.rs b/tokio/src/lib.rs index 15aeced6d..d2d4563d2 100644 --- a/tokio/src/lib.rs +++ b/tokio/src/lib.rs @@ -453,15 +453,20 @@ cfg_macros! { #[cfg(feature = "rt-multi-thread")] #[cfg(not(test))] // Work around for rust-lang/rust#62127 #[cfg_attr(docsrs, doc(cfg(feature = "macros")))] + #[doc(inline)] pub use tokio_macros::main; #[cfg(feature = "rt-multi-thread")] #[cfg_attr(docsrs, doc(cfg(feature = "macros")))] + #[doc(inline)] pub use tokio_macros::test; cfg_not_rt_multi_thread! { #[cfg(not(test))] // Work around for rust-lang/rust#62127 + #[doc(inline)] pub use tokio_macros::main_rt as main; + + #[doc(inline)] pub use tokio_macros::test_rt as test; } } @@ -469,7 +474,10 @@ cfg_macros! { // Always fail if rt is not enabled. cfg_not_rt! { #[cfg(not(test))] + #[doc(inline)] pub use tokio_macros::main_fail as main; + + #[doc(inline)] pub use tokio_macros::test_fail as test; } } diff --git a/tokio/src/macros/cfg.rs b/tokio/src/macros/cfg.rs index 344261293..02517ccef 100644 --- a/tokio/src/macros/cfg.rs +++ b/tokio/src/macros/cfg.rs @@ -157,7 +157,6 @@ macro_rules! cfg_macros { $( #[cfg(feature = "macros")] #[cfg_attr(docsrs, doc(cfg(feature = "macros")))] - #[doc(inline)] $item )* }