Skip to content

Commit d25add4

Browse files
authored
refactor: cleanup features (#436)
1 parent aa7b06d commit d25add4

File tree

10 files changed

+4
-44
lines changed

10 files changed

+4
-44
lines changed

compio-dispatcher/Cargo.toml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,3 @@ compio-net = { workspace = true }
2929
compio-macros = { workspace = true }
3030

3131
futures-util = { workspace = true }
32-
33-
[features]
34-
io-uring = ["compio-runtime/io-uring"]
35-
polling = ["compio-runtime/polling"]

compio-fs/Cargo.toml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,9 +62,6 @@ windows-sys = { workspace = true, features = ["Win32_Security_Authorization"] }
6262
nix = { workspace = true, features = ["fs"] }
6363

6464
[features]
65-
io-uring = ["compio-runtime/io-uring"]
66-
polling = ["compio-runtime/polling"]
67-
6865
read_buf = ["compio-buf/read_buf", "compio-io/read_buf"]
6966
windows_by_handle = []
7067
nightly = ["read_buf", "windows_by_handle"]

compio-fs/src/pipe.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -545,9 +545,7 @@ async fn is_fifo(file: &File) -> io::Result<bool> {
545545

546546
/// Sets file's flags with O_NONBLOCK by fcntl.
547547
fn set_nonblocking(file: &impl AsRawFd) -> io::Result<()> {
548-
if cfg!(not(all(target_os = "linux", feature = "io-uring")))
549-
|| compio_driver::DriverType::is_polling()
550-
{
548+
if compio_driver::DriverType::is_polling() {
551549
let fd = file.as_raw_fd();
552550
let current_flags = syscall!(libc::fcntl(fd, libc::F_GETFL))?;
553551
let flags = current_flags | libc::O_NONBLOCK;

compio-net/Cargo.toml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,6 @@ futures-util = { workspace = true }
4444
tempfile = { workspace = true }
4545

4646
[features]
47-
io-uring = ["compio-runtime/io-uring"]
48-
polling = ["compio-runtime/polling"]
49-
5047
# Nightly features
5148
once_cell_try = []
5249
nightly = ["once_cell_try"]

compio-process/Cargo.toml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,5 @@ windows-sys = { workspace = true }
3030
compio-macros = { workspace = true }
3131

3232
[features]
33-
io-uring = ["compio-runtime/io-uring"]
34-
polling = ["compio-runtime/polling"]
35-
3633
linux_pidfd = []
3734
nightly = ["linux_pidfd"]

compio-quic/Cargo.toml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,6 @@ tracing-subscriber = { workspace = true, features = ["env-filter"] }
6464

6565
[features]
6666
default = ["ring"]
67-
io-uring = ["compio-runtime/io-uring"]
68-
polling = ["compio-runtime/polling"]
6967
io-compat = ["futures-util/io"]
7068
platform-verifier = ["dep:rustls-platform-verifier"]
7169
native-certs = ["dep:rustls-native-certs"]

compio-runtime/Cargo.toml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,9 +62,6 @@ block2 = "0.6.0"
6262
event = ["dep:cfg-if", "compio-buf/arrayvec"]
6363
time = ["dep:slab"]
6464

65-
io-uring = ["compio-driver/io-uring"]
66-
polling = ["compio-driver/polling"]
67-
6865
# Enable it to always notify the driver when a task schedules.
6966
notify-always = []
7067

compio-signal/Cargo.toml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,6 @@ os_pipe = { workspace = true }
4343
slab = { workspace = true }
4444

4545
[features]
46-
io-uring = ["compio-runtime/io-uring"]
47-
polling = ["compio-runtime/polling"]
4846
# Nightly features
4947
lazy_cell = []
5048
once_cell_try = []

compio-signal/src/linux.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ impl SignalFd {
5757
fn new(sig: i32) -> io::Result<Self> {
5858
let set = register_signal(sig)?;
5959
let mut flag = libc::SFD_CLOEXEC;
60-
if cfg!(not(feature = "io-uring")) || compio_driver::DriverType::is_polling() {
60+
if compio_driver::DriverType::is_polling() {
6161
flag |= libc::SFD_NONBLOCK;
6262
}
6363
let fd = syscall!(libc::signalfd(-1, &set, flag))?;

compio/Cargo.toml

Lines changed: 2 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -77,26 +77,8 @@ monoio = { version = "0.2.2", default-features = false, features = ["iouring"] }
7777

7878
[features]
7979
default = ["runtime", "io-uring"]
80-
io-uring = [
81-
"compio-driver/io-uring",
82-
"compio-runtime?/io-uring",
83-
"compio-fs?/io-uring",
84-
"compio-net?/io-uring",
85-
"compio-signal?/io-uring",
86-
"compio-quic?/io-uring",
87-
"compio-process?/io-uring",
88-
"compio-dispatcher?/io-uring",
89-
]
90-
polling = [
91-
"compio-driver/polling",
92-
"compio-runtime?/polling",
93-
"compio-fs?/polling",
94-
"compio-net?/polling",
95-
"compio-signal?/polling",
96-
"compio-quic?/polling",
97-
"compio-process?/polling",
98-
"compio-dispatcher?/polling",
99-
]
80+
io-uring = ["compio-driver/io-uring"]
81+
polling = ["compio-driver/polling"]
10082
io = ["dep:compio-io"]
10183
io-compat = ["io", "compio-io/compat", "compio-quic?/io-compat"]
10284
runtime = ["dep:compio-runtime", "dep:compio-fs", "dep:compio-net", "io"]

0 commit comments

Comments
 (0)