Skip to content

Commit a217f1f

Browse files
committed
remove is_root bool from get_language
1 parent a254e46 commit a217f1f

File tree

2 files changed

+4
-8
lines changed

2 files changed

+4
-8
lines changed

src/info.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -307,7 +307,6 @@ impl Info {
307307
author_nb: usize,
308308
ignored_directories: Vec<&str>,
309309
) -> Result<Info> {
310-
let is_root_directory = dir == ".";
311310
let repo = Repository::discover(&dir).map_err(|_| Error::NotGitRepo)?;
312311
let workdir = repo.workdir().ok_or(Error::BareGitRepo)?;
313312
let workdir_str = workdir.to_str().unwrap();
@@ -323,7 +322,7 @@ impl Info {
323322
let creation_date = Info::get_creation_time(workdir_str)?;
324323
let project_license = Info::get_project_license(workdir_str)?;
325324
let (languages_stats, number_of_lines) =
326-
Language::get_language_stats(workdir_str, ignored_directories, is_root_directory)?;
325+
Language::get_language_stats(workdir_str, ignored_directories)?;
327326
let dominant_language = Language::get_dominant_language(languages_stats.clone());
328327

329328
Ok(Info {

src/language.rs

+3-6
Original file line numberDiff line numberDiff line change
@@ -355,9 +355,8 @@ impl Language {
355355
pub fn get_language_stats(
356356
dir: &str,
357357
exclude: Vec<&str>,
358-
is_root: bool,
359358
) -> Result<(Vec<(Language, f64)>, usize)> {
360-
let tokei_langs = project_languages(&dir, exclude, is_root);
359+
let tokei_langs = project_languages(&dir, exclude);
361360
let languages_stat =
362361
Language::get_languages_stat(&tokei_langs).ok_or(Error::SourceCodeNotFound)?;
363362
let mut stat_vec: Vec<(_, _)> = languages_stat.into_iter().collect();
@@ -379,7 +378,7 @@ fn get_total_loc(languages: &tokei::Languages) -> usize {
379378
.fold(0, |sum, val| sum + val.code)
380379
}
381380

382-
fn project_languages(dir: &str, exclude: Vec<&str>, is_root: bool) -> tokei::Languages {
381+
fn project_languages(dir: &str, exclude: Vec<&str>) -> tokei::Languages {
383382
use tokei::Config;
384383

385384
let mut languages = tokei::Languages::new();
@@ -389,9 +388,7 @@ fn project_languages(dir: &str, exclude: Vec<&str>, is_root: bool) -> tokei::Lan
389388
..Config::default()
390389
};
391390

392-
let d = if is_root { "." } else { dir };
393-
languages.get_statistics(&[&d], &exclude, &tokei_config);
394-
391+
languages.get_statistics(&[&dir], &exclude, &tokei_config);
395392
languages
396393
}
397394

0 commit comments

Comments
 (0)