diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f6b2cacc2..08ae88a0d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -11,7 +11,7 @@ env: RUST_BACKTRACE: 1 # Change to specific Rust release to pin rust_stable: stable - rust_nightly: nightly-2022-11-03 + rust_nightly: nightly-2023-05-18 rust_clippy: 1.65.0 # When updating this, also update: # - README.md diff --git a/tokio/src/macros/loom.rs b/tokio/src/macros/loom.rs index d57d9fb0f..fa2653ce7 100644 --- a/tokio/src/macros/loom.rs +++ b/tokio/src/macros/loom.rs @@ -1,11 +1,7 @@ macro_rules! if_loom { ($($t:tt)*) => {{ #[cfg(loom)] - const LOOM: bool = true; - #[cfg(not(loom))] - const LOOM: bool = false; - - if LOOM { + { $($t)* } }} diff --git a/tokio/src/task/builder.rs b/tokio/src/task/builder.rs index 91c400c50..306cc39d1 100644 --- a/tokio/src/task/builder.rs +++ b/tokio/src/task/builder.rs @@ -80,7 +80,7 @@ impl<'a> Builder<'a> { /// /// This method panics if called outside of a Tokio runtime. /// - /// See [`task::spawn`](crate::task::spawn) for + /// See [`task::spawn`](crate::task::spawn()) for /// more details. #[track_caller] pub fn spawn(self, future: Fut) -> io::Result> diff --git a/tokio/src/time/interval.rs b/tokio/src/time/interval.rs index cc17c5a26..2e153fdbe 100644 --- a/tokio/src/time/interval.rs +++ b/tokio/src/time/interval.rs @@ -387,7 +387,7 @@ impl Default for MissedTickBehavior { /// An `Interval` can be turned into a `Stream` with [`IntervalStream`]. /// /// [`IntervalStream`]: https://docs.rs/tokio-stream/latest/tokio_stream/wrappers/struct.IntervalStream.html -/// [`sleep`]: crate::time::sleep +/// [`sleep`]: crate::time::sleep() #[derive(Debug)] pub struct Interval { /// Future that completes the next time the `Interval` yields a value.