git.iko.soy/bat
on master help sign in
Fix clippy warnings
e2ac6desharkdp
src/assets.rs+7−16
compare with master
unifiedsplit
@@ -57,10 +57,7 @@ impl HighlightingAssets {
57 )
57 )
58 })?;
58 })?;
59 let mut syntax_set: SyntaxSet = from_reader(syntax_set_file).map_err(|_| {
59 let mut syntax_set: SyntaxSet = from_reader(syntax_set_file).map_err(|_| {
60− io::Error::new(
61− io::ErrorKind::Other,
62− format!("Could not parse cached syntax set"),
60+ io::Error::new(io::ErrorKind::Other, "Could not parse cached syntax set")
63− )
64 })?;
61 })?;
65 syntax_set.link_syntaxes();
62 syntax_set.link_syntaxes();
66
63
@@ -70,12 +67,8 @@ impl HighlightingAssets {
70 theme_set_path.to_string_lossy()
67 theme_set_path.to_string_lossy()
71 )
68 )
72 })?;
69 })?;
73− let theme_set: ThemeSet = from_reader(theme_set_file).map_err(|_| {
70+ let theme_set: ThemeSet = from_reader(theme_set_file)
74− io::Error::new(
75− io::ErrorKind::Other,
76− format!("Could not parse cached theme set"),
71+ .map_err(|_| io::Error::new(io::ErrorKind::Other, "Could not parse cached theme set"))?;
77− )
78− })?;
79
72
80 Ok(HighlightingAssets {
73 Ok(HighlightingAssets {
81 syntax_set,
74 syntax_set,
@@ -134,12 +127,10 @@ impl HighlightingAssets {
134 }
127 }
135
128
136 pub fn default_theme(&self) -> Result<&Theme> {
129 pub fn default_theme(&self) -> Result<&Theme> {
137− Ok(self.theme_set.themes.get("Default").ok_or_else(|| {
130+ Ok(self.theme_set
138− io::Error::new(
131+ .themes
139− io::ErrorKind::Other,
132+ .get("Default")
140− format!("Could not find 'Default' theme"),
133+ .ok_or_else(|| io::Error::new(io::ErrorKind::Other, "Could not find 'Default' theme"))?)
141− )
142− })?)
143 }
134 }
144}
135}
145
136
src/main.rs+4−4
@@ -22,7 +22,7 @@ mod diff;
22mod printer;
22mod printer;
23mod terminal;
23mod terminal;
24
24
25−use std::collections::{HashMap, HashSet};
25+use std::collections::HashSet;
26use std::env;
26use std::env;
27use std::fs::{self, File};
27use std::fs::{self, File};
28use std::io::{self, BufRead, BufReader, Write};
28use std::io::{self, BufRead, BufReader, Write};
@@ -257,7 +257,7 @@ fn print_file(
257 break;
257 break;
258 }
258 }
259 Ok(_) => {
259 Ok(_) => {
260− if !line_buffer.ends_with("\n") {
260+ if !line_buffer.ends_with('\n') {
261 line_buffer.push('\n');
261 line_buffer.push('\n');
262 }
262 }
263 &line_buffer
263 &line_buffer
@@ -459,14 +459,14 @@ fn run() -> Result<()> {
459
459
460 let longest = languages
460 let longest = languages
461 .iter()
461 .iter()
462− .filter(|s| !s.hidden && s.file_extensions.len() > 0)
462+ .filter(|s| !s.hidden && !s.file_extensions.is_empty())
463 .map(|s| s.name.len())
463 .map(|s| s.name.len())
464 .max()
464 .max()
465 .unwrap_or(32); // Fallback width if they have no language definitions.
465 .unwrap_or(32); // Fallback width if they have no language definitions.
466
466
467 let separator = " ";
467 let separator = " ";
468 for lang in languages {
468 for lang in languages {
469− if lang.hidden || lang.file_extensions.len() == 0 {
469+ if lang.hidden || lang.file_extensions.is_empty() {
470 continue;
470 continue;
471 }
471 }
472 print!("{:width$}{}", lang.name, separator, width = longest);
472 print!("{:width$}{}", lang.name, separator, width = longest);
src/printer.rs+1−1
@@ -92,7 +92,7 @@ impl<'a> Printer<'a> {
92 decorations
92 decorations
93 .into_iter()
93 .into_iter()
94 .filter_map(|dec| if grid_requested {
94 .filter_map(|dec| if grid_requested {
95− Some(dec.unwrap_or(" ".to_owned()))
95+ Some(dec.unwrap_or_else(|| " ".to_owned()))
96 } else {
96 } else {
97 dec
97 dec
98 })
98 })