summaryrefslogtreecommitdiffstats
path: root/tokio/src/runtime
diff options
context:
space:
mode:
authorIvan Petkov <ivanppetkov@gmail.com>2020-09-24 10:51:46 -0700
committerGitHub <noreply@github.com>2020-09-24 10:51:46 -0700
commita1d0681cd2e581b1f6767126858d2f3d5d8992f5 (patch)
tree6f7b9aa5e4bd32854683a42753a145132e2ac7cc /tokio/src/runtime
parent4dfbdbff7e260eb7f046a8dc91ec0c84ae7ab2e8 (diff)
process: do not publicly turn on `signal` when enabled (#2871)
This change will still internally compile any `signal` resources required when `process` is enabled on unix systems, but it will not publicly turn on the cargo feature
Diffstat (limited to 'tokio/src/runtime')
-rw-r--r--tokio/src/runtime/context.rs2
-rw-r--r--tokio/src/runtime/driver.rs22
2 files changed, 6 insertions, 18 deletions
diff --git a/tokio/src/runtime/context.rs b/tokio/src/runtime/context.rs
index 7498175f..a4f88e90 100644
--- a/tokio/src/runtime/context.rs
+++ b/tokio/src/runtime/context.rs
@@ -22,7 +22,7 @@ cfg_io_driver! {
}
}
-cfg_signal! {
+cfg_signal_internal! {
#[cfg(unix)]
pub(crate) fn signal_handle() -> crate::runtime::driver::SignalHandle {
CONTEXT.with(|ctx| match *ctx.borrow() {
diff --git a/tokio/src/runtime/driver.rs b/tokio/src/runtime/driver.rs
index 2ea50890..148e0b16 100644
--- a/tokio/src/runtime/driver.rs
+++ b/tokio/src/runtime/driver.rs
@@ -38,26 +38,14 @@ cfg_not_io_driver! {
}
// ===== signal driver =====
-
-macro_rules! cfg_unix_and_signal {
- ($($item:item)*) => {
- $(
- #[cfg(all(not(loom), unix, feature = "signal"))]
- $item
- )*
- }
-}
-
-macro_rules! cfg_neither_unix_nor_windows {
+macro_rules! cfg_signal_internal_and_unix {
($($item:item)*) => {
- $(
- #[cfg(any(loom, not(all(unix, feature = "signal"))))]
- $item
- )*
+ #[cfg(unix)]
+ cfg_signal_internal! { $($item)* }
}
}
-cfg_unix_and_signal! {
+cfg_signal_internal_and_unix! {
type SignalDriver = crate::park::Either<crate::signal::unix::driver::Driver, IoDriver>;
pub(crate) type SignalHandle = Option<crate::signal::unix::driver::Handle>;
@@ -76,7 +64,7 @@ cfg_unix_and_signal! {
}
}
-cfg_neither_unix_nor_windows! {
+cfg_not_signal_internal! {
type SignalDriver = IoDriver;
pub(crate) type SignalHandle = ();