MirroredRepos/bat
1
0
Fork 0
mirror of https://github.com/sharkdp/bat.git synced 2025-01-19 04:21:06 +00:00
Code Issues Releases Wiki Activity

Use deref coercion to simplify some argument passing

Browse Source
This commit is contained in:
Marcin Puc 2021-09-10 21:58:46 +02:00 committed by Martin Nordholts
parent 7956485e37
commit 4baa346aae
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/input.rs
View File

@ -50,7 +50,7 @@ impl InputDescription {
} }
pub fn title(&self) -> &String { pub fn title(&self) -> &String {
match self.title.as_ref() { match &self.title {
Some(title) => title, Some(title) => title,
None => &self.name, None => &self.name,
} }

2
src/printer.rs
View File

@ -395,7 +395,7 @@ impl<'a> Printer for InteractivePrinter<'a> {
return Ok(()); return Ok(());
} }
}; };
highlighter.highlight(line.as_ref(), self.syntax_set) highlighter.highlight(&line, self.syntax_set)
}; };
if out_of_range { if out_of_range {

2
src/syntax_mapping.rs
View File

@ -151,7 +151,7 @@ impl<'a> SyntaxMapping<'a> {
} }
pub(crate) fn get_syntax_for(&self, path: impl AsRef<Path>) -> Option<MappingTarget<'a>> { pub(crate) fn get_syntax_for(&self, path: impl AsRef<Path>) -> Option<MappingTarget<'a>> {
let candidate = Candidate::new(path.as_ref()); let candidate = Candidate::new(&path);
let candidate_filename = path.as_ref().file_name().map(Candidate::new); let candidate_filename = path.as_ref().file_name().map(Candidate::new);
for (ref glob, ref syntax) in self.mappings.iter().rev() { for (ref glob, ref syntax) in self.mappings.iter().rev() {
if glob.is_match_candidate(&candidate) if glob.is_match_candidate(&candidate)