From b9f4964a96a45cfbff4ff7c6277c5357892093a6 Mon Sep 17 00:00:00 2001
From: Terts Diepraam <terts.diepraam@gmail.com>
Date: Thu, 22 Apr 2021 11:39:08 +0200
Subject: [PATCH] ls: bring up to date with recent changes

---
 Cargo.lock               |  5 +++--
 src/uu/ls/Cargo.toml     |  3 +++
 src/uu/ls/src/ls.rs      | 10 ++++++----
 tests/by-util/test_ls.rs | 11 ++---------
 4 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 5370c50e6..7ae0d078f 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1412,9 +1412,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "1.0.69"
+version = "1.0.70"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "48fe99c6bd8b1cc636890bcc071842de909d902c81ac7dab53ba33c421ab8ffb"
+checksum = "b9505f307c872bab8eb46f77ae357c8eba1fdacead58ee5a850116b1d7f82883"
 dependencies = [
  "proc-macro2",
  "quote 1.0.9",
@@ -2007,6 +2007,7 @@ dependencies = [
  "atty",
  "clap",
  "globset",
+ "lazy_static",
  "lscolors",
  "number_prefix",
  "term_grid",
diff --git a/src/uu/ls/Cargo.toml b/src/uu/ls/Cargo.toml
index addca6fbb..9fa06c6a6 100644
--- a/src/uu/ls/Cargo.toml
+++ b/src/uu/ls/Cargo.toml
@@ -26,6 +26,9 @@ uucore = { version=">=0.0.8", package="uucore", path="../../uucore", features=["
 uucore_procs = { version=">=0.0.5", package="uucore_procs", path="../../uucore_procs" }
 atty = "0.2"
 
+[target.'cfg(unix)'.dependencies]
+lazy_static = "1.4.0"
+
 [[bin]]
 name = "ls"
 path = "src/main.rs"
diff --git a/src/uu/ls/src/ls.rs b/src/uu/ls/src/ls.rs
index 99c41bdb8..3feee0f07 100644
--- a/src/uu/ls/src/ls.rs
+++ b/src/uu/ls/src/ls.rs
@@ -9,6 +9,9 @@
 
 #[macro_use]
 extern crate uucore;
+#[cfg(unix)]
+#[macro_use]
+extern crate lazy_static;
 
 mod quoting_style;
 mod version_cmp;
@@ -18,12 +21,11 @@ use globset::{self, Glob, GlobSet, GlobSetBuilder};
 use lscolors::LsColors;
 use number_prefix::NumberPrefix;
 use quoting_style::{escape_name, QuotingStyle};
-use std::fs;
-use std::fs::{DirEntry, FileType, Metadata};
 #[cfg(unix)]
-use std::os::unix::fs::FileTypeExt;
+use std::collections::HashMap;
+use std::fs::{self, DirEntry, FileType, Metadata};
 #[cfg(any(unix, target_os = "redox"))]
-use std::os::unix::fs::MetadataExt;
+use std::os::unix::fs::{FileTypeExt, MetadataExt};
 #[cfg(windows)]
 use std::os::windows::fs::MetadataExt;
 use std::path::{Path, PathBuf};
diff --git a/tests/by-util/test_ls.rs b/tests/by-util/test_ls.rs
index 4282bcfc0..f87e64688 100644
--- a/tests/by-util/test_ls.rs
+++ b/tests/by-util/test_ls.rs
@@ -647,18 +647,14 @@ fn test_ls_color() {
     at.touch(&nested_file);
     at.touch("test-color");
 
-    at.symlink_file(&nested_file, "link");
-
     let a_with_colors = "\x1b[1;34ma\x1b[0m";
     let z_with_colors = "\x1b[1;34mz\x1b[0m";
     let nested_dir_with_colors = "\x1b[1;34mnested_dir\x1b[0m";
-    let link_with_color = "\x1b[1;36mlink\x1b[0m";
 
     // Color is disabled by default
     let result = scene.ucmd().succeeds();
     assert!(!result.stdout_str().contains(a_with_colors));
     assert!(!result.stdout_str().contains(z_with_colors));
-    assert!(!result.stdout_str().contains(link_with_color));
 
     // Color should be enabled
     scene
@@ -666,8 +662,7 @@ fn test_ls_color() {
         .arg("--color")
         .succeeds()
         .stdout_contains(a_with_colors)
-        .stdout_contains(z_with_colors)
-        .stdout_contains(link_with_color);
+        .stdout_contains(z_with_colors);
 
     // Color should be enabled
     scene
@@ -675,14 +670,12 @@ fn test_ls_color() {
         .arg("--color=always")
         .succeeds()
         .stdout_contains(a_with_colors)
-        .stdout_contains(z_with_colors)
-        .stdout_contains(link_with_color);
+        .stdout_contains(z_with_colors);
 
     // Color should be disabled
     let result = scene.ucmd().arg("--color=never").succeeds();
     assert!(!result.stdout_str().contains(a_with_colors));
     assert!(!result.stdout_str().contains(z_with_colors));
-    assert!(!result.stdout_str().contains(link_with_color));
 
     // Nested dir should be shown and colored
     scene