MirroredRepos/bat
1
0
Fork 0
mirror of https://github.com/sharkdp/bat.git synced 2025-02-15 09:28:26 +00:00
Code Issues Releases Wiki Activity

Fix clippy::unnecessary_map_or warnings

Browse Source
This commit is contained in:
einfachIrgendwer0815 2025-01-30 18:14:29 +01:00
parent 3d442cdf98
commit 3d0f0c0565
No known key found for this signature in database
GPG Key ID: 58D55E5F117DA873
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/printer.rs
View File

@ -267,7 +267,7 @@ impl<'a> InteractivePrinter<'a> {
let is_printing_binary = input let is_printing_binary = input
.reader .reader
.content_type .content_type
.map_or(false, |c| c.is_binary() && !config.show_nonprintable); .is_some_and(|c| c.is_binary() && !config.show_nonprintable);
let needs_to_match_syntax = (!is_printing_binary let needs_to_match_syntax = (!is_printing_binary
|| matches!(config.binary, BinaryBehavior::AsText)) || matches!(config.binary, BinaryBehavior::AsText))
@ -544,7 +544,7 @@ impl<'a> Printer for InteractivePrinter<'a> {
})?; })?;
if self.config.style_components.grid() { if self.config.style_components.grid() {
if self.content_type.map_or(false, |c| c.is_text()) if self.content_type.is_some_and(|c| c.is_text())
|| self.config.show_nonprintable || self.config.show_nonprintable
|| matches!(self.config.binary, BinaryBehavior::AsText) || matches!(self.config.binary, BinaryBehavior::AsText)
{ {
@ -559,7 +559,7 @@ impl<'a> Printer for InteractivePrinter<'a> {
fn print_footer(&mut self, handle: &mut OutputHandle, _input: &OpenedInput) -> Result<()> { fn print_footer(&mut self, handle: &mut OutputHandle, _input: &OpenedInput) -> Result<()> {
if self.config.style_components.grid() if self.config.style_components.grid()
&& (self.content_type.map_or(false, |c| c.is_text()) && (self.content_type.is_some_and(|c| c.is_text())
|| self.config.show_nonprintable || self.config.show_nonprintable
|| matches!(self.config.binary, BinaryBehavior::AsText)) || matches!(self.config.binary, BinaryBehavior::AsText))
{ {

2
src/syntax_mapping.rs
View File

@ -153,7 +153,7 @@ impl<'a> SyntaxMapping<'a> {
if glob.is_match_candidate(&candidate) if glob.is_match_candidate(&candidate)
|| candidate_filename || candidate_filename
.as_ref() .as_ref()
.map_or(false, |filename| glob.is_match_candidate(filename)) .is_some_and(|filename| glob.is_match_candidate(filename))
{ {
return Some(*syntax); return Some(*syntax);
} }