Run `cargo clippy --fix --all-targets --all-features` with Rust 1.57

Clippy in the newly released Rust 1.57 found some new lints. Conveniently, all
of them were fixable with `--fix`.
This commit is contained in:
Martin Nordholts 2021-12-08 08:29:10 +01:00
parent 7fceb4878f
commit e250da8aaa
3 changed files with 3 additions and 3 deletions

View File

@ -195,7 +195,7 @@ impl HighlightingAssets {
bat_warning!("Unknown theme '{}', using default.", theme)
}
self.get_theme_set()
.get(self.fallback_theme.unwrap_or_else(|| Self::default_theme()))
.get(self.fallback_theme.unwrap_or_else(Self::default_theme))
.expect("something is very wrong if the default theme is missing")
}
}

View File

@ -307,7 +307,7 @@ impl App {
.map(|style_str| {
style_str
.split(',')
.map(|x| StyleComponent::from_str(x))
.map(StyleComponent::from_str)
.collect::<Result<Vec<StyleComponent>>>()
})
.transpose()?;

View File

@ -104,7 +104,7 @@ fn get_args_from_str(content: &str) -> Result<Vec<OsString>, shell_words::ParseE
.map(|line| line.trim())
.filter(|line| !line.is_empty())
.filter(|line| !line.starts_with('#'))
.map(|line| shell_words::split(line))
.map(shell_words::split)
.collect::<Result<Vec<_>, _>>()?;
Ok(args_per_line