From a4f626efa2814dfe031d54fd02363336022426ea Mon Sep 17 00:00:00 2001
From: Terts Diepraam <terts.diepraam@gmail.com>
Date: Sat, 10 Feb 2024 12:48:35 +0100
Subject: [PATCH] uucore/format: refactor handling of flags to make clippy
 happy

---
 .../src/lib/features/format/num_format.rs     |  2 +-
 src/uucore/src/lib/features/format/spec.rs    | 84 +++++++++++--------
 2 files changed, 52 insertions(+), 34 deletions(-)

diff --git a/src/uucore/src/lib/features/format/num_format.rs b/src/uucore/src/lib/features/format/num_format.rs
index 9dd371817..52551f10b 100644
--- a/src/uucore/src/lib/features/format/num_format.rs
+++ b/src/uucore/src/lib/features/format/num_format.rs
@@ -60,7 +60,7 @@ pub enum PositiveSign {
     Space,
 }
 
-#[derive(Clone, Copy, Debug)]
+#[derive(Clone, Copy, Debug, PartialEq, Eq)]
 pub enum NumberAlignment {
     Left,
     RightSpace,
diff --git a/src/uucore/src/lib/features/format/spec.rs b/src/uucore/src/lib/features/format/spec.rs
index 8eaf66087..6d342f742 100644
--- a/src/uucore/src/lib/features/format/spec.rs
+++ b/src/uucore/src/lib/features/format/spec.rs
@@ -87,6 +87,40 @@ enum Length {
     LongDouble,
 }
 
+#[derive(Default, PartialEq, Eq)]
+struct Flags {
+    minus: bool,
+    plus: bool,
+    space: bool,
+    hash: bool,
+    zero: bool,
+}
+
+impl Flags {
+    pub fn parse(rest: &mut &[u8], index: &mut usize) -> Self {
+        let mut flags = Self::default();
+
+        while let Some(x) = rest.get(*index) {
+            match x {
+                b'-' => flags.minus = true,
+                b'+' => flags.plus = true,
+                b' ' => flags.space = true,
+                b'#' => flags.hash = true,
+                b'0' => flags.zero = true,
+                _ => break,
+            }
+            *index += 1;
+        }
+
+        flags
+    }
+
+    /// Whether any of the flags is set to true
+    fn any(&self) -> bool {
+        self != &Self::default()
+    }
+}
+
 impl Spec {
     pub fn parse<'a>(rest: &mut &'a [u8]) -> Result<Self, &'a [u8]> {
         // Based on the C++ reference, the spec format looks like:
@@ -97,28 +131,12 @@ impl Spec {
         let mut index = 0;
         let start = *rest;
 
-        let mut minus = false;
-        let mut plus = false;
-        let mut space = false;
-        let mut hash = false;
-        let mut zero = false;
+        let flags = Flags::parse(rest, &mut index);
 
-        while let Some(x) = rest.get(index) {
-            match x {
-                b'-' => minus = true,
-                b'+' => plus = true,
-                b' ' => space = true,
-                b'#' => hash = true,
-                b'0' => zero = true,
-                _ => break,
-            }
-            index += 1;
-        }
-
-        let positive_sign = match (plus, space) {
-            (true, _) => PositiveSign::Plus,
-            (false, true) => PositiveSign::Space,
-            (false, false) => PositiveSign::None,
+        let positive_sign = match flags {
+            Flags { plus: true, .. } => PositiveSign::Plus,
+            Flags { space: true, .. } => PositiveSign::Space,
+            _ => PositiveSign::None,
         };
 
         let width = eat_asterisk_or_number(rest, &mut index);
@@ -133,9 +151,9 @@ impl Spec {
         // The `0` flag is ignored if `-` is given or a precision is specified.
         // So the only case for RightZero, is when `-` is not given and the
         // precision is none.
-        let alignment = if minus {
+        let alignment = if flags.minus {
             NumberAlignment::Left
-        } else if zero && precision.is_none() {
+        } else if flags.zero && precision.is_none() {
             NumberAlignment::RightZero
         } else {
             NumberAlignment::RightSpace
@@ -153,38 +171,38 @@ impl Spec {
         Ok(match type_spec {
             // GNU accepts minus, plus and space even though they are not used
             b'c' => {
-                if hash || precision.is_some() {
+                if flags.hash || precision.is_some() {
                     return Err(&start[..index]);
                 }
                 Self::Char {
                     width,
-                    align_left: minus,
+                    align_left: flags.minus,
                 }
             }
             b's' => {
-                if hash {
+                if flags.hash {
                     return Err(&start[..index]);
                 }
                 Self::String {
                     precision,
                     width,
-                    align_left: minus,
+                    align_left: flags.minus,
                 }
             }
             b'b' => {
-                if hash || minus || plus || space || width.is_some() || precision.is_some() {
+                if flags.any() || width.is_some() || precision.is_some() {
                     return Err(&start[..index]);
                 }
                 Self::EscapedString
             }
             b'q' => {
-                if hash || minus || plus || space || width.is_some() || precision.is_some() {
+                if flags.any() || width.is_some() || precision.is_some() {
                     return Err(&start[..index]);
                 }
                 Self::QuotedString
             }
             b'd' | b'i' => {
-                if hash {
+                if flags.hash {
                     return Err(&start[..index]);
                 }
                 Self::SignedInt {
@@ -196,10 +214,10 @@ impl Spec {
             }
             c @ (b'u' | b'o' | b'x' | b'X') => {
                 // Normal unsigned integer cannot have a prefix
-                if *c == b'u' && hash {
+                if *c == b'u' && flags.hash {
                     return Err(&start[..index]);
                 }
-                let prefix = match hash {
+                let prefix = match flags.hash {
                     false => Prefix::No,
                     true => Prefix::Yes,
                 };
@@ -227,7 +245,7 @@ impl Spec {
                     b'a' | b'A' => FloatVariant::Hexadecimal,
                     _ => unreachable!(),
                 },
-                force_decimal: match hash {
+                force_decimal: match flags.hash {
                     false => ForceDecimal::No,
                     true => ForceDecimal::Yes,
                 },