Merge pull request #2386 from youknowone/dircolors-double-scan

Prevent double scanning from dircolors

src/uu/dircolors/src/dircolors.rs

@@ -192,21 +192,25 @@ pub trait StrUtils {
 impl StrUtils for str {
     fn purify(&self) -> &Self {
         let mut line = self;
-        for (n, c) in self.chars().enumerate() {
+        for (n, _) in self
-            if c != '#' {
+            .as_bytes()
-                continue;
+            .iter()
-            }
+            .enumerate()
-
+            .filter(|(_, c)| **c == b'#')
-            // Ignore if '#' is at the beginning of line
+        {
-            if n == 0 {
-                line = &self[..0];
-                break;
-            }
-
             // Ignore the content after '#'
             // only if it is preceded by at least one whitespace
-            if self.chars().nth(n - 1).unwrap().is_whitespace() {
+            match self[..n].chars().last() {
-                line = &self[..n];
+                Some(c) if c.is_whitespace() => {
+                    line = &self[..n - c.len_utf8()];
+                    break;
+                }
+                None => {
+                    // n == 0
+                    line = &self[..0];
+                    break;
+                }
+                _ => (),
             }
         }
         line.trim()