Merge 'Relax I/O configuration attribute to cover all Unixes' from Pedro Muniz

hopefully fixes #2268.

Closes #2435
This commit is contained in:
Pekka Enberg
2025-08-05 12:44:34 +03:00
committed by GitHub
3 changed files with 1 additions and 41 deletions

31
Cargo.lock generated
View File

@@ -612,12 +612,6 @@ dependencies = [
"unicode-width 0.2.0",
]
[[package]]
name = "comma"
version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "55b672471b4e9f9e95499ea597ff64941a309b2cdbffcc46f2cc5e2d971fd335"
[[package]]
name = "concurrent-queue"
version = "2.5.0"
@@ -678,7 +672,6 @@ dependencies = [
"log",
"rand 0.9.2",
"rand_chacha 0.9.0",
"rexpect",
"rusqlite",
"tempfile",
"test-log",
@@ -2482,17 +2475,6 @@ dependencies = [
"libc",
]
[[package]]
name = "nix"
version = "0.27.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053"
dependencies = [
"bitflags 2.9.0",
"cfg-if",
"libc",
]
[[package]]
name = "nix"
version = "0.29.0"
@@ -3216,19 +3198,6 @@ version = "1.9.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ba39f3699c378cd8970968dcbff9c43159ea4cfbd88d43c00b22f2ef10a435d2"
[[package]]
name = "rexpect"
version = "0.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c020234fb542618dc3e3d43724e9d93f87e1db74040a76a8c4e830220fb9b20d"
dependencies = [
"comma",
"nix 0.27.1",
"regex",
"tempfile",
"thiserror 1.0.69",
]
[[package]]
name = "rgb"
version = "0.8.50"

View File

@@ -330,14 +330,9 @@ cfg_block! {
mod io_uring;
#[cfg(feature = "fs")]
pub use io_uring::UringIO;
mod unix;
#[cfg(feature = "fs")]
pub use unix::UnixIO;
pub use unix::UnixIO as SyscallIO;
pub use unix::UnixIO as PlatformIO;
}
#[cfg(any(all(target_os = "linux",not(feature = "io_uring")), target_os = "macos"))] {
#[cfg(target_family = "unix")] {
mod unix;
#[cfg(feature = "fs")]
pub use unix::UnixIO;

View File

@@ -32,7 +32,3 @@ zerocopy = "0.8.26"
test-log = { version = "0.2.17", features = ["trace"] }
tracing-subscriber = { version = "0.3.19", features = ["env-filter"] }
tracing = "0.1.41"
# rexpect does not support windows.
[target.'cfg(not(windows))'.dependencies]
rexpect = "0.6.0"