diff --git a/src/assets.rs b/src/assets.rs index a15eae43..d731fc3f 100644 --- a/src/assets.rs +++ b/src/assets.rs @@ -351,7 +351,7 @@ impl HighlightingAssets { let file_path = Path::new(file_name); let mut syntax = None; if let Some(file_str) = file_path.to_str() { - for suffix in IGNORED_SUFFIXES.iter() { + for suffix in &IGNORED_SUFFIXES { if let Some(stripped_filename) = file_str.strip_suffix(suffix) { syntax = self.get_extension_syntax(OsStr::new(stripped_filename))?; break; diff --git a/src/bin/bat/main.rs b/src/bin/bat/main.rs index 938d3949..735c0b2b 100644 --- a/src/bin/bat/main.rs +++ b/src/bin/bat/main.rs @@ -91,7 +91,7 @@ pub fn get_languages(config: &Config) -> Result { .collect::>(); // Handling of file-extension conflicts, see issue #1076 - for lang in languages.iter_mut() { + for lang in &mut languages { let lang_name = lang.name.clone(); lang.file_extensions.retain(|extension| { // The 'extension' variable is not certainly a real extension. @@ -115,7 +115,7 @@ pub fn get_languages(config: &Config) -> Result { let configured_languages = get_syntax_mapping_to_paths(config.syntax_mapping.mappings()); - for lang in languages.iter_mut() { + for lang in &mut languages { if let Some(additional_paths) = configured_languages.get(lang.name.as_str()) { lang.file_extensions .extend(additional_paths.iter().cloned()); diff --git a/src/controller.rs b/src/controller.rs index 5e74c89e..a737f09b 100644 --- a/src/controller.rs +++ b/src/controller.rs @@ -175,8 +175,8 @@ impl<'b> Controller<'b> { let mut line_ranges: Vec = vec![]; if let Some(line_changes) = line_changes { - for line in line_changes.keys() { - let line = *line as usize; + for &line in line_changes.keys() { + let line = line as usize; line_ranges.push(LineRange::new(line - context, line + context)); } } diff --git a/src/printer.rs b/src/printer.rs index 6087c30b..bb4a022e 100644 --- a/src/printer.rs +++ b/src/printer.rs @@ -420,8 +420,7 @@ impl<'a> Printer for InteractivePrinter<'a> { let decorations = self .decorations .iter() - .map(|d| d.generate(line_number, false, self)) - .collect::>(); + .map(|d| d.generate(line_number, false, self)); for deco in decorations { write!(handle, "{} ", deco.text)?; @@ -435,7 +434,7 @@ impl<'a> Printer for InteractivePrinter<'a> { let colored_output = self.config.colored_output; let italics = self.config.use_italic_text; - for &(style, region) in regions.iter() { + for &(style, region) in ®ions { let text = &*self.preprocess(region, &mut cursor_total); let text_trimmed = text.trim_end_matches(|c| c == '\r' || c == '\n'); write!( @@ -472,7 +471,7 @@ impl<'a> Printer for InteractivePrinter<'a> { writeln!(handle)?; } } else { - for &(style, region) in regions.iter() { + for &(style, region) in ®ions { let ansi_iterator = AnsiCodeIterator::new(region); let mut ansi_prefix: String = String::new(); for chunk in ansi_iterator { diff --git a/src/syntax_mapping.rs b/src/syntax_mapping.rs index 2451a752..0477ff75 100644 --- a/src/syntax_mapping.rs +++ b/src/syntax_mapping.rs @@ -81,7 +81,7 @@ impl<'a> SyntaxMapping<'a> { .unwrap(); } - for glob in [ + for glob in &[ "**/systemd/**/*.conf", "**/systemd/**/*.example", "*.automount", @@ -100,9 +100,7 @@ impl<'a> SyntaxMapping<'a> { "*.swap", "*.target", "*.timer", - ] - .iter() - { + ] { mapping.insert(glob, MappingTarget::MapTo("INI")).unwrap(); }