refactor(fold): unify UTF-8 and non-UTF-8 handling paths

- Simplify fold_file by sharing FoldContext construction - Reduces duplicated code and improves maintainability without behavior change
uutils · sylvestre · Nov 13, 2025 · Nov 3, 2025 · Nov 3, 2025 · Nov 3, 2025
commit fbefe63537208f8feb24fca032df4531f99acf0c
diff --git a/src/uu/fold/src/fold.rs b/src/uu/fold/src/fold.rs
@@ -577,28 +577,19 @@ fn fold_file<T: Read, W: Write>(
             break;
         }
 
-        if let Ok(line_str) = std::str::from_utf8(&line) {
-            let mut ctx = FoldContext {
-                spaces,
-                width,
-                mode,
-                writer,
-                output: &mut output,
-                col_count: &mut col_count,
-                last_space: &mut last_space,
-            };
-            process_utf8_line(line_str, &mut ctx)?;
-        } else {
-            let mut ctx = FoldContext {
-                spaces,
-                width,
-                mode,
-                writer,
-                output: &mut output,
-                col_count: &mut col_count,
-                last_space: &mut last_space,
-            };
-            process_non_utf8_line(&line, &mut ctx)?;
+        let mut ctx = FoldContext {
+            spaces,
+            width,
+            mode,
+            writer,
+            output: &mut output,
+            col_count: &mut col_count,
+            last_space: &mut last_space,
+        };
+
+        match std::str::from_utf8(&line) {
+            Ok(s) => process_utf8_line(s, &mut ctx)?,
+            Err(_) => process_non_utf8_line(&line, &mut ctx)?,
         }
 
         line.clear();