From 9eed967543cbe141663b459dc563765eb36c9746 Mon Sep 17 00:00:00 2001 From: Guillaume Gomez Date: Thu, 20 Jan 2022 14:51:11 +0100 Subject: [PATCH] Fix clippy lints --- src/handlers/blame.rs | 2 +- src/handlers/grep.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/handlers/blame.rs b/src/handlers/blame.rs index 5ec7e9ff..41b1c42b 100644 --- a/src/handlers/blame.rs +++ b/src/handlers/blame.rs @@ -78,7 +78,7 @@ impl<'a> StateMachine<'a> { if matches!(self.state, State::Unknown) { if let Some(lang) = utils::process::git_blame_filename_extension() .as_ref() - .or(self.config.default_language.as_ref()) + .or_else(|| self.config.default_language.as_ref()) { self.painter.set_syntax(Some(lang)); self.painter.set_highlighter(); diff --git a/src/handlers/grep.rs b/src/handlers/grep.rs index f49e3472..e8f115eb 100644 --- a/src/handlers/grep.rs +++ b/src/handlers/grep.rs @@ -58,7 +58,7 @@ impl<'a> StateMachine<'a> { // Emit syntax-highlighted code // TODO: Determine the language less frequently, e.g. only when the file changes. if let Some(lang) = handlers::diff_header::get_extension(&grep_line.path) - .or(self.config.default_language.as_deref()) + .or_else(|| self.config.default_language.as_deref()) { self.painter.set_syntax(Some(lang)); self.painter.set_highlighter();