deps: dedup some nix versions

Author: wez

Cargo.lock

@@ -46,7 +46,7 @@ wezterm-ssh = { path = "../wezterm-ssh" }
 wezterm-term = { path = "../term", features=["use_serde"] }
 
 [target."cfg(unix)".dependencies]
-nix = "0.26"
+nix = {version="0.28", features=["resource"]}
 
 [target."cfg(windows)".dependencies]
 winapi = { version = "0.3", features = ["winuser"]}

config/Cargo.toml

@@ -28,7 +28,7 @@ luahelper = { path = "../luahelper" }
 metrics = "0.22"
 mlua = "0.9"
 names = { version = "0.12", default-features = false }
-nix = {version="0.25", features=["term"]}
+nix = {version="0.28", features=["term"]}
 parking_lot = "0.12"
 percent-encoding = "2"
 portable-pty = { path = "../pty", features = ["serde_support"]}

mux/Cargo.toml

@@ -14,7 +14,7 @@ downcast-rs = "1.0"
 filedescriptor = { version="0.8", path = "../filedescriptor" }
 log = "0.4"
 libc = "0.2"
-nix = {version="0.25", features=["term"]}
+nix = {version="0.28", features=["term", "fs"]}
 shell-words = "1.1"
 serde_derive = {version="1.0", optional=true}
 serde = {version="1.0", optional=true}

pty/Cargo.toml

@@ -7,6 +7,7 @@ use libc::{self, winsize};
 use std::cell::RefCell;
 use std::ffi::OsStr;
 use std::io::{Read, Write};
+use std::os::fd::AsFd;
 use std::os::unix::ffi::OsStrExt;
 use std::os::unix::io::{AsRawFd, FromRawFd};
 use std::os::unix::process::CommandExt;
@@ -378,7 +379,7 @@ impl MasterPty for UnixMasterPty {
     }
 
     fn get_termios(&self) -> Option<nix::sys::termios::Termios> {
-        nix::sys::termios::tcgetattr(self.fd.0.as_raw_fd()).ok()
+        nix::sys::termios::tcgetattr(self.fd.0.as_fd()).ok()
     }
 }
 

pty/src/unix.rs

@@ -67,7 +67,7 @@ version = "0.3"
 [target."cfg(unix)".dependencies]
 signal-hook = "0.3"
 termios = "0.3"
-nix = "0.26"
+nix = {version="0.28", features=["mman"]}
 
 [target."cfg(windows)".dependencies.winapi]
 features = [

termwiz/Cargo.toml

@@ -273,9 +273,8 @@ fn read_shared_memory_data(
 ) -> std::result::Result<std::vec::Vec<u8>, std::io::Error> {
     use nix::sys::mman::{shm_open, shm_unlink};
     use std::fs::File;
-    use std::os::unix::io::FromRawFd;
 
-    let raw_fd = shm_open(
+    let fd = shm_open(
         name,
         nix::fcntl::OFlag::O_RDONLY,
         nix::sys::stat::Mode::empty(),
@@ -287,7 +286,7 @@ fn read_shared_memory_data(
             format!("shm_open {} failed: {:#}", name, err),
         )
     })?;
-    let mut f = unsafe { File::from_raw_fd(raw_fd) };
+    let mut f = File::from(fd);
     if let Some(offset) = data_offset {
         f.seek(std::io::SeekFrom::Start(offset.into()))?;
     }