From 950a03e09fb9cb9845fa8bbb1a2248351819ba63 Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Tue, 26 Aug 2025 08:16:06 -0400
Subject: [PATCH] crates/sysusers: Fix various clippy lints

Signed-off-by: Colin Walters <walters@verbum.org>
---
 crates/sysusers/src/lib.rs                | 22 +++++++++-------------
 crates/sysusers/src/nameservice/group.rs  |  2 +-
 crates/sysusers/src/nameservice/passwd.rs |  2 +-
 crates/sysusers/src/nameservice/shadow.rs |  2 +-
 4 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/crates/sysusers/src/lib.rs b/crates/sysusers/src/lib.rs
index 2f9f847f..77fb4756 100644
--- a/crates/sysusers/src/lib.rs
+++ b/crates/sysusers/src/lib.rs
@@ -61,7 +61,7 @@ impl FromStr for GroupReference {
     fn from_str(s: &str) -> std::result::Result<Self, Self::Err> {
         let r = if s.starts_with('/') {
             Self::Path(s.to_owned())
-        } else if s.chars().all(|c| matches!(c, '0'..='9')) {
+        } else if s.chars().all(|c| c.is_ascii_digit()) {
             Self::Numeric(u32::from_str(s)?)
         } else {
             Self::Name(s.to_owned())
@@ -129,15 +129,11 @@ impl SysusersEntry {
         let s = s.trim_start();
         let (first, rest) = match s.strip_prefix('"') {
             None => {
-                let idx = s
-                    .find(|c: char| c.is_whitespace())
-                    .unwrap_or(s.as_bytes().len());
+                let idx = s.find(|c: char| c.is_whitespace()).unwrap_or(s.len());
                 s.split_at(idx)
             }
             Some(rest) => {
-                let Some(end) = rest.find(|c: char| c == '"') else {
-                    return None;
-                };
+                let end = rest.find('"')?;
                 (&rest[..end], &rest[end + 1..])
             }
         };
@@ -164,10 +160,10 @@ impl SysusersEntry {
 
     pub(crate) fn parse(s: &str) -> Result<Option<SysusersEntry>> {
         let err = || Error::ParseFailure(s.to_owned());
-        let (ftype, s) = Self::next_token(s).ok_or_else(err.clone())?;
+        let (ftype, s) = Self::next_token(s).ok_or_else(err)?;
         let r = match ftype {
             "u" | "u!" => {
-                let (name, s) = Self::next_token_owned(s).ok_or_else(err.clone())?;
+                let (name, s) = Self::next_token_owned(s).ok_or_else(err)?;
                 let (id, s) = Self::next_optional_token(s).unwrap_or_default();
                 let (uid, pgid) = id
                     .and_then(|v| v.split_once(':'))
@@ -194,15 +190,15 @@ impl SysusersEntry {
                 }
             }
             "g" => {
-                let (name, s) = Self::next_token_owned(s).ok_or_else(err.clone())?;
+                let (name, s) = Self::next_token_owned(s).ok_or_else(err)?;
                 let (id, _) = Self::next_optional_token(s).unwrap_or_default();
                 let id = id.map(|id| id.parse()).transpose().map_err(|_| err())?;
                 SysusersEntry::Group { name, id }
             }
             "r" => {
-                let (_, s) = Self::next_optional_token(s).ok_or_else(err.clone())?;
-                let (range, _) = Self::next_token(s).ok_or_else(err.clone())?;
-                let (start, end) = range.split_once('-').ok_or_else(err.clone())?;
+                let (_, s) = Self::next_optional_token(s).ok_or_else(err)?;
+                let (range, _) = Self::next_token(s).ok_or_else(err)?;
+                let (start, end) = range.split_once('-').ok_or_else(err)?;
                 let start: u32 = start.parse().map_err(|_| err())?;
                 let end: u32 = end.parse().map_err(|_| err())?;
                 SysusersEntry::Range { start, end }
diff --git a/crates/sysusers/src/nameservice/group.rs b/crates/sysusers/src/nameservice/group.rs
index 5c34ba9f..3ea1f262 100644
--- a/crates/sysusers/src/nameservice/group.rs
+++ b/crates/sysusers/src/nameservice/group.rs
@@ -49,7 +49,7 @@ pub(crate) fn parse_group_content(content: impl BufRead) -> Result<Vec<GroupEntr
     let mut groups = vec![];
     for (line_num, line) in content.lines().enumerate() {
         let input =
-            line.with_context(|| format!("failed to read group entry at line {}", line_num))?;
+            line.with_context(|| format!("failed to read group entry at line {line_num}"))?;
 
         // Skip empty and comment lines
         if input.is_empty() || input.starts_with('#') {
diff --git a/crates/sysusers/src/nameservice/passwd.rs b/crates/sysusers/src/nameservice/passwd.rs
index 1d8ca83f..216958ef 100644
--- a/crates/sysusers/src/nameservice/passwd.rs
+++ b/crates/sysusers/src/nameservice/passwd.rs
@@ -54,7 +54,7 @@ pub(crate) fn parse_passwd_content(content: impl BufRead) -> Result<Vec<PasswdEn
     let mut passwds = vec![];
     for (line_num, line) in content.lines().enumerate() {
         let input =
-            line.with_context(|| format!("failed to read passwd entry at line {}", line_num))?;
+            line.with_context(|| format!("failed to read passwd entry at line {line_num}"))?;
 
         // Skip empty and comment lines
         if input.is_empty() || input.starts_with('#') {
diff --git a/crates/sysusers/src/nameservice/shadow.rs b/crates/sysusers/src/nameservice/shadow.rs
index 732e665c..4bd9dbc7 100644
--- a/crates/sysusers/src/nameservice/shadow.rs
+++ b/crates/sysusers/src/nameservice/shadow.rs
@@ -40,7 +40,7 @@ fn u32_or_none(value: &str) -> Result<Option<u32>, std::num::ParseIntError> {
 
 fn number_or_empty(value: Option<u32>) -> String {
     if let Some(number) = value {
-        format!("{}", number)
+        format!("{number}")
     } else {
         "".to_string()
     }