Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

⬆️ bump lscolors to v0.15.0 and msrv to 1.69.0 #944

Merged
merged 2 commits into from
Nov 1, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/CICD.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ env:
PROJECT_NAME: lsd
PROJECT_DESC: "An ls command with a lot of pretty colors."
PROJECT_AUTH: "Peltoche <[email protected]>"
RUST_MIN_SRV: "1.64.0"
RUST_MIN_SRV: "1.69.0"

on: [push, pull_request]

Expand Down
4 changes: 2 additions & 2 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ once_cell = "1.17.1"
chrono = { version = "0.4.*", features = ["unstable-locales"] }
chrono-humanize = "0.1.*"
unicode-width = "0.1.*"
lscolors = "0.14.0"
lscolors = "0.15.0"
wild = "2.0.*"
globset = "0.4.*"
xdg = "2.1.*"
Expand Down
4 changes: 2 additions & 2 deletions build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ include!("src/app.rs");

fn main() {
// rustc version too small or can't figure it out
if version_check::is_min_version("1.64.0") != Some(true) {
eprintln!("'lsd' requires rustc >= 1.64.0");
if version_check::is_min_version("1.69.0") != Some(true) {
eprintln!("'lsd' requires rustc >= 1.69.0");
exit(1);
}

Expand Down
2 changes: 1 addition & 1 deletion src/meta/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -386,7 +386,7 @@ mod tests {
// likely to fail because of permission issue
// see https://doc.rust-lang.org/std/os/windows/fs/fn.symlink_file.html
#[cfg(windows)]
std::os::windows::fs::symlink_file(&path_c, &path_b)
std::os::windows::fs::symlink_file(path_c, &path_b)
.expect("failed to create broken symlink");

let meta_b = Meta::from_path(&path_b, true, false).expect("failed to get meta");
Expand Down
2 changes: 1 addition & 1 deletion src/sort.rs
Original file line number Diff line number Diff line change
Expand Up @@ -378,7 +378,7 @@ mod tests {
// likely to fail because of permission issue
// see https://doc.rust-lang.org/std/os/windows/fs/fn.symlink_file.html
#[cfg(windows)]
std::os::windows::fs::symlink_file(&path_d, &path_c)
std::os::windows::fs::symlink_file(path_d, &path_c)
.expect("failed to create broken symlink");

let meta_c = Meta::from_path(&path_c, true, false).expect("failed to get meta");
Expand Down
2 changes: 1 addition & 1 deletion tests/integration.rs
Original file line number Diff line number Diff line change
Expand Up @@ -303,7 +303,7 @@ fn test_dereference_link_broken_link_output() {
// likely to fail because of permission issue
// see https://doc.rust-lang.org/std/os/windows/fs/fn.symlink_file.html
#[cfg(windows)]
std::os::windows::fs::symlink_file(&target, &link).expect("failed to create broken symlink");
std::os::windows::fs::symlink_file(target, &link).expect("failed to create broken symlink");

cmd()
.arg("-l")
Expand Down
Loading