uu_cksum: cspell lineformat to line_format

Author: GTimothy

src/uucore/src/lib/features/checksum.rs

@@ -628,23 +628,23 @@ impl ByteSliceExt for [u8] {
 }
 
 impl LineInfo {
-    fn parse(s: impl AsRef<OsStr>, cached_lineformat: &mut Option<LineFormat>) -> Option<Self> {
+    fn parse(s: impl AsRef<OsStr>, cached_line_format: &mut Option<LineFormat>) -> Option<Self> {
         let line_bytes = os_str_as_bytes(s.as_ref()).ok()?;
 
         if let Some(info) = LineFormat::parse_algo_based(line_bytes) {
             return Some(info);
         }
-        if let Some(cached_format) = cached_lineformat {
+        if let Some(cached_format) = cached_line_format {
             match cached_format {
                 LineFormat::Untagged => LineFormat::parse_untagged(line_bytes),
                 LineFormat::SingleSpace => LineFormat::parse_single_space(line_bytes),
                 _ => unreachable!("we never catch the algo based format"),
             }
         } else if let Some(info) = LineFormat::parse_untagged(line_bytes) {
-            *cached_lineformat = Some(LineFormat::Untagged);
+            *cached_line_format = Some(LineFormat::Untagged);
             Some(info)
         } else if let Some(info) = LineFormat::parse_single_space(line_bytes) {
-            *cached_lineformat = Some(LineFormat::SingleSpace);
+            *cached_line_format = Some(LineFormat::SingleSpace);
             Some(info)
         } else {
             None
@@ -923,7 +923,7 @@ fn process_checksum_line(
     cli_algo_name: Option<&str>,
     cli_algo_length: Option<usize>,
     opts: ChecksumOptions,
-    cached_lineformat: &mut Option<LineFormat>,
+    cached_line_format: &mut Option<LineFormat>,
     last_algo: &mut Option<String>,
 ) -> Result<(), LineCheckError> {
     let line_bytes = os_str_as_bytes(line)?;
@@ -935,7 +935,7 @@ fn process_checksum_line(
 
     // Use `LineInfo` to extract the data of a line.
     // Then, depending on its format, apply a different pre-treatment.
-    let Some(line_info) = LineInfo::parse(line, cached_lineformat) else {
+    let Some(line_info) = LineInfo::parse(line, cached_line_format) else {
         return Err(LineCheckError::ImproperlyFormatted);
     };
 
@@ -978,9 +978,9 @@ fn process_checksum_file(
     let reader = BufReader::new(file);
     let lines = read_os_string_lines(reader).collect::<Vec<_>>();
 
-    // cached_lineformat is used to ensure that several non algo-based checksum line
+    // cached_line_format is used to ensure that several non algo-based checksum line
     // will use the same parser.
-    let mut cached_lineformat = None;
+    let mut cached_line_format = None;
     // last_algo caches the algorithm used in the last line to print a warning
     // message for the current line if improperly formatted.
     // Behavior tested in gnu_cksum_c::test_warn
@@ -993,7 +993,7 @@ fn process_checksum_file(
             cli_algo_name,
             cli_algo_length,
             opts,
-            &mut cached_lineformat,
+            &mut cached_line_format,
             &mut last_algo,
         );
 
@@ -1450,69 +1450,69 @@ mod tests {
 
     #[test]
     fn test_line_info() {
-        let mut cached_lineformat = None;
+        let mut cached_line_format = None;
 
         // Test algo-based parser
         let line_algo_based =
             OsString::from("MD5 (example.txt) = d41d8cd98f00b204e9800998ecf8427e");
-        let line_info = LineInfo::parse(&line_algo_based, &mut cached_lineformat).unwrap();
+        let line_info = LineInfo::parse(&line_algo_based, &mut cached_line_format).unwrap();
         assert_eq!(line_info.algo_name.as_deref(), Some("MD5"));
         assert!(line_info.algo_bit_len.is_none());
         assert_eq!(line_info.filename, b"example.txt");
         assert_eq!(line_info.checksum, "d41d8cd98f00b204e9800998ecf8427e");
         assert_eq!(line_info.format, LineFormat::AlgoBased);
-        assert!(cached_lineformat.is_none());
+        assert!(cached_line_format.is_none());
 
         // Test double-space parser
         let line_double_space = OsString::from("d41d8cd98f00b204e9800998ecf8427e  example.txt");
-        let line_info = LineInfo::parse(&line_double_space, &mut cached_lineformat).unwrap();
+        let line_info = LineInfo::parse(&line_double_space, &mut cached_line_format).unwrap();
         assert!(line_info.algo_name.is_none());
         assert!(line_info.algo_bit_len.is_none());
         assert_eq!(line_info.filename, b"example.txt");
         assert_eq!(line_info.checksum, "d41d8cd98f00b204e9800998ecf8427e");
         assert_eq!(line_info.format, LineFormat::Untagged);
-        assert!(cached_lineformat.is_some());
+        assert!(cached_line_format.is_some());
 
-        cached_lineformat = None;
+        cached_line_format = None;
 
         // Test single-space parser
         let line_single_space = OsString::from("d41d8cd98f00b204e9800998ecf8427e example.txt");
-        let line_info = LineInfo::parse(&line_single_space, &mut cached_lineformat).unwrap();
+        let line_info = LineInfo::parse(&line_single_space, &mut cached_line_format).unwrap();
         assert!(line_info.algo_name.is_none());
         assert!(line_info.algo_bit_len.is_none());
         assert_eq!(line_info.filename, b"example.txt");
         assert_eq!(line_info.checksum, "d41d8cd98f00b204e9800998ecf8427e");
         assert_eq!(line_info.format, LineFormat::SingleSpace);
-        assert!(cached_lineformat.is_some());
+        assert!(cached_line_format.is_some());
 
-        cached_lineformat = None;
+        cached_line_format = None;
 
         // Test invalid checksum line
         let line_invalid = OsString::from("invalid checksum line");
-        assert!(LineInfo::parse(&line_invalid, &mut cached_lineformat).is_none());
-        assert!(cached_lineformat.is_none());
+        assert!(LineInfo::parse(&line_invalid, &mut cached_line_format).is_none());
+        assert!(cached_line_format.is_none());
 
         // Test leading space before checksum line
         let line_algo_based_leading_space =
             OsString::from("   MD5 (example.txt) = d41d8cd98f00b204e9800998ecf8427e");
         let line_info =
-            LineInfo::parse(&line_algo_based_leading_space, &mut cached_lineformat).unwrap();
+            LineInfo::parse(&line_algo_based_leading_space, &mut cached_line_format).unwrap();
         assert_eq!(line_info.format, LineFormat::AlgoBased);
-        assert!(cached_lineformat.is_none());
+        assert!(cached_line_format.is_none());
 
         // Test trailing space after checksum line (should fail)
         let line_algo_based_leading_space =
             OsString::from("MD5 (example.txt) = d41d8cd98f00b204e9800998ecf8427e ");
-        let res = LineInfo::parse(&line_algo_based_leading_space, &mut cached_lineformat);
+        let res = LineInfo::parse(&line_algo_based_leading_space, &mut cached_line_format);
         assert!(res.is_none());
-        assert!(cached_lineformat.is_none());
+        assert!(cached_line_format.is_none());
     }
 
     #[test]
     fn test_get_expected_digest() {
         let line = OsString::from("SHA256 (empty) = 47DEQpj8HBSa+/TImW+5JCeuQeRkm5NMpJWZG3hSuFU=");
-        let mut cached_lineformat = None;
-        let line_info = LineInfo::parse(&line, &mut cached_lineformat).unwrap();
+        let mut cached_line_format = None;
+        let line_info = LineInfo::parse(&line, &mut cached_line_format).unwrap();
 
         let result = get_expected_digest_as_hex_string(&line_info, None);
 
@@ -1526,8 +1526,8 @@ mod tests {
     fn test_get_expected_checksum_invalid() {
         // The line misses a '=' at the end to be valid base64
         let line = OsString::from("SHA256 (empty) = 47DEQpj8HBSa+/TImW+5JCeuQeRkm5NMpJWZG3hSuFU");
-        let mut cached_lineformat = None;
-        let line_info = LineInfo::parse(&line, &mut cached_lineformat).unwrap();
+        let mut cached_line_format = None;
+        let line_info = LineInfo::parse(&line, &mut cached_line_format).unwrap();
 
         let result = get_expected_digest_as_hex_string(&line_info, None);