Skip to content

Commit

Permalink
Update to rustix 0.38. (#38)
Browse files Browse the repository at this point in the history
  • Loading branch information
sunfishcode authored Jun 29, 2023
1 parent 15fa3d1 commit 2a764d4
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
8 changes: 4 additions & 4 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,22 +12,22 @@ exclude = ["/.github"]

[dependencies]
#async-std = { version = "1.10.0", optional = true }
bitflags = "1.2.1"
bitflags = "2.2.3"
cap-std = { version = "1.0.0", optional = true }
#cap-async-std = { version = "0.26.0", optional = true }
char-device = { version = "0.16.0", optional = true }
os_pipe = { version = "1.0.0", features = ["io_safety"], optional = true }
socketpair = { version = "0.19.0", optional = true }
io-lifetimes = { version = "1.0.0", default-features = false }
io-lifetimes = { version = "2.0.0", default-features = false }
ssh2 = { version = "0.9.1", optional = true }
#socket2 = { version = "0.4.0", optional = true }

[target.'cfg(not(windows))'.dependencies]
rustix = { version = "0.37.0", features = ["fs", "net"] }
rustix = { version = "0.38.0", features = ["fs", "net"] }

[target.'cfg(windows)'.dependencies]
cap-fs-ext = "1.0.0"
winx = "0.35.0"
winx = "0.36.0"
fd-lock = "3.0.8"

[target.'cfg(windows)'.dependencies.windows-sys]
Expand Down
8 changes: 4 additions & 4 deletions src/fs/file_io_ext.rs
Original file line number Diff line number Diff line change
Expand Up @@ -526,8 +526,8 @@ impl<T: AsFilelike + IoExt> FileIoExt for T {
}

fn append(&self, buf: &[u8]) -> io::Result<usize> {
use rustix::fs::{fcntl_getfl, fcntl_setfl, seek, OFlags};
use rustix::io::{write, SeekFrom};
use rustix::fs::{fcntl_getfl, fcntl_setfl, seek, OFlags, SeekFrom};
use rustix::io::write;

// On Linux, use `pwritev2`.
#[cfg(any(target_os = "android", target_os = "linux"))]
Expand Down Expand Up @@ -559,8 +559,8 @@ impl<T: AsFilelike + IoExt> FileIoExt for T {
}

fn append_vectored(&self, bufs: &[IoSlice]) -> io::Result<usize> {
use rustix::fs::{fcntl_getfl, fcntl_setfl, seek, OFlags};
use rustix::io::{writev, SeekFrom};
use rustix::fs::{fcntl_getfl, fcntl_setfl, seek, OFlags, SeekFrom};
use rustix::io::writev;

// On Linux, use `pwritev2`.
#[cfg(any(target_os = "android", target_os = "linux"))]
Expand Down

0 comments on commit 2a764d4

Please sign in to comment.