clippy: Fix lints in other platforms

Xylphy · Xylphy · commit a7a034782a37 · 2026-01-30T21:45:28.000+08:00
diff --git a/.gitignore b/.gitignore
@@ -21,3 +21,5 @@ lib*.a
 
 ### direnv ###
 /.direnv/
+
+*.code-workspace
diff --git a/src/bin/uudoc.rs b/src/bin/uudoc.rs
@@ -45,16 +45,16 @@ fn usage<T: Args>(utils: &UtilityMap<T>) {
 }
 
 /// Generates the coreutils app for the utility map
-fn gen_coreutils_app<T: Args>(util_map: &UtilityMap<T>) -> clap::Command {
-    let mut command = clap::Command::new("coreutils");
+fn gen_coreutils_app<T: Args>(util_map: &UtilityMap<T>) -> Command {
+    let mut command = Command::new("coreutils");
     for (name, (_, sub_app)) in util_map {
         // Recreate a small subcommand with only the relevant info
         // (name & short description)
         let about = sub_app()
             .get_about()
             .expect("Could not get the 'about'")
             .to_string();
-        let sub_app = clap::Command::new(name).about(about);
+        let sub_app = Command::new(name).about(about);
         command = command.subcommand(sub_app);
     }
     command
@@ -172,7 +172,7 @@ fn main() -> io::Result<()> {
     }
     let utils = util_map::<Box<dyn Iterator<Item = OsString>>>();
     match std::fs::create_dir("docs/src/utils/") {
-        Err(e) if e.kind() == std::io::ErrorKind::AlreadyExists => Ok(()),
+        Err(e) if e.kind() == io::ErrorKind::AlreadyExists => Ok(()),
         x => x,
     }?;
 
@@ -202,7 +202,7 @@ fn main() -> io::Result<()> {
         let mut map = HashMap::new();
         for platform in ["unix", "macos", "windows", "unix_android"] {
             let platform_utils: Vec<String> = String::from_utf8(
-                std::process::Command::new("./util/show-utils.sh")
+                process::Command::new("./util/show-utils.sh")
                     .arg(format!("--features=feat_os_{platform}"))
                     .output()?
                     .stdout,
@@ -217,7 +217,7 @@ fn main() -> io::Result<()> {
 
         // Linux is a special case because it can support selinux
         let platform_utils: Vec<String> = String::from_utf8(
-            std::process::Command::new("./util/show-utils.sh")
+            process::Command::new("./util/show-utils.sh")
                 .arg("--features=feat_os_unix feat_selinux")
                 .output()?
                 .stdout,
@@ -547,7 +547,7 @@ fn write_zip_examples(
     };
 
     match format_examples(content, output_markdown) {
-        Err(e) => Err(std::io::Error::other(format!(
+        Err(e) => Err(io::Error::other(format!(
             "Failed to format the tldr examples of {name}: {e}"
         ))),
         Ok(s) => Ok(s),
diff --git a/src/uu/env/src/env.rs b/src/uu/env/src/env.rs
@@ -1023,9 +1023,7 @@ where
 
         // Set environment variable to communicate to Rust child processes
         // that SIGPIPE should be default (not ignored)
-        if matches!(action_kind, SignalActionKind::Default)
-            && sig_value == libc::SIGPIPE as usize
-        {
+        if matches!(action_kind, SignalActionKind::Default) && sig_value == libc::SIGPIPE as usize {
             unsafe {
                 env::set_var("RUST_SIGPIPE", "default");
             }
diff --git a/src/uu/ls/src/colors.rs b/src/uu/ls/src/colors.rs
@@ -495,7 +495,7 @@ impl<'a> StyleManager<'a> {
     }
 
     #[cfg(not(unix))]
-    fn indicator_for_special_file(&self, _file_type: &std::fs::FileType) -> Option<Indicator> {
+    fn indicator_for_special_file(&self, _file_type: &fs::FileType) -> Option<Indicator> {
         None
     }
 
diff --git a/src/uu/ls/src/ls.rs b/src/uu/ls/src/ls.rs
@@ -3574,7 +3574,7 @@ fn get_security_context<'a>(
         // For SMACK, use the path to get the label
         // If must_dereference is true, we follow the symlink
         let target_path = if must_dereference {
-            std::fs::canonicalize(path).unwrap_or_else(|_| path.to_path_buf())
+            fs::canonicalize(path).unwrap_or_else(|_| path.to_path_buf())
         } else {
             path.to_path_buf()
         };
diff --git a/src/uu/mkfifo/src/mkfifo.rs b/src/uu/mkfifo/src/mkfifo.rs
@@ -88,9 +88,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> {
             let set_security_context = matches.get_flag(options::SECURITY_CONTEXT);
             let context = matches.get_one::<String>(options::CONTEXT);
             if set_security_context || context.is_some() {
-                uucore::smack::set_smack_label_and_cleanup(&f, context, |p| {
-                    std::fs::remove_file(p)
-                })?;
+                uucore::smack::set_smack_label_and_cleanup(&f, context, |p| fs::remove_file(p))?;
             }
         }
     }
diff --git a/src/uucore/src/lib/features/checksum/validate.rs b/src/uucore/src/lib/features/checksum/validate.rs
@@ -687,7 +687,7 @@ fn compute_and_check_digest_from_file(
             }));
 
             write_file_report(
-                std::io::stdout(),
+                io::stdout(),
                 filename,
                 FileChecksumResult::CantOpen,
                 prefix,
diff --git a/src/uucore/src/lib/features/proc_info.rs b/src/uucore/src/lib/features/proc_info.rs
@@ -479,7 +479,7 @@ mod tests {
 
     #[test]
     fn test_thread_ids() {
-        let main_tid = unsafe { crate::libc::gettid() };
+        let main_tid = unsafe { libc::gettid() };
         std::thread::spawn(move || {
             let mut pid_entry = ProcessInformation::try_new(
                 PathBuf::from_str(&format!("/proc/{}", current_pid())).unwrap(),
@@ -489,7 +489,7 @@ mod tests {
 
             assert!(thread_ids.contains(&(main_tid as usize)));
 
-            let new_thread_tid = unsafe { crate::libc::gettid() };
+            let new_thread_tid = unsafe { libc::gettid() };
             assert!(thread_ids.contains(&(new_thread_tid as usize)));
         })
         .join()
diff --git a/src/uucore/src/lib/features/sum.rs b/src/uucore/src/lib/features/sum.rs
@@ -474,7 +474,7 @@ impl Write for DigestWriter<'_> {
     }
 
     #[cfg(windows)]
-    fn write(&mut self, buf: &[u8]) -> std::io::Result<usize> {
+    fn write(&mut self, buf: &[u8]) -> io::Result<usize> {
         if self.binary {
             self.digest.hash_update(buf);
             return Ok(buf.len());
diff --git a/src/uucore/src/lib/features/systemd_logind.rs b/src/uucore/src/lib/features/systemd_logind.rs
@@ -17,7 +17,6 @@ use std::mem::MaybeUninit;
 use std::time::{SystemTime, UNIX_EPOCH};
 
 use crate::error::{UResult, USimpleError};
-use crate::utmpx;
 
 /// FFI bindings for libsystemd login and D-Bus functions
 mod ffi {
@@ -304,18 +303,18 @@ impl SystemdLoginRecord {
     }
 
     /// Get login time as time::OffsetDateTime compatible with utmpx
-    pub fn login_time_offset(&self) -> utmpx::time::OffsetDateTime {
+    pub fn login_time_offset(&self) -> time::OffsetDateTime {
         let duration = self
             .login_time
             .duration_since(UNIX_EPOCH)
             .unwrap_or_default();
         let ts_nanos: i128 = (duration.as_nanos()).try_into().unwrap_or(0);
-        let local_offset = utmpx::time::OffsetDateTime::now_local()
-            .map_or_else(|_| utmpx::time::UtcOffset::UTC, |v| v.offset());
-        utmpx::time::OffsetDateTime::from_unix_timestamp_nanos(ts_nanos)
+        let local_offset =
+            time::OffsetDateTime::now_local().map_or_else(|_| time::UtcOffset::UTC, |v| v.offset());
+        time::OffsetDateTime::from_unix_timestamp_nanos(ts_nanos)
             .unwrap_or_else(|_| {
-                utmpx::time::OffsetDateTime::now_local()
-                    .unwrap_or_else(|_| utmpx::time::OffsetDateTime::now_utc())
+                time::OffsetDateTime::now_local()
+                    .unwrap_or_else(|_| time::OffsetDateTime::now_utc())
             })
             .to_offset(local_offset)
     }
@@ -566,7 +565,7 @@ impl SystemdUtmpxCompat {
     }
 
     /// Login time
-    pub fn login_time(&self) -> utmpx::time::OffsetDateTime {
+    pub fn login_time(&self) -> time::OffsetDateTime {
         self.record.login_time_offset()
     }
 
@@ -681,7 +680,7 @@ mod tests {
                 seat_or_tty: "tty1".to_string(),
                 raw_device: "tty1".to_string(),
                 host: "host1".to_string(),
-                login_time: std::time::UNIX_EPOCH,
+                login_time: UNIX_EPOCH,
                 pid: 1234,
                 session_leader_pid: 1234,
                 record_type: SystemdRecordType::UserProcess,
@@ -692,7 +691,7 @@ mod tests {
                 seat_or_tty: "pts/0".to_string(),
                 raw_device: "pts/0".to_string(),
                 host: "host2".to_string(),
-                login_time: std::time::UNIX_EPOCH,
+                login_time: UNIX_EPOCH,
                 pid: 5678,
                 session_leader_pid: 5678,
                 record_type: SystemdRecordType::UserProcess,
@@ -729,7 +728,7 @@ mod tests {
             seat_or_tty: "tty1".to_string(),
             raw_device: "tty1".to_string(),
             host: "host1".to_string(),
-            login_time: std::time::UNIX_EPOCH,
+            login_time: UNIX_EPOCH,
             pid: 1234,
             session_leader_pid: 1234,
             record_type: SystemdRecordType::UserProcess,
@@ -753,7 +752,7 @@ mod tests {
             seat_or_tty: "seat0".to_string(),
             raw_device: "seat0".to_string(),
             host: "localhost".to_string(),
-            login_time: std::time::UNIX_EPOCH + std::time::Duration::from_secs(1000),
+            login_time: UNIX_EPOCH + std::time::Duration::from_secs(1000),
             pid: 9999,
             session_leader_pid: 9999,
             record_type: SystemdRecordType::UserProcess,
diff --git a/src/uucore/src/lib/lib.rs b/src/uucore/src/lib/lib.rs
@@ -473,7 +473,7 @@ pub fn os_str_from_bytes(bytes: &[u8]) -> error::UResult<Cow<'_, OsStr>> {
 
     #[cfg(not(unix))]
     Ok(Cow::Owned(OsString::from(str::from_utf8(bytes).map_err(
-        |_| mods::error::UUsageError::new(1, "Unable to transform bytes into OsStr"),
+        |_| error::UUsageError::new(1, "Unable to transform bytes into OsStr"),
     )?)))
 }
 
@@ -487,7 +487,7 @@ pub fn os_string_from_vec(vec: Vec<u8>) -> error::UResult<OsString> {
 
     #[cfg(not(unix))]
     Ok(OsString::from(String::from_utf8(vec).map_err(|_| {
-        mods::error::UUsageError::new(1, "invalid UTF-8 was detected in one or more arguments")
+        error::UUsageError::new(1, "invalid UTF-8 was detected in one or more arguments")
     })?))
 }
 
@@ -502,7 +502,7 @@ pub fn os_string_to_vec(s: OsString) -> error::UResult<Vec<u8>> {
     let v = s
         .into_string()
         .map_err(|_| {
-            mods::error::UUsageError::new(1, "invalid UTF-8 was detected in one or more arguments")
+            error::UUsageError::new(1, "invalid UTF-8 was detected in one or more arguments")
         })?
         .into();
 
diff --git a/tests/by-util/test_install.rs b/tests/by-util/test_install.rs
@@ -1937,13 +1937,10 @@ fn test_install_compare_group_ownership() {
 
     at.write(source, "test content");
 
-    let user_group = std::process::Command::new("id")
-        .arg("-nrg")
-        .output()
-        .map_or_else(
-            |_| "users".to_string(),
-            |output| String::from_utf8_lossy(&output.stdout).trim().to_string(),
-        ); // fallback group name
+    let user_group = Command::new("id").arg("-nrg").output().map_or_else(
+        |_| "users".to_string(),
+        |output| String::from_utf8_lossy(&output.stdout).trim().to_string(),
+    ); // fallback group name
 
     // Install with explicit group
     scene
@@ -2498,7 +2495,7 @@ fn test_install_non_utf8_paths() {
     let source_filename = std::ffi::OsString::from_vec(vec![0xFF, 0xFE]);
     let dest_dir = "target_dir";
 
-    std::fs::write(at.plus(&source_filename), b"test content").unwrap();
+    fs::write(at.plus(&source_filename), b"test content").unwrap();
     at.mkdir(dest_dir);
 
     ucmd.arg(&source_filename).arg(dest_dir).succeeds();
diff --git a/tests/by-util/test_mv.rs b/tests/by-util/test_mv.rs
@@ -2186,22 +2186,10 @@ mod inter_partition_copying {
             "Single file should still have nlink=1"
         );
 
-        assert_eq!(
-            read_to_string(&moved_g1f1).unwrap(),
-            "content group 1"
-        );
-        assert_eq!(
-            read_to_string(&moved_g1f2).unwrap(),
-            "content group 1"
-        );
-        assert_eq!(
-            read_to_string(&moved_g2f1).unwrap(),
-            "content group 2"
-        );
-        assert_eq!(
-            read_to_string(&moved_g2f2).unwrap(),
-            "content group 2"
-        );
+        assert_eq!(read_to_string(&moved_g1f1).unwrap(), "content group 1");
+        assert_eq!(read_to_string(&moved_g1f2).unwrap(), "content group 1");
+        assert_eq!(read_to_string(&moved_g2f1).unwrap(), "content group 2");
+        assert_eq!(read_to_string(&moved_g2f2).unwrap(), "content group 2");
         assert_eq!(
             read_to_string(&moved_single).unwrap(),
             "single file content"
@@ -2437,23 +2425,11 @@ mod inter_partition_copying {
         );
 
         assert_eq!(read_to_string(&moved_file_a).unwrap(), "content A");
-        assert_eq!(
-            read_to_string(&moved_file_a_link1).unwrap(),
-            "content A"
-        );
-        assert_eq!(
-            read_to_string(&moved_file_a_link2).unwrap(),
-            "content A"
-        );
+        assert_eq!(read_to_string(&moved_file_a_link1).unwrap(), "content A");
+        assert_eq!(read_to_string(&moved_file_a_link2).unwrap(), "content A");
         assert_eq!(read_to_string(&moved_file_b).unwrap(), "content B");
-        assert_eq!(
-            read_to_string(&moved_file_b_hardlink).unwrap(),
-            "content B"
-        );
-        assert_eq!(
-            read_to_string(&moved_nested).unwrap(),
-            "nested content"
-        );
+        assert_eq!(read_to_string(&moved_file_b_hardlink).unwrap(), "content B");
+        assert_eq!(read_to_string(&moved_nested).unwrap(), "nested content");
         assert_eq!(
             read_to_string(&moved_nested_link).unwrap(),
             "nested content"
diff --git a/tests/by-util/test_stty.rs b/tests/by-util/test_stty.rs
@@ -1237,7 +1237,7 @@ fn test_saved_state_invalid_formats() {
     let (path, _controller, _replica) = pty_path();
     let (_at, ts) = at_and_ts!();
 
-    let num_cc = nix::libc::NCCS;
+    let num_cc = libc::NCCS;
 
     // Build test strings with platform-specific counts
     let cc_zeros = vec!["0"; num_cc].join(":");
@@ -1540,7 +1540,7 @@ fn test_saved_state_with_control_chars() {
     let (_at, ts) = at_and_ts!();
 
     // Build a valid saved state with platform-specific number of control characters
-    let num_cc = nix::libc::NCCS;
+    let num_cc = libc::NCCS;
     let cc_values: Vec<String> = (1..=num_cc).map(|_| format!("{:x}", 0)).collect();
     let saved_state = format!("500:5:4bf:8a3b:{}", cc_values.join(":"));
 

Original file line number	Diff line number	Diff line change
`@@ -495,7 +495,7 @@ impl<'a> StyleManager<'a> {`
`495`	`495`	`}`
`496`	`496`
`497`	`497`	`#[cfg(not(unix))]`
`498`		`- fn indicator_for_special_file(&self, _file_type: &std::fs::FileType) -> Option<Indicator> {`
	`498`	`+ fn indicator_for_special_file(&self, _file_type: &fs::FileType) -> Option<Indicator> {`
`499`	`499`	`None`
`500`	`500`	`}`
`501`	`501`
Original file line number	Diff line number	Diff line change
`@@ -88,9 +88,7 @@ pub fn uumain(args: impl uucore::Args) -> UResult<()> {`
`88`	`88`	`let set_security_context = matches.get_flag(options::SECURITY_CONTEXT);`
`89`	`89`	`let context = matches.get_one::<String>(options::CONTEXT);`
`90`	`90`	`if set_security_context \|\| context.is_some() {`
`91`		`- uucore::smack::set_smack_label_and_cleanup(&f, context, \|p\| {`
`92`		`- std::fs::remove_file(p)`
`93`		`- })?;`
	`91`	`+ uucore::smack::set_smack_label_and_cleanup(&f, context, \|p\| fs::remove_file(p))?;`
`94`	`92`	`}`
`95`	`93`	`}`
`96`	`94`	`}`
Original file line number	Diff line number	Diff line change
`@@ -474,7 +474,7 @@ impl Write for DigestWriter<'_> {`
`474`	`474`	`}`
`475`	`475`
`476`	`476`	`#[cfg(windows)]`
`477`		`- fn write(&mut self, buf: &[u8]) -> std::io::Result<usize> {`
	`477`	`+ fn write(&mut self, buf: &[u8]) -> io::Result<usize> {`
`478`	`478`	`if self.binary {`
`479`	`479`	`self.digest.hash_update(buf);`
`480`	`480`	`return Ok(buf.len());`