library:

added parelel as optinal (but default feature

Author: mendelsshop

TODO.md

@@ -23,3 +23,4 @@
   - [ ] add more and better ways to filter dates
   - [x] add filters for git specific stuff like author, committer, etc
   - [ ] ability to get a git repo from a url using something like git clone
+  - [ ] add support for other languages (currently only supports rust)

cargo-function-history/Cargo.toml

@@ -10,6 +10,11 @@ description = "cargo frontend for git-function-history"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
+# [features]
+# default = ["parallel"]
+# parallel = ["git_function_history/parallel", "function_history_backend_thread/parallel"]
+# not-parallel = ["git_function_history/default-features"]
+
 [dependencies]
 git_function_history = { path = "../git-function-history-lib", version = "0.6.0" }
 lazy_static = "1.3.0"

function_history_backend_thread/Cargo.toml

@@ -10,6 +10,12 @@ description = "threading and types for git-function-history"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
+
+# [features]
+# default = ["parallel"]
+# parallel = ["git_function_history/parallel"]
+# not-parallel = []
+
 [dependencies]
 git_function_history = { path = "../git-function-history-lib", version = "0.6.1" }
 log = "0.4"

git-function-history-gui/Cargo.toml

@@ -10,6 +10,11 @@ description = "GUI frontend for git-function-history"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
+# [features]
+# default = ["parallel"]
+# parallel = ["git_function_history/parallel", "function_history_backend_thread/parallel"]
+# not-parallel = ["git_function_history/default-features"]
+
 [dependencies]
 eframe = {version = "0.19.0", features = ["dark-light"]}
 git_function_history = { path = "../git-function-history-lib", version = "0.6.0" }

git-function-history-lib/Cargo.toml

@@ -8,8 +8,11 @@ keywords = ["git_function_history", "git", "function", ]
 categories = ["tools", "git"]
 description = "show function history from git"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+[features]
+default = ["parallel"]
+parallel = ["dep:rayon"]
 
 [dependencies]
 chrono = "0.4.22"
 ra_ap_syntax = "0.0.131"
-rayon = "1.5.3"
+rayon = { version = "1.5.1", optional = true }

git-function-history-lib/src/lib.rs

@@ -13,14 +13,17 @@
     clippy::missing_errors_doc,
     clippy::return_self_not_must_use
 )]
+
 /// Different types that can extracted from the result of `get_function_history`.
 pub mod types;
 use ra_ap_syntax::{
     ast::{self, HasDocComments, HasGenericParams, HasName},
     AstNode, SourceFile, SyntaxKind,
 };
+#[cfg(feature = "parallel")]
 use rayon::prelude::{IntoParallelRefIterator, ParallelIterator};
 
+
 use std::{collections::HashMap, error::Error, process::Command};
 pub use types::{
     Block, BlockType, CommitFunctions, File, Function, FunctionBlock, FunctionHistory,
@@ -188,8 +191,11 @@ pub fn get_function_history(
             Err("file is not a rust file")?;
         }
     }
-    file_history.commit_history = commits
-        .par_iter()
+    #[cfg(feature = "parallel")]
+    let t = commits.par_iter();
+    #[cfg(not(feature = "parallel"))]
+    let t = commits.iter();
+    file_history.commit_history = t
         .filter_map(|commit| {
             match &file {
                 FileType::Absolute(path) => match find_function_in_commit(commit.0, path, name) {
@@ -566,8 +572,11 @@ fn find_function_in_commit_with_filetype(
         }
     }
     let err = "no function found".to_string();
-    let returns: Vec<File> = files
-        .par_iter()
+    #[cfg(feature="parellel")]
+    let t = files.par_iter();
+    #[cfg(not(feature="parellel"))]
+    let t = files.iter();
+    let returns: Vec<File> = t
         .filter_map(|file| match find_function_in_commit(commit, file, name) {
             Ok(functions) => Some(File::new((*file).to_string(), functions)),
             Err(_) => None,

git-function-history-lib/src/types.rs

@@ -1,4 +1,5 @@
 use chrono::{DateTime, FixedOffset};
+#[cfg(feature = "parallel")]
 use rayon::prelude::{IntoParallelRefIterator, ParallelIterator};
 use std::{collections::HashMap, error::Error, fmt};
 
@@ -569,7 +570,7 @@ impl FunctionHistory {
     /// This will return a vector of all the commit hashess in the history.
     pub fn list_commit_hashes(&self) -> Vec<&str> {
         self.commit_history
-            .par_iter()
+            .iter()
             .map(|c| c.commit_hash.as_ref())
             .collect()
     }
@@ -647,9 +648,13 @@ impl FunctionHistory {
     /// history.filter_by(Filter::Directory("app".to_string())).unwrap();
     /// ```
     pub fn filter_by(&self, filter: &Filter) -> Result<Self, Box<dyn Error>> {
-        let vec: Vec<CommitFunctions> = self
-            .commit_history
-            .par_iter()
+        #[cfg(feature = "parallel")]
+        let t = self
+        .commit_history
+        .par_iter();
+        #[cfg(not(feature = "parallel"))]
+        let t = self.commit_history.iter();
+        let vec: Vec<CommitFunctions> = t
             .filter(|f| match filter {
                 Filter::FunctionInLines(..)
                 | Filter::FunctionWithParent(_)