ls: Fix formatting/linting/spelling issues

RenjiSann · RenjiSann · commit 02724fb2fea1 · 2023-11-19T12:47:35.000+01:00
diff --git a/src/uu/ls/src/ls.rs b/src/uu/ls/src/ls.rs
@@ -620,11 +620,9 @@ fn extract_quoting_style(options: &clap::ArgMatches, show_control: bool) -> Quot
         QuotingStyle::C {
             quotes: quoting_style::Quotes::Double,
         }
-    } else if options.get_flag(options::DIRED) {
-        QuotingStyle::Literal { show_control }
-    } else if !std::io::stdout().is_terminal() {
+    } else if options.get_flag(options::DIRED) || !std::io::stdout().is_terminal() {
         // By default, `ls` uses Literal quoting when
-        // outputing to a non-terminal file descriptor
+        // writing to a non-terminal file descriptor
         QuotingStyle::Literal { show_control }
     } else {
         // TODO: use environment variable if available
diff --git a/tests/by-util/test_ls.rs b/tests/by-util/test_ls.rs
@@ -2461,8 +2461,8 @@ fn test_ls_quoting_style() {
             .arg("one\ntwo")
             .succeeds()
             .stdout_only("one?two\n");
-            // TODO: TTY-expected output, find a way to check this as well
-            // .stdout_only("'one'$'\\n''two'\n");
+        // TODO: TTY-expected output, find a way to check this as well
+        // .stdout_only("'one'$'\\n''two'\n");
 
         for (arg, correct) in [
             ("--quoting-style=literal", "one?two"),
@@ -2550,8 +2550,8 @@ fn test_ls_quoting_style() {
         .arg("one two")
         .succeeds()
         .stdout_only("one two\n");
-        // TODO: TTY-expected output
-        // .stdout_only("'one two'\n");
+    // TODO: TTY-expected output
+    // .stdout_only("'one two'\n");
 
     for (arg, correct) in [
         ("--quoting-style=literal", "one two"),
@@ -2615,8 +2615,8 @@ fn test_ls_quoting_and_color() {
         .arg("one two")
         .succeeds()
         .stdout_only("one two\n");
-        // TODO: TTY-expected output
-        // .stdout_only("'one two'\n");
+    // TODO: TTY-expected output
+    // .stdout_only("'one two'\n");
 }
 
 #[test]
