RGBCube/uutils-coreutils
1
Fork 0
mirror of https://github.com/RGBCube/uutils-coreutils synced 2025-07-28 11:37:44 +00:00
Code Issues Activity

Merge pull request #3343 from uutils/dependabot/cargo/lscolors-0.9.0

Browse source 
build(deps): bump lscolors from 0.7.1 to 0.9.0
This commit is contained in:
Sylvestre Ledru 2022-04-09 09:29:25 +02:00 • committed by GitHub
commit d0aa9a9927
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Cargo.lock generated
View file

@ -1090,9 +1090,9 @@ dependencies = [
[[package]] [[package]]
name = "lscolors" name = "lscolors"
version = "0.7.1" version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d24b894c45c9da468621cdd615a5a79ee5e5523dd4f75c76ebc03d458940c16e" checksum = "4e9323b3525d4efad2dead1837a105e313253bfdbad1d470994038eededa4d62"
dependencies = [ dependencies = [
"ansi_term", "ansi_term",
] ]

2
src/uu/ls/Cargo.toml
View file

@ -22,7 +22,7 @@ number_prefix = "0.4"
term_grid = "0.1.5" term_grid = "0.1.5"
termsize = "0.1.6" termsize = "0.1.6"
glob = "0.3.0" glob = "0.3.0"
lscolors = { version = "0.7.1", features = ["ansi_term"] } lscolors = { version = "0.9.0", features = ["ansi_term"] }
uucore = { version = ">=0.0.8", package = "uucore", path = "../../uucore", features = ["entries", "fs"] } uucore = { version = ">=0.0.8", package = "uucore", path = "../../uucore", features = ["entries", "fs"] }
once_cell = "1.10.0" once_cell = "1.10.0"
atty = "0.2" atty = "0.2"

5
tests/by-util/test_ls.rs
View file

@ -894,7 +894,7 @@ fn test_ls_long_symlink_color() {
(Some([0, 0]), "ln-file1", None, "dir1/file1"), (Some([0, 0]), "ln-file1", None, "dir1/file1"),
(Some([1, 1]), "ln-dir-invalid", Some([1, 1]), "dir1/dir2"), (Some([1, 1]), "ln-dir-invalid", Some([1, 1]), "dir1/dir2"),
(Some([0, 0]), "ln-root", Some([0, 1]), "/"), (Some([0, 0]), "ln-root", Some([0, 1]), "/"),
(Some([0, 0]), "ln-up2", Some([0, 1]), "../.."), (Some([0, 0]), "ln-up2", None, "../.."),
]; ];
// We are only interested in lines or the ls output that are symlinks. These start with "lrwx". // We are only interested in lines or the ls output that are symlinks. These start with "lrwx".
@ -912,6 +912,8 @@ fn test_ls_long_symlink_color() {
while let Some((i, name, target)) = get_index_name_target(&mut result_lines) { while let Some((i, name, target)) = get_index_name_target(&mut result_lines) {
// The unwraps within capture_colored_string will panic if the name/target's color // The unwraps within capture_colored_string will panic if the name/target's color
// format is invalid. // format is invalid.
dbg!(&name);
dbg!(&target);
let (matched_name_color, matched_name) = capture_colored_string(&name); let (matched_name_color, matched_name) = capture_colored_string(&name);
let (matched_target_color, matched_target) = capture_colored_string(&target); let (matched_target_color, matched_target) = capture_colored_string(&target);
@ -934,6 +936,7 @@ fn test_ls_long_symlink_color() {
// Keep in mind an expected color `Option<&str>` of None can mean either that we // Keep in mind an expected color `Option<&str>` of None can mean either that we
// don't expect any color here, as in `expected_output[2], or don't know what specific // don't expect any color here, as in `expected_output[2], or don't know what specific
// color to expect yet, as in expected_output[0:1]. // color to expect yet, as in expected_output[0:1].
dbg!(&colors);
assert_names_and_colors_are_equal( assert_names_and_colors_are_equal(
matched_name_color, matched_name_color,
expected_name_color, expected_name_color,