From 4baa346aaea6bc9f1eff7f903385db3041dd64b6 Mon Sep 17 00:00:00 2001 From: Marcin Puc Date: Fri, 10 Sep 2021 21:58:46 +0200 Subject: [PATCH] Use deref coercion to simplify some argument passing --- src/input.rs | 2 +- src/printer.rs | 2 +- src/syntax_mapping.rs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/input.rs b/src/input.rs index e71d07f3..05203d4d 100644 --- a/src/input.rs +++ b/src/input.rs @@ -50,7 +50,7 @@ impl InputDescription { } pub fn title(&self) -> &String { - match self.title.as_ref() { + match &self.title { Some(title) => title, None => &self.name, } diff --git a/src/printer.rs b/src/printer.rs index bb4a022e..4eed0306 100644 --- a/src/printer.rs +++ b/src/printer.rs @@ -395,7 +395,7 @@ impl<'a> Printer for InteractivePrinter<'a> { return Ok(()); } }; - highlighter.highlight(line.as_ref(), self.syntax_set) + highlighter.highlight(&line, self.syntax_set) }; if out_of_range { diff --git a/src/syntax_mapping.rs b/src/syntax_mapping.rs index 0477ff75..36b7bc3e 100644 --- a/src/syntax_mapping.rs +++ b/src/syntax_mapping.rs @@ -151,7 +151,7 @@ impl<'a> SyntaxMapping<'a> { } pub(crate) fn get_syntax_for(&self, path: impl AsRef) -> Option> { - let candidate = Candidate::new(path.as_ref()); + let candidate = Candidate::new(&path); let candidate_filename = path.as_ref().file_name().map(Candidate::new); for (ref glob, ref syntax) in self.mappings.iter().rev() { if glob.is_match_candidate(&candidate)