skip get main language call if no language detected

Author: o2sh

src/info/langs/mod.rs

@@ -5,8 +5,8 @@ use strum::IntoEnumIterator;
 
 pub mod language;
 
-pub fn get_main_language(loc_by_language_opt: Option<&Vec<(Language, usize)>>) -> Option<Language> {
- loc_by_language_opt.map(|loc_by_language| loc_by_language[0].0)
+pub fn get_main_language(loc_by_language: &[(Language, usize)]) -> Language {
+ loc_by_language[0].0
 }
 
 /// Returns a vector of tuples containing all the languages detected inside the repository.
@@ -35,15 +35,12 @@ fn get_loc_by_language(languages: &tokei::Languages) -> Option<HashMap<Language,
  for (language_name, language) in languages {
  let loc = language::loc(language_name, language);
 
- if loc == 0 {
- continue;
+ if loc > 0 {
+ loc_by_language.insert(Language::from(*language_name), loc);
  }
-
- loc_by_language.insert(Language::from(*language_name), loc);
  }
 
- let total_loc: usize = loc_by_language.values().sum();
- if total_loc == 0 {
+ if loc_by_language.is_empty() {
  None
  } else {
  Some(loc_by_language)

src/info/mod.rs

@@ -159,7 +159,9 @@ pub fn build_info(cli_options: &CliOptions) -> Result<Info> {
  .join()
  .ok()
  .context("BUG: panic in language statistics thread")?;
- let dominant_language = langs::get_main_language(loc_by_language.as_ref());
+ let dominant_language = loc_by_language
+ .as_ref()
+ .map(|v| langs::get_main_language(v));
  let ascii_colors = get_ascii_colors(
  dominant_language.as_ref(),
  cli_options.ascii.ascii_language.as_ref(),