remove future::join! inside get_number_of_tags_branches + exclude non async func from future::join! #269

Author: o2sh

src/onefetch/info.rs

@@ -315,33 +315,29 @@ impl Info {
             Language::get_language_stats(workdir_str, &config.excluded)?;
 
         let (
-            (repository_name, repository_url),
             git_history,
             (number_of_tags, number_of_branches),
-            current_commit_info,
             (git_v, git_user),
             version,
             pending,
             repo_size,
-            project_license,
-            dominant_language,
         ) = futures::join!(
-            Info::get_repo_name_and_url(&repo),
             Info::get_git_history(workdir_str, config.no_merges),
             Info::get_number_of_tags_branches(workdir_str),
-            Info::get_current_commit_info(&repo),
             Info::get_git_version_and_username(workdir_str),
             Info::get_version(workdir_str),
             Info::get_pending_changes(workdir_str),
-            Info::get_packed_size(workdir_str),
-            Info::get_project_license(workdir_str),
-            Language::get_dominant_language(&languages_stats)
+            Info::get_packed_size(workdir_str)
         );
 
+        let (repository_name, repository_url) = Info::get_repo_name_and_url(&repo);
+        let current_commit_info = Info::get_current_commit_info(&repo);
         let creation_date = Info::get_creation_date(&git_history);
         let number_of_commits = Info::get_number_of_commits(&git_history);
         let authors = Info::get_authors(&git_history, config.number_of_authors);
         let last_change = Info::get_date_of_last_commit(&git_history);
+        let project_license = Info::get_project_license(workdir_str);
+        let dominant_language = Language::get_dominant_language(&languages_stats);
 
         Ok(Info {
             git_version: git_v,
@@ -385,7 +381,7 @@ impl Info {
     }
 
     async fn get_number_of_tags_branches(dir: &str) -> (usize, usize) {
-        let tags = async {
+        let tags = {
             let output = Command::new("git")
                 .args(vec!["-C", dir, "tag"])
                 .output()
@@ -397,7 +393,7 @@ impl Info {
             tags.lines().count()
         };
 
-        let branches = async {
+        let branches = {
             let output = Command::new("git")
                 .args(vec!["-C", dir, "branch", "-r"])
                 .output()
@@ -413,10 +409,10 @@ impl Info {
             }
         };
 
-        futures::join!(tags, branches)
+        (tags, branches)
     }
 
-    async fn get_repo_name_and_url(repo: &Repository) -> (String, String) {
+    fn get_repo_name_and_url(repo: &Repository) -> (String, String) {
         let config = repo
             .config()
             .chain_err(|| "Could not retrieve git configuration data");
@@ -451,7 +447,7 @@ impl Info {
         (repository_name, remote_url)
     }
 
-    async fn get_current_commit_info(repo: &Repository) -> Result<CommitInfo> {
+    fn get_current_commit_info(repo: &Repository) -> Result<CommitInfo> {
         let head = repo
             .head()
             .chain_err(|| "Error while retrieving reference information")?;
@@ -683,7 +679,7 @@ impl Info {
         Ok(output)
     }
 
-    async fn get_project_license(dir: &str) -> Result<String> {
+    fn get_project_license(dir: &str) -> Result<String> {
         fn is_license_file<S: AsRef<str>>(file_name: S) -> bool {
             LICENSE_FILES
                 .iter()

src/onefetch/language.rs

@@ -208,7 +208,7 @@ impl Language {
         Ok((stat_vec, loc))
     }
 
-    pub async fn get_dominant_language(languages_stat_vec: &[(Language, f64)]) -> Language {
+    pub fn get_dominant_language(languages_stat_vec: &[(Language, f64)]) -> Language {
         languages_stat_vec[0].0.clone()
     }
 }