Skip to content

Commit ff54b98

Browse files
committed
refactor: replace cfg_if with cfg_select
1 parent ad15f53 commit ff54b98

35 files changed

Lines changed: 180 additions & 128 deletions

File tree

Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ async-io = "2.6.0"
4747
bytes = "1.7.1"
4848
bytemuck = "1.25.0"
4949
cfg_aliases = "0.2.1"
50-
cfg-if = "1.0.0"
5150
compio-send-wrapper = "0.7.1"
5251
criterion = "0.8.0"
5352
crossbeam-queue = "0.3.8"

compio-compat/Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ repository = { workspace = true }
1313
compio-runtime = { workspace = true }
1414
compio-log = { workspace = true }
1515

16-
cfg-if = { workspace = true }
1716
mod_use = { workspace = true }
1817

1918
[target.'cfg(windows)'.dependencies]

compio-compat/src/sys/mod.rs

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,14 @@ use std::{io, ops::Deref, time::Duration};
33
use compio_runtime::Runtime;
44
use mod_use::mod_use;
55

6-
cfg_if::cfg_if! {
7-
if #[cfg(windows)] {
6+
cfg_select! {
7+
windows => {
88
mod_use![windows];
9-
} else if #[cfg(unix)] {
9+
}
10+
unix => {
1011
mod_use![unix];
11-
} else {
12+
}
13+
_ => {
1214
compile_error!("Unsupported platform");
1315
}
1416
}

compio-driver/Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ compio-log = { workspace = true }
2626
compio-send-wrapper = { workspace = true }
2727

2828
# Utils
29-
cfg-if = { workspace = true }
3029
flume = { workspace = true, default-features = false }
3130
futures-util = { workspace = true }
3231
socket2 = { workspace = true, features = ["all"] }

compio-driver/src/control.rs

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,17 @@ use compio_buf::IntoInner;
44

55
use crate::{DriverType, OpCode};
66

7-
cfg_if::cfg_if! {
8-
if #[cfg(fusion)] {
7+
cfg_select! {
8+
fusion => {
99
use crate::{PollOpCode, IourOpCode};
10-
} else if #[cfg(io_uring)] {
10+
}
11+
io_uring => {
1112
use crate::OpCode as IourOpCode;
12-
} else if #[cfg(polling)]{
13+
}
14+
polling => {
1315
use crate::OpCode as PollOpCode;
1416
}
17+
_ => {}
1518
}
1619

1720
#[cfg(not(fusion))]

compio-driver/src/fd.rs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,11 @@ use std::{
1414

1515
use crate::{AsFd, AsRawFd, BorrowedFd, RawFd};
1616

17-
cfg_if::cfg_if! {
18-
if #[cfg(feature = "sync")] {
17+
cfg_select! {
18+
feature = "sync" => {
1919
use synchrony::sync;
20-
} else {
20+
}
21+
_ => {
2122
use synchrony::unsync as sync;
2223
}
2324
}

compio-driver/src/sys/buffer_pool/mod.rs

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,18 @@ use std::{fmt::Debug, io};
22

33
use crate::buffer_pool::*;
44

5-
cfg_if::cfg_if! {
6-
if #[cfg(fusion)] {
5+
cfg_select! {
6+
fusion => {
77
mod fusion;
88
mod iour;
99
mod fallback;
1010
use fusion as imp;
11-
} else if #[cfg(io_uring)] {
11+
}
12+
io_uring => {
1213
mod iour;
1314
use iour as imp;
14-
} else {
15+
}
16+
_ => {
1517
mod fallback;
1618
use fallback as imp;
1719
}

compio-driver/src/sys/driver/iocp/cp/mod.rs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,12 @@ use windows_sys::Win32::{
4141

4242
use crate::{Overlapped, RawFd, syscall};
4343

44-
cfg_if::cfg_if! {
45-
if #[cfg(feature = "iocp-global")] {
44+
cfg_select! {
45+
feature = "iocp-global" => {
4646
mod global;
4747
pub use global::*;
48-
} else {
48+
}
49+
_ => {
4950
mod multi;
5051
pub use multi::*;
5152
}

compio-driver/src/sys/driver/iocp/wait/mod.rs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1-
cfg_if::cfg_if! {
2-
if #[cfg(feature = "iocp-wait-packet")] {
1+
cfg_select! {
2+
feature = "iocp-wait-packet" => {
33
mod packet;
44
use packet as sys;
5-
} else {
5+
}
6+
_ => {
67
mod thread_pool;
78
use thread_pool as sys;
89
}

compio-driver/src/sys/driver/iour/mod.rs

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,20 @@ use crate::sys::{extra::IourExtra, prelude::*};
66

77
mod_use![op, notify];
88

9-
cfg_if! {
10-
if #[cfg(feature = "io-uring-cqe32")] {
9+
cfg_select! {
10+
feature = "io-uring-cqe32" => {
1111
use io_uring::cqueue::Entry32 as CEntry;
12-
} else {
12+
}
13+
_ => {
1314
use io_uring::cqueue::Entry as CEntry;
1415
}
1516
}
1617

17-
cfg_if! {
18-
if #[cfg(feature = "io-uring-sqe128")] {
18+
cfg_select! {
19+
feature = "io-uring-sqe128" => {
1920
use io_uring::squeue::Entry128 as SEntry;
20-
} else {
21+
}
22+
_ => {
2123
use io_uring::squeue::Entry as SEntry;
2224
}
2325
}

0 commit comments

Comments
 (0)