From 0844247b4372c03d76ba9223f69a800d2cc2e169 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20H=C3=B8rl=C3=BCck=20Berg?=
 <36937807+henrikhorluck@users.noreply.github.com>
Date: Sun, 6 Aug 2023 14:56:30 +0200
Subject: [PATCH] Prefer os-unix prelude over importing everything separately

---
 fish-rust/src/builtins/status.rs | 2 +-
 fish-rust/src/builtins/test.rs   | 2 +-
 fish-rust/src/common.rs          | 5 +----
 fish-rust/src/fd_monitor.rs      | 2 +-
 fish-rust/src/fd_readable_set.rs | 2 +-
 fish-rust/src/fds.rs             | 2 +-
 fish-rust/src/flog.rs            | 2 +-
 fish-rust/src/path.rs            | 3 +--
 fish-rust/src/wutil/fileid.rs    | 5 +----
 fish-rust/src/wutil/mod.rs       | 3 +--
 10 files changed, 10 insertions(+), 18 deletions(-)

diff --git a/fish-rust/src/builtins/status.rs b/fish-rust/src/builtins/status.rs
index 5a9084654..073527f51 100644
--- a/fish-rust/src/builtins/status.rs
+++ b/fish-rust/src/builtins/status.rs
@@ -1,4 +1,4 @@
-use std::os::unix::prelude::OsStrExt;
+use std::os::unix::prelude::*;
 
 use super::prelude::*;
 use crate::common::{get_executable_path, str2wcstring};
diff --git a/fish-rust/src/builtins/test.rs b/fish-rust/src/builtins/test.rs
index 52514acce..1c3b6ebb6 100644
--- a/fish-rust/src/builtins/test.rs
+++ b/fish-rust/src/builtins/test.rs
@@ -10,7 +10,7 @@ mod test_expressions {
     };
     use once_cell::sync::Lazy;
     use std::collections::HashMap;
-    use std::os::unix::fs::{FileTypeExt, MetadataExt, PermissionsExt};
+    use std::os::unix::prelude::*;
 
     #[derive(Copy, Clone, PartialEq, Eq)]
     pub(super) enum Token {
diff --git a/fish-rust/src/common.rs b/fish-rust/src/common.rs
index 462cbe239..80baadfbf 100644
--- a/fish-rust/src/common.rs
+++ b/fish-rust/src/common.rs
@@ -26,8 +26,7 @@
 use std::ffi::{CStr, CString, OsString};
 use std::mem;
 use std::ops::{Deref, DerefMut};
-use std::os::fd::{AsRawFd, RawFd};
-use std::os::unix::prelude::OsStringExt;
+use std::os::unix::prelude::*;
 use std::path::PathBuf;
 use std::str::FromStr;
 use std::sync::atomic::{AtomicI32, AtomicU32, Ordering};
@@ -1923,8 +1922,6 @@ macro_rules! assert_is_locked {
 /// bullet-proof and that's OK.
 pub fn is_console_session() -> bool {
     static IS_CONSOLE_SESSION: Lazy<bool> = Lazy::new(|| {
-        use std::os::unix::ffi::OsStrExt;
-
         const PATH_MAX: usize = libc::PATH_MAX as usize;
         let mut tty_name = [0u8; PATH_MAX];
         unsafe {
diff --git a/fish-rust/src/fd_monitor.rs b/fish-rust/src/fd_monitor.rs
index 78d002e41..f5fab6fc3 100644
--- a/fish-rust/src/fd_monitor.rs
+++ b/fish-rust/src/fd_monitor.rs
@@ -1,4 +1,4 @@
-use std::os::fd::{AsRawFd, RawFd};
+use std::os::unix::prelude::*;
 use std::sync::atomic::{AtomicU64, Ordering};
 use std::sync::{Arc, Mutex};
 use std::time::{Duration, Instant};
diff --git a/fish-rust/src/fd_readable_set.rs b/fish-rust/src/fd_readable_set.rs
index eeefaf21b..eba2b0842 100644
--- a/fish-rust/src/fd_readable_set.rs
+++ b/fish-rust/src/fd_readable_set.rs
@@ -1,5 +1,5 @@
 use libc::c_int;
-use std::os::unix::io::RawFd;
+use std::os::unix::prelude::*;
 
 pub use fd_readable_set_t as FdReadableSet;
 
diff --git a/fish-rust/src/fds.rs b/fish-rust/src/fds.rs
index bd1577c71..dd3696b6c 100644
--- a/fish-rust/src/fds.rs
+++ b/fish-rust/src/fds.rs
@@ -7,7 +7,7 @@
 use nix::unistd;
 use std::ffi::CStr;
 use std::io::{self, Read, Write};
-use std::os::unix::io::{AsRawFd, FromRawFd, RawFd};
+use std::os::unix::prelude::*;
 
 pub const PIPE_ERROR: &wstr = L!("An error occurred while setting up pipe");
 
diff --git a/fish-rust/src/flog.rs b/fish-rust/src/flog.rs
index c8bba4505..a722feb3f 100644
--- a/fish-rust/src/flog.rs
+++ b/fish-rust/src/flog.rs
@@ -4,7 +4,7 @@
 use crate::wchar_ffi::WCharToFFI;
 use libc::c_int;
 use std::io::Write;
-use std::os::unix::io::{FromRawFd, IntoRawFd};
+use std::os::unix::prelude::*;
 use std::sync::atomic::{AtomicI32, Ordering};
 
 #[rustfmt::skip::macros(category)]
diff --git a/fish-rust/src/path.rs b/fish-rust/src/path.rs
index 72dfd3830..b5ac9a21f 100644
--- a/fish-rust/src/path.rs
+++ b/fish-rust/src/path.rs
@@ -15,8 +15,7 @@
 use once_cell::sync::Lazy;
 use std::ffi::OsStr;
 use std::io::{ErrorKind, Write};
-use std::os::unix::ffi::OsStrExt;
-use std::os::unix::prelude::MetadataExt;
+use std::os::unix::prelude::*;
 
 /// Returns the user configuration directory for fish. If the directory or one of its parents
 /// doesn't exist, they are first created.
diff --git a/fish-rust/src/wutil/fileid.rs b/fish-rust/src/wutil/fileid.rs
index 9e0ab7258..8b6458361 100644
--- a/fish-rust/src/wutil/fileid.rs
+++ b/fish-rust/src/wutil/fileid.rs
@@ -1,10 +1,7 @@
 use crate::wutil::{wstat, wstr};
 use std::cmp::Ordering;
 use std::fs::{File, Metadata};
-use std::os::fd::RawFd;
-
-use std::os::fd::{FromRawFd, IntoRawFd};
-use std::os::unix::fs::MetadataExt;
+use std::os::unix::prelude::*;
 
 /// Struct for representing a file's inode. We use this to detect and avoid symlink loops, among
 /// other things. While an inode / dev pair is sufficient to distinguish co-existing files, Linux  
diff --git a/fish-rust/src/wutil/mod.rs b/fish-rust/src/wutil/mod.rs
index 3bd5253eb..ad61f2c26 100644
--- a/fish-rust/src/wutil/mod.rs
+++ b/fish-rust/src/wutil/mod.rs
@@ -23,8 +23,7 @@
 use std::ffi::OsStr;
 use std::fs::{self, canonicalize};
 use std::io::{self, Write};
-use std::os::fd::{FromRawFd, IntoRawFd, RawFd};
-use std::os::unix::prelude::{OsStrExt, OsStringExt};
+use std::os::unix::prelude::*;
 
 pub use wcstoi::*;
 use widestring_suffix::widestrs;