Robot
/
fd
mirror of https://github.com/sharkdp/fd.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix clippy suggestions

This commit is contained in:
sharkdp 2020-12-06 12:04:47 +01:00
parent ea48a96945
commit 296300ce46
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.rs
View File

@ -16,7 +16,7 @@ fn main() {
}
}
let var = std::env::var_os("SHELL_COMPLETIONS_DIR").or(std::env::var_os("OUT_DIR"));
let var = std::env::var_os("SHELL_COMPLETIONS_DIR").or_else(|| std::env::var_os("OUT_DIR"));
let outdir = match var {
None => return,
Some(outdir) => outdir,

4
src/main.rs
View File

@ -176,7 +176,7 @@ fn run() -> Result<ExitCode> {
let path_separator = matches.value_of("path-separator").map(|str| str.to_owned());
let ls_colors = if colored_output {
Some(LsColors::from_env().unwrap_or(LsColors::from_string(DEFAULT_LS_COLORS)))
Some(LsColors::from_env().unwrap_or_else(|| LsColors::from_string(DEFAULT_LS_COLORS)))
} else {
None
};
@ -344,7 +344,7 @@ fn run() -> Result<ExitCode> {
.value_of("threads")
.map(|n| usize::from_str_radix(n, 10))
.transpose()
.context(format!("Failed to parse number of threads"))?
.context("Failed to parse number of threads")?
.map(|n| {
if n > 0 {
Ok(n)