Skip to content

Commit

Permalink
Remove feature which snuck back in
Browse files Browse the repository at this point in the history
  • Loading branch information
ipetkov committed Jul 20, 2022
1 parent 9ae9c4c commit fe5281d
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 3 deletions.
1 change: 0 additions & 1 deletion tokio/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,6 @@ net = [
"winapi/minwindef",
]
process = [
"fs", # TODO: remove this and expose the internals privately
"bytes",
"once_cell",
"libc",
Expand Down
7 changes: 6 additions & 1 deletion tokio/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -417,7 +417,12 @@ cfg_process! {
pub mod process;
}

#[cfg(any(feature = "net", feature = "fs", feature = "io-std"))]
#[cfg(any(
feature = "fs",
feature = "io-std",
feature = "net",
all(windows, feature = "process"),
))]
mod blocking;

cfg_rt! {
Expand Down
6 changes: 5 additions & 1 deletion tokio/src/macros/cfg.rs
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,11 @@ macro_rules! cfg_fs {

macro_rules! cfg_io_blocking {
($($item:item)*) => {
$( #[cfg(any(feature = "io-std", feature = "fs"))] $item )*
$( #[cfg(any(
feature = "io-std",
feature = "fs",
all(windows, feature = "process"),
))] $item )*
}
}

Expand Down

0 comments on commit fe5281d

Please sign in to comment.