Merge pull request #181 from arielf212/clippy-cleaning

Fixes basic clippy lints and runs clippy in the CI

Author: tummychow

.github/workflows/build.yml

@@ -32,6 +32,13 @@ jobs:
       - name: Check format
         run: cargo fmt --check
 
+  check-clippy:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Check clippy lints
+        run: cargo clippy
+
   build-man-page:
     name: build-man-page
     runs-on: ubuntu-latest

src/config.rs

@@ -32,14 +32,14 @@ pub fn unify<'config>(config: &'config Config, repo: &Repository) -> Config<'con
         // like we do here is no longer sufficient. but until then, this is fine.
         one_fixup_per_commit: config.one_fixup_per_commit
             || bool_value(
-                &repo,
+                repo,
                 ONE_FIXUP_PER_COMMIT_CONFIG_NAME,
                 ONE_FIXUP_PER_COMMIT_DEFAULT,
             ),
         force_author: config.force_author
-            || bool_value(&repo, FORCE_AUTHOR_CONFIG_NAME, FORCE_AUTHOR_DEFAULT),
+            || bool_value(repo, FORCE_AUTHOR_CONFIG_NAME, FORCE_AUTHOR_DEFAULT),
         force_detach: config.force_detach
-            || bool_value(&repo, FORCE_DETACH_CONFIG_NAME, FORCE_DETACH_DEFAULT),
+            || bool_value(repo, FORCE_DETACH_CONFIG_NAME, FORCE_DETACH_DEFAULT),
         ..*config
     }
 }
@@ -56,15 +56,15 @@ pub fn max_stack(repo: &git2::Repository) -> usize {
 
 pub fn auto_stage_if_nothing_staged(repo: &git2::Repository) -> bool {
     bool_value(
-        &repo,
+        repo,
         AUTO_STAGE_IF_NOTHING_STAGED_CONFIG_NAME,
         AUTO_STAGE_IF_NOTHING_STAGED_DEFAULT,
     )
 }
 
 pub fn fixup_target_always_sha(repo: &git2::Repository) -> bool {
     bool_value(
-        &repo,
+        repo,
         FIXUP_TARGET_ALWAYS_SHA_CONFIG_NAME,
         FIXUP_TARGET_ALWAYS_SHA_DEFAULT,
     )

src/lib.rs

@@ -26,7 +26,7 @@ pub fn run(logger: &slog::Logger, config: &Config) -> Result<()> {
     let repo = git2::Repository::open_from_env()?;
     debug!(logger, "repository found"; "path" => repo.path().to_str());
 
-    run_with_repo(&logger, &config, &repo)
+    run_with_repo(logger, config, &repo)
 }
 
 fn run_with_repo(logger: &slog::Logger, config: &Config, repo: &git2::Repository) -> Result<()> {
@@ -36,7 +36,7 @@ fn run_with_repo(logger: &slog::Logger, config: &Config, repo: &git2::Repository
         ));
     }
 
-    let config = config::unify(&config, repo);
+    let config = config::unify(config, repo);
     let stack = stack::working_stack(
         repo,
         config.base,
@@ -389,7 +389,7 @@ fn run_with_repo(logger: &slog::Logger, config: &Config, repo: &git2::Repository
         // This simplifies writing tests that execute from within git-absorb's source directory
         // but operate on temporary repositories created elsewhere.
         // (The tests could explicitly change directories, but then must be serialized.)
-        let repo_path = repo.path().parent().map(Path::to_str).flatten();
+        let repo_path = repo.path().parent().and_then(Path::to_str);
         match repo_path {
             Some(path) => {
                 command.args(["-C", path]);
@@ -823,7 +823,7 @@ mod tests {
         assert!(is_something_in_index);
 
         let pre_absorb_ref_commit = ctx.repo.references_glob("PRE_ABSORB_HEAD").unwrap().last();
-        assert!(matches!(pre_absorb_ref_commit, None));
+        assert!(pre_absorb_ref_commit.is_none());
     }
 
     #[test]
@@ -868,7 +868,7 @@ mod tests {
 
     fn autostage_common(ctx: &repo_utils::Context, file_path: &PathBuf) -> (PathBuf, PathBuf) {
         // 1 modification w/o staging
-        let path = ctx.join(&file_path);
+        let path = ctx.join(file_path);
         let contents = std::fs::read_to_string(&path).unwrap();
         let modifications = format!("{contents}\nnew_line2");
         std::fs::write(&path, &modifications).unwrap();

src/stack.rs

@@ -121,7 +121,6 @@ where
 
 #[cfg(test)]
 mod tests {
-    use tempfile;
 
     use super::*;
 

src/tests/repo_utils.rs

@@ -56,10 +56,10 @@ lines
 /// Stage the changes made to `path`.
 pub fn add<'r>(repo: &'r git2::Repository, path: &Path) -> git2::Tree<'r> {
     let mut index = repo.index().unwrap();
-    index.add_path(&path).unwrap();
+    index.add_path(path).unwrap();
     index.write().unwrap();
 
-    let tree_id = index.write_tree_to(&repo).unwrap();
+    let tree_id = index.write_tree_to(repo).unwrap();
     repo.find_tree(tree_id).unwrap()
 }
 
@@ -71,15 +71,15 @@ pub fn prepare_and_stage() -> Context {
 }
 
 /// Modify a file in the repository and stage the changes.
-pub fn stage_file_changes<'r>(ctx: &'r Context, file_path: &PathBuf) -> Tree<'r> {
+pub fn stage_file_changes<'r>(ctx: &'r Context, file_path: &Path) -> Tree<'r> {
     // add some lines to our file
-    let path = ctx.join(&file_path);
+    let path = ctx.join(file_path);
     let contents = std::fs::read_to_string(&path).unwrap();
     let modifications = format!("new_line1\n{contents}\nnew_line2");
     std::fs::write(&path, &modifications).unwrap();
 
     // stage it
-    add(&ctx.repo, &file_path)
+    add(&ctx.repo, file_path)
 }
 
 /// Set the named repository config option to value.