Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

tokio: upgrade to new nightly for CI #4193

Merged
merged 9 commits into from Oct 26, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Expand Up @@ -9,7 +9,7 @@ name: CI
env:
RUSTFLAGS: -Dwarnings
RUST_BACKTRACE: 1
nightly: nightly-2021-07-09
nightly: nightly-2021-10-25
minrust: 1.45.2

jobs:
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/loom.yml
Expand Up @@ -10,7 +10,6 @@ name: Loom
env:
RUSTFLAGS: -Dwarnings
RUST_BACKTRACE: 1
nightly: nightly-2021-07-09

jobs:
loom:
Expand Down
4 changes: 4 additions & 0 deletions tokio/src/lib.rs
Expand Up @@ -16,6 +16,10 @@
attr(deny(warnings, rust_2018_idioms), allow(dead_code, unused_variables))
))]
#![cfg_attr(docsrs, feature(doc_cfg))]
#![cfg_attr(docsrs, feature(doc_cfg_hide))]
#![cfg_attr(docsrs, doc(cfg_hide(docsrs)))]
#![cfg_attr(docsrs, doc(cfg_hide(loom)))]
#![cfg_attr(docsrs, doc(cfg_hide(not(loom))))]
#![cfg_attr(docsrs, allow(unused_attributes))]

//! A runtime for writing reliable network applications without compromising speed.
Expand Down
1 change: 1 addition & 0 deletions tokio/src/macros/cfg.rs
Expand Up @@ -99,6 +99,7 @@ macro_rules! cfg_io_driver_impl {
feature = "process",
all(unix, feature = "signal"),
))]
#[cfg_attr(docsrs, doc(cfg(all())))]
$item
)*
}
Expand Down
10 changes: 10 additions & 0 deletions tokio/src/runtime/handle.rs
Expand Up @@ -18,15 +18,25 @@ pub struct Handle {
pub(super) spawner: Spawner,

/// Handles to the I/O drivers
#[cfg_attr(
not(any(feature = "net", feature = "process", all(unix, feature = "signal"))),
allow(dead_code)
)]
pub(super) io_handle: driver::IoHandle,

/// Handles to the signal drivers
#[cfg_attr(
not(any(feature = "signal", all(unix, feature = "process"))),
allow(dead_code)
)]
pub(super) signal_handle: driver::SignalHandle,

/// Handles to the time drivers
#[cfg_attr(not(feature = "time"), allow(dead_code))]
pub(super) time_handle: driver::TimeHandle,

/// Source of `Instant::now()`
#[cfg_attr(not(all(feature = "time", feature = "test-util")), allow(dead_code))]
pub(super) clock: driver::Clock,

/// Blocking pool spawner
Expand Down