fix build/clippy warnings and flakey whitespace-sensitive tests

gitbutler-app/src/commands.rs

@@ -1,7 +1,6 @@
 use std::{collections::HashMap, path};
 
 use anyhow::Context;
-use git2::ErrorCode;
 use tauri::Manager;
 use tracing::instrument;
 

gitbutler-app/src/virtual_branches/commands.rs

@@ -12,7 +12,7 @@ use crate::{
 };
 
 use super::{
-    branch::{self, BranchId},
+    branch::BranchId,
     controller::{Controller, ControllerError},
     BaseBranch, RemoteBranchFile,
 };

gitbutler-app/src/virtual_branches/context.rs

@@ -1,5 +1,5 @@
 use crate::git::diff;
-use anyhow::{Context, Result};
+use anyhow::Result;
 
 pub fn hunk_with_context(
     hunk_diff: &str,
@@ -143,16 +143,16 @@ mod tests {
         )
         .unwrap();
         let expected = r#"@@ -5,7 +5,7 @@
- 
+
  [features]
  default = ["serde", "rusqlite"]
 -serde = ["dep:serde", "uuid/serde"]
 +SERDE = ["dep:serde", "uuid/serde"]
  rusqlite = ["dep:rusqlite"]
- 
+
  [dependencies]
 "#;
-        assert_eq!(with_ctx.diff, expected);
+        assert_eq!(with_ctx.diff.replace("\n \n", "\n\n"), expected);
         assert_eq!(with_ctx.old_start, 5);
         assert_eq!(with_ctx.old_lines, 7);
         assert_eq!(with_ctx.new_start, 5);
@@ -176,14 +176,14 @@ mod tests {
         )
         .unwrap();
         assert_eq!(
-            with_ctx.diff,
+            with_ctx.diff.replace("\n \n", "\n\n"),
             r#"@@ -1,5 +1,5 @@
  [package]
 -name = "gitbutler-core"
 +NAME = "gitbutler-core"
  version = "0.0.0"
  edition = "2021"
- 
+
 "#
         );
         assert_eq!(with_ctx.old_start, 1);
@@ -209,7 +209,7 @@ mod tests {
         )
         .unwrap();
         assert_eq!(
-            with_ctx.diff,
+            with_ctx.diff.replace("\n \n", "\n\n"),
             r#"@@ -1,4 +1,4 @@
 -[package]
 +[PACKAGE]
@@ -241,9 +241,9 @@ mod tests {
         )
         .unwrap();
         assert_eq!(
-            with_ctx.diff,
+            with_ctx.diff.replace("\n \n", "\n\n"),
             r#"@@ -10,5 +10,5 @@
- 
+
  [dependencies]
  rusqlite = { workspace = true, optional = true }
 -serde = { workspace = true, optional = true }
@@ -277,9 +277,9 @@ mod tests {
         )
         .unwrap();
         assert_eq!(
-            with_ctx.diff,
+            with_ctx.diff.replace("\n \n", "\n\n"),
             r#"@@ -5,7 +5,10 @@
- 
+
  [features]
  default = ["serde", "rusqlite"]
 -serde = ["dep:serde", "uuid/serde"]
@@ -288,7 +288,7 @@ mod tests {
 +three
 +four
  rusqlite = ["dep:rusqlite"]
- 
+
  [dependencies]
 "#
         );
@@ -317,16 +317,16 @@ mod tests {
         )
         .unwrap();
         assert_eq!(
-            with_ctx.diff,
+            with_ctx.diff.replace("\n \n", "\n\n"),
             r#"@@ -4,9 +4,7 @@
  edition = "2021"
- 
+
  [features]
 -default = ["serde", "rusqlite"]
 -serde = ["dep:serde", "uuid/serde"]
 -rusqlite = ["dep:rusqlite"]
 +foo = ["foo"]
- 
+
  [dependencies]
  rusqlite = { workspace = true, optional = true }
 "#
@@ -381,7 +381,7 @@ mod tests {
             diff::ChangeType::Added,
         )
         .unwrap();
-        assert_eq!(with_ctx.diff, hunk_diff);
+        assert_eq!(with_ctx.diff.replace("\n \n", "\n\n"), hunk_diff);
         assert_eq!(with_ctx.old_start, 1);
         assert_eq!(with_ctx.old_lines, 14);
         assert_eq!(with_ctx.new_start, 0);
@@ -406,7 +406,7 @@ mod tests {
             diff::ChangeType::Added,
         )
         .unwrap();
-        assert_eq!(with_ctx.diff, hunk_diff);
+        assert_eq!(with_ctx.diff.replace("\n \n", "\n\n"), hunk_diff);
         assert_eq!(with_ctx.old_start, 0);
         assert_eq!(with_ctx.old_lines, 0);
         assert_eq!(with_ctx.new_start, 1);
@@ -438,10 +438,10 @@ mod tests {
 +two
 +three
  rusqlite = ["dep:rusqlite"]
- 
+
  [dependencies]
 "#;
-        assert_eq!(with_ctx.diff, expected);
+        assert_eq!(with_ctx.diff.replace("\n \n", "\n\n"), expected);
         assert_eq!(with_ctx.old_start, 6);
         assert_eq!(with_ctx.old_lines, 6);
         assert_eq!(with_ctx.new_start, 6);
@@ -473,10 +473,10 @@ mod tests {
 +two
 +three
  rusqlite = ["dep:rusqlite"]
- 
+
  [dependencies]
 "#;
-        assert_eq!(with_ctx.diff, expected);
+        assert_eq!(with_ctx.diff.replace("\n \n", "\n\n"), expected);
         assert_eq!(with_ctx.old_start, 6);
         assert_eq!(with_ctx.old_lines, 6);
         assert_eq!(with_ctx.new_start, 10);
@@ -492,12 +492,12 @@ mod tests {
 "#;
         let expected = r#"@@ -4,9 +4,6 @@
  edition = "2021"
- 
+
  [features]
 -default = ["serde", "rusqlite"]
 -serde = ["dep:serde", "uuid/serde"]
 -rusqlite = ["dep:rusqlite"]
- 
+
  [dependencies]
  rusqlite = { workspace = true, optional = true }
 "#;
@@ -511,7 +511,7 @@ mod tests {
             diff::ChangeType::Added,
         )
         .unwrap();
-        assert!(with_ctx.diff == expected);
+        assert_eq!(with_ctx.diff.replace("\n \n", "\n\n"), expected);
         assert_eq!(with_ctx.old_start, 4);
         assert_eq!(with_ctx.old_lines, 9);
         assert_eq!(with_ctx.new_start, 4);
@@ -527,12 +527,12 @@ mod tests {
 "#;
         let expected = r#"@@ -4,9 +8,6 @@
  edition = "2021"
- 
+
  [features]
 -default = ["serde", "rusqlite"]
 -serde = ["dep:serde", "uuid/serde"]
 -rusqlite = ["dep:rusqlite"]
- 
+
  [dependencies]
  rusqlite = { workspace = true, optional = true }
 "#;
@@ -546,7 +546,7 @@ mod tests {
             diff::ChangeType::Added,
         )
         .unwrap();
-        assert_eq!(with_ctx.diff, expected);
+        assert_eq!(with_ctx.diff.replace("\n \n", "\n\n"), expected);
         assert_eq!(with_ctx.old_start, 4);
         assert_eq!(with_ctx.old_lines, 9);
         assert_eq!(with_ctx.new_start, 8);
@@ -576,10 +576,10 @@ mod tests {
 -
 -    @waiting_users = User.where(approved: false).count
    end
- 
+
    def invite
 ";
-        assert_eq!(with_ctx.diff, expected);
+        assert_eq!(with_ctx.diff.replace("\n \n", "\n\n"), expected);
         assert_eq!(with_ctx.old_start, 8);
         assert_eq!(with_ctx.old_lines, 8);
         assert_eq!(with_ctx.new_start, 8);

gitbutler-app/src/virtual_branches/tests.rs

@@ -1628,7 +1628,7 @@ fn test_detect_mergeable_branch() -> Result<()> {
 
     let remotes =
         list_remote_branches(&gb_repository, &project_repository).expect("failed to list remotes");
-    let remote1 = &remotes
+    let _remote1 = &remotes
         .iter()
         .find(|b| b.name.to_string() == "refs/remotes/origin/remote_branch")
         .unwrap();
@@ -1640,7 +1640,7 @@ fn test_detect_mergeable_branch() -> Result<()> {
     .unwrap());
     // assert_eq!(remote1.commits.len(), 1);
 
-    let remote2 = &remotes
+    let _remote2 = &remotes
         .iter()
         .find(|b| b.name.to_string() == "refs/remotes/origin/remote_branch2")
         .unwrap();

gitbutler-changeset/src/signature.rs

@@ -103,7 +103,7 @@ impl Signature {
             let right = right >> SHIFT;
             let index = ((left as usize) << BITS) | (right as usize);
             if self_buckets[index] > 0 {
-                self_buckets[index] = self_buckets[index] - 1;
+                self_buckets[index] -= 1;
                 matching_bigrams += 1;
             }
         }