merge

src/uu/ls/src/ls.rs

@@ -3,7 +3,7 @@
 // For the full copyright and license information, please view the LICENSE
 // file that was distributed with this source code.
 
-// spell-checker:ignore (ToDO) somegroup nlink tabsize dired subdired dtype colorterm
+// spell-checker:ignore (ToDO) somegroup nlink tabsize dired subdired dtype colorterm getxattr
 
 use clap::{
     builder::{NonEmptyStringValueParser, ValueParser},
@@ -2627,12 +2627,12 @@ fn file_has_acl_cache<P: AsRef<Path>>(file: P) -> bool {
     match xattr::list(file) {
         Ok(acl) => {
             // no extra perms
-            return acl.count() > 0;
+            acl.count() > 0
         }
-        Err(_) => return false,
+        Err(_) => false,
     }
     #[cfg(not(unix))]
-    return false;
+    false
 }
 
 /// This writes to the BufWriter out a single string of the output of `ls -l`.