Skip to content

ls: Changed unwrap_or and or option handling to lazy evaluated unwrap_or_else and or_else #6609

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.

Sign up for GitHub

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

Merged
cakebaker merged 2 commits into from
Sep 7, 2024
Merged

ls: Changed unwrap_or and or option handling to lazy evaluated unwrap_or_else and or_else #6609

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b9392a3
Changed unwrap_or and option handling to lazy evaluation
AnirbanHalder654322 Jul 31, 2024
b998701
Clippy fixes
AnirbanHalder654322 Aug 2, 2024
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 src/uu/ls/src/colors.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ pub(crate) fn color_name(
// Use fn get_metadata_with_deref_opt instead of get_metadata() here because ls
// should not exit with an err, if we are unable to obtain the target_metadata
let md_res = get_metadata_with_deref_opt(&target.p_buf, path.must_dereference);
let md = md_res.or(path.p_buf.symlink_metadata());
let md = md_res.or_else(|_| path.p_buf.symlink_metadata());
style_manager.apply_style_based_on_metadata(path, md.ok().as_ref(), name, wrap)
} else {
let md_option = path.get_metadata(out);
Expand Down
4 changes: 2 additions & 2 deletions src/uu/ls/src/ls.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -697,7 +697,7 @@ fn extract_quoting_style(options: &clap::ArgMatches, show_control: bool) -> Quot
Some(qs) => return qs,
None => eprintln!(
"{}: Ignoring invalid value of environment variable QUOTING_STYLE: '{}'",
std::env::args().next().unwrap_or("ls".to_string()),
std::env::args().next().unwrap_or_else(|| "ls".to_string()),
style
),
}
Expand Down Expand Up @@ -3332,7 +3332,7 @@ fn display_item_name(
}

fn create_hyperlink(name: &str, path: &PathData) -> String {
let hostname = hostname::get().unwrap_or(OsString::from(""));
let hostname = hostname::get().unwrap_or_else(|_| OsString::from(""));
let hostname = hostname.to_string_lossy();

let absolute_path = fs::canonicalize(&path.p_buf).unwrap_or_default();
Expand Down