From 1779fb30e98b2e2305a68ba12ef8f28877e1ccb0 Mon Sep 17 00:00:00 2001 From: Ryan Troxler Date: Fri, 5 Oct 2018 08:19:15 -0500 Subject: [PATCH] rustfmt --- src/main.rs | 36 ++++++++++++++++++++++++------------ 1 file changed, 24 insertions(+), 12 deletions(-) diff --git a/src/main.rs b/src/main.rs index c28737cf0..f9938afd5 100644 --- a/src/main.rs +++ b/src/main.rs @@ -17,14 +17,21 @@ impl fmt::Display for Info { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { let mut s = String::from("\n"); let color = get_color(&self.language); - s.push_str(&("Project: ".color(color).bold().to_string() + &format!("{}\n", self.project_name))); - s.push_str(&("Language: ".color(color).bold().to_string() + &format!("{}\n", self.language))); + s.push_str( + &("Project: ".color(color).bold().to_string() + &format!("{}\n", self.project_name)), + ); + s.push_str( + &("Language: ".color(color).bold().to_string() + &format!("{}\n", self.language)), + ); s.push_str(&("Author: ".color(color).bold().to_string() + &format!("{}\n", self.author))); s.push_str(&("Repo: ".color(color).bold().to_string() + &format!("{}\n", self.repo))); - s.push_str(&("Number of lines: ".color(color).bold().to_string() + &format!("{}\n", self.number_of_lines))); + s.push_str( + &("Number of lines: ".color(color).bold().to_string() + + &format!("{}\n", self.number_of_lines)), + ); s.push_str(&("License: ".color(color).bold().to_string() + &format!("{}\n", self.license))); - let logo= self.get_ascii(); + let logo = self.get_ascii(); let mut lines = s.lines(); let left_pad = logo.lines().map(|l| l.len()).max().unwrap_or(0); let mut o = String::new(); @@ -33,7 +40,12 @@ impl fmt::Display for Info { Some(line) => line, None => "", }; - o.push_str(&format!("{:width$} {}\n", a.color(color).bold(), b, width = left_pad)); + o.push_str(&format!( + "{:width$} {}\n", + a.color(color).bold(), + b, + width = left_pad + )); } write!(f, "{}", o) @@ -58,7 +70,7 @@ enum Language { TypeScript, } -fn get_color(l : &Language) -> &str { +fn get_color(l: &Language) -> &str { match l { Language::C => "cyan", Language::Clojure => "cyan", @@ -101,7 +113,6 @@ impl fmt::Display for Language { } fn main() { - let language = match get_dominant_language() { Some(language) => language, None => { @@ -121,7 +132,6 @@ fn main() { }; println!("{}", info); - } /// Traverse current directory and search for dominant @@ -129,11 +139,13 @@ fn main() { fn get_dominant_language() -> Option { let mut languages = tokei::Languages::new(); let required_languages = get_all_language_types(); - languages.get_statistics( &["."], vec![".git", "target"], Some(required_languages)); + languages.get_statistics(&["."], vec![".git", "target"], Some(required_languages)); - languages.remove_empty().iter() - .max_by_key(|(_, v)| v.code) - .map(|(k, _)| Language::from(**k)) + languages + .remove_empty() + .iter() + .max_by_key(|(_, v)| v.code) + .map(|(k, _)| Language::from(**k)) } /// Convert from tokei LanguageType to known Language type .