Skip to content

clippy: fix struct_field_names lint #10902

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
xtqqczze wants to merge 1 commit into
base: main
Choose a base branch
from
+22 −24
Open

clippy: fix struct_field_names lint #10902

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/uucore/src/lib/features/entries.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)]
Copy link
Contributor

@sylvestre sylvestre Feb 13, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why not renaming this one too ?

Copy link
Contributor Author

@xtqqczze xtqqczze Feb 13, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I didn't see an obvious fix without refactoring the whole structure.

cc: @nyurik

Copy link
Contributor

@nyurik nyurik Feb 13, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i was thinking about this one - I suspect that maybe the whole struct name should be changed to something more descriptive like UserAccount ? I don't know enough context for this so left it as an exception.

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"))]
Expand Down
44 changes: 20 additions & 24 deletions src/uucore/src/lib/features/uptime.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(", ")
}
Expand Down Expand Up @@ -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()),
Expand Down
Loading