From deffc783dff095035c87b72bc66f5afa46566814 Mon Sep 17 00:00:00 2001
From: xtqqczze <45661989+xtqqczze@users.noreply.github.com>
Date: Thu, 12 Feb 2026 21:47:03 +0000
Subject: [PATCH] clippy: fix struct_field_names lint

https://rust-lang.github.io/rust-clippy/master/index.html#struct_field_names
---
 src/uucore/src/lib/features/entries.rs |  2 ++
 src/uucore/src/lib/features/uptime.rs  | 44 ++++++++++++--------------
 2 files changed, 22 insertions(+), 24 deletions(-)

diff --git a/src/uucore/src/lib/features/entries.rs b/src/uucore/src/lib/features/entries.rs
index b6c969a04bc..4bcc8ebf5c2 100644
--- a/src/uucore/src/lib/features/entries.rs
+++ b/src/uucore/src/lib/features/entries.rs
@@ -147,12 +147,14 @@ pub struct Passwd {
     /// AKA passwd.pw_dir
     pub user_dir: Option<String>,
     /// AKA passwd.pw_passwd
+    #[expect(clippy::struct_field_names)]
     pub user_passwd: Option<String>,
     /// AKA passwd.pw_class
     #[cfg(any(target_os = "freebsd", target_vendor = "apple"))]
     pub user_access_class: Option<String>,
     /// AKA passwd.pw_change
     #[cfg(any(target_os = "freebsd", target_vendor = "apple"))]
+    #[expect(clippy::struct_field_names)]
     pub passwd_change_time: time_t,
     /// AKA passwd.pw_expire
     #[cfg(any(target_os = "freebsd", target_vendor = "apple"))]
diff --git a/src/uucore/src/lib/features/uptime.rs b/src/uucore/src/lib/features/uptime.rs
index 2aba7cd27d4..1330c3d33c9 100644
--- a/src/uucore/src/lib/features/uptime.rs
+++ b/src/uucore/src/lib/features/uptime.rs
@@ -207,41 +207,37 @@ pub enum OutputFormat {
 }
 
 struct FormattedUptime {
-    up_days: i64,
-    up_hours: i64,
-    up_mins: i64,
+    days: i64,
+    hours: i64,
+    mins: i64,
 }
 
 impl FormattedUptime {
-    fn new(up_secs: i64) -> Self {
-        let up_days = up_secs / 86400;
-        let up_hours = (up_secs - (up_days * 86400)) / 3600;
-        let up_mins = (up_secs - (up_days * 86400) - (up_hours * 3600)) / 60;
-
-        Self {
-            up_days,
-            up_hours,
-            up_mins,
-        }
+    fn new(seconds: i64) -> Self {
+        let days = seconds / 86400;
+        let hours = (seconds - (days * 86400)) / 3600;
+        let mins = (seconds - (days * 86400) - (hours * 3600)) / 60;
+
+        Self { days, hours, mins }
     }
 
     fn get_human_readable_uptime(&self) -> String {
         translate!(
         "uptime-format",
-        "days" => self.up_days,
-        "time" => format!("{:02}:{:02}", self.up_hours, self.up_mins))
+        "days" => self.days,
+        "time" => format!("{:02}:{:02}", self.hours, self.mins))
     }
 
     fn get_pretty_print_uptime(&self) -> String {
         let mut parts = Vec::new();
-        if self.up_days > 0 {
-            parts.push(translate!("uptime-format-pretty-day", "day" => self.up_days));
+        if self.days > 0 {
+            parts.push(translate!("uptime-format-pretty-day", "day" => self.days));
         }
-        if self.up_hours > 0 {
-            parts.push(translate!("uptime-format-pretty-hour", "hour" => self.up_hours));
+        if self.hours > 0 {
+            parts.push(translate!("uptime-format-pretty-hour", "hour" => self.hours));
         }
-        if self.up_mins > 0 || parts.is_empty() {
-            parts.push(translate!("uptime-format-pretty-min", "min" => self.up_mins));
+        if self.mins > 0 || parts.is_empty() {
+            parts.push(translate!("uptime-format-pretty-min", "min" => self.mins));
         }
         parts.join(", ")
     }
@@ -279,13 +275,13 @@ pub fn get_formatted_uptime(
     boot_time: Option<time_t>,
     output_format: OutputFormat,
 ) -> UResult<String> {
-    let up_secs = get_uptime(boot_time)?;
+    let uptime = get_uptime(boot_time)?;
 
-    if up_secs < 0 {
+    if uptime < 0 {
         Err(UptimeError::SystemUptime)?;
     }
 
-    let formatted_uptime = FormattedUptime::new(up_secs);
+    let formatted_uptime = FormattedUptime::new(uptime);
 
     match output_format {
         OutputFormat::HumanReadable => Ok(formatted_uptime.get_human_readable_uptime()),