1
0
mirror of https://github.com/sharkdp/bat synced 2026-07-27 17:41:42 +00:00

fix some clippy warnings

This commit is contained in:
MarcoIeni
2020-11-05 22:29:04 +01:00
committed by David Peter
parent 51463a4b41
commit 43b2ee5e71
7 changed files with 11 additions and 25 deletions
+3 -8
View File
@@ -169,9 +169,7 @@ impl App {
|| match self.matches.value_of("color") {
Some("always") => true,
Some("never") => false,
Some("auto") | _ => {
env::var_os("NO_COLOR").is_none() && self.interactive_output
}
_ => env::var_os("NO_COLOR").is_none() && self.interactive_output,
},
paging_mode,
term_width: maybe_term_width.unwrap_or(Term::stdout().size().1 as usize),
@@ -226,17 +224,14 @@ impl App {
style_components,
syntax_mapping,
pager: self.matches.value_of("pager"),
use_italic_text: match self.matches.value_of("italic-text") {
Some("always") => true,
_ => false,
},
use_italic_text: matches!(self.matches.value_of("italic-text"), Some("always")),
highlighted_lines: self
.matches
.values_of("highlight-line")
.map(|ws| ws.map(LineRange::from).collect())
.transpose()?
.map(LineRanges::from)
.map(|lr| HighlightedLineRanges(lr))
.map(HighlightedLineRanges)
.unwrap_or_default(),
})
}
+1 -1
View File
@@ -85,7 +85,7 @@ pub fn get_args_from_config_file() -> Result<Vec<OsString>, shell_words::ParseEr
.ok()
.map(|content| get_args_from_str(&content))
.transpose()?
.unwrap_or_else(|| vec![]))
.unwrap_or_else(Vec::new))
}
pub fn get_args_from_env_var() -> Option<Result<Vec<OsString>, shell_words::ParseError>> {