chore: update nix crate (#26422)

Dedupes nix dependency, since `rustyline` depends on a newer version that what we currently use
denoland · Oct 25, 2024 · b21fe64 · b21fe64
1 parent fc09833
commit b21fe64
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 37 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -221,7 +221,7 @@ quote = "1"
 syn = { version = "2", features = ["full", "extra-traits"] }
 
 # unix
-nix = "=0.26.2"
+nix = "=0.27.1"
 
 # windows deps
 junction = "=0.2.0"

diff --git a/ext/fs/Cargo.toml b/ext/fs/Cargo.toml
@@ -31,7 +31,7 @@ serde.workspace = true
 thiserror.workspace = true
 
 [target.'cfg(unix)'.dependencies]
-nix.workspace = true
+nix = { workspace = true, features = ["user"] }
 
 [target.'cfg(windows)'.dependencies]
 winapi = { workspace = true, features = ["winbase"] }

diff --git a/runtime/ops/tty.rs b/runtime/ops/tty.rs
@@ -244,7 +244,8 @@ fn op_set_raw(
     let tty_mode_store = state.borrow::<TtyModeStore>().clone();
     let previous_mode = tty_mode_store.get(rid);
 
-    let raw_fd = handle_or_fd;
+    // SAFETY: Nix crate requires value to implement the AsFd trait
+    let raw_fd = unsafe { std::os::fd::BorrowedFd::borrow_raw(handle_or_fd) };
 
     if is_raw {
       let mut raw = match previous_mode {

diff --git a/tests/util/server/Cargo.toml b/tests/util/server/Cargo.toml
@@ -35,7 +35,7 @@ lazy-regex.workspace = true
 libc.workspace = true
 lsp-types.workspace = true
 monch.workspace = true
-nix.workspace = true
+nix = { workspace = true, features = ["fs", "term", "signal"] }
 once_cell.workspace = true
 os_pipe.workspace = true
 parking_lot.workspace = true

diff --git a/tests/util/server/src/pty.rs b/tests/util/server/src/pty.rs
@@ -297,10 +297,12 @@ fn setup_pty(fd: i32) {
   use nix::sys::termios::tcsetattr;
   use nix::sys::termios::SetArg;
 
-  let mut term = tcgetattr(fd).unwrap();
+  // SAFETY: Nix crate requires value to implement the AsFd trait
+  let as_fd = unsafe { std::os::fd::BorrowedFd::borrow_raw(fd) };
+  let mut term = tcgetattr(as_fd).unwrap();
   // disable cooked mode
   term.local_flags.remove(termios::LocalFlags::ICANON);
-  tcsetattr(fd, SetArg::TCSANOW, &term).unwrap();
+  tcsetattr(as_fd, SetArg::TCSANOW, &term).unwrap();
 
   // turn on non-blocking mode so we get timeouts
   let flags = fcntl(fd, FcntlArg::F_GETFL).unwrap();