From 4ee83e2fe5335a8afd78439c35f029c4a472e797 Mon Sep 17 00:00:00 2001
From: DanConwayDev <DanConwayDev@protonmail.com>
Date: Mon, 16 Dec 2024 09:00:46 +0000
Subject: chore: bump nix flake rust nightly `fmt` overlay

update the rust nightly `fmt` overlay which needs to be pinned
to a specific version (this case by date)

update formatting in main files via `cargo fmt`
---
 src/lib/git/mod.rs | 87 ++++++++++++++++++++++++------------------------------
 1 file changed, 38 insertions(+), 49 deletions(-)

(limited to 'src/lib/git/mod.rs')

diff --git a/src/lib/git/mod.rs b/src/lib/git/mod.rs
index 7a7ad5d..2b78f38 100644
--- a/src/lib/git/mod.rs
+++ b/src/lib/git/mod.rs
@@ -3,12 +3,12 @@ use std::{
     path::{Path, PathBuf},
 };
 
-use anyhow::{bail, Context, Result};
+use anyhow::{Context, Result, bail};
 use git2::{DiffOptions, Oid, Revwalk};
 pub use identify_ahead_behind::identify_ahead_behind;
 use nostr_sdk::{
-    hashes::{sha1::Hash as Sha1Hash, Hash},
     Tags,
+    hashes::{Hash, sha1::Hash as Sha1Hash},
 };
 
 use crate::git_events::{get_commit_id_from_patch, tag_value};
@@ -1493,10 +1493,10 @@ mod tests {
                     &oid_to_sha1(&feature_oid),
                 )?;
                 assert_eq!(ahead, vec![]);
-                assert_eq!(
-                    behind,
-                    vec![oid_to_sha1(&behind_2_oid), oid_to_sha1(&behind_1_oid),],
-                );
+                assert_eq!(behind, vec![
+                    oid_to_sha1(&behind_2_oid),
+                    oid_to_sha1(&behind_1_oid),
+                ],);
                 Ok(())
             }
 
@@ -1518,10 +1518,10 @@ mod tests {
                     &oid_to_sha1(&main_oid),
                     &oid_to_sha1(&ahead_2_oid),
                 )?;
-                assert_eq!(
-                    ahead,
-                    vec![oid_to_sha1(&ahead_2_oid), oid_to_sha1(&ahead_1_oid),],
-                );
+                assert_eq!(ahead, vec![
+                    oid_to_sha1(&ahead_2_oid),
+                    oid_to_sha1(&ahead_1_oid),
+                ],);
                 assert_eq!(behind, vec![]);
                 Ok(())
             }
@@ -1550,14 +1550,14 @@ mod tests {
                     &oid_to_sha1(&behind_2_oid),
                     &oid_to_sha1(&ahead_2_oid),
                 )?;
-                assert_eq!(
-                    ahead,
-                    vec![oid_to_sha1(&ahead_2_oid), oid_to_sha1(&ahead_1_oid)],
-                );
-                assert_eq!(
-                    behind,
-                    vec![oid_to_sha1(&behind_2_oid), oid_to_sha1(&behind_1_oid)],
-                );
+                assert_eq!(ahead, vec![
+                    oid_to_sha1(&ahead_2_oid),
+                    oid_to_sha1(&ahead_1_oid)
+                ],);
+                assert_eq!(behind, vec![
+                    oid_to_sha1(&behind_2_oid),
+                    oid_to_sha1(&behind_1_oid)
+                ],);
                 Ok(())
             }
         }
@@ -2212,10 +2212,9 @@ mod tests {
                 test_repo.populate_with_test_branch()?;
                 test_repo.checkout("main")?;
 
-                assert_eq!(
-                    git_repo.parse_starting_commits("HEAD~1")?,
-                    vec![str_to_sha1("431b84edc0d2fa118d63faa3c2db9c73d630a5ae")?],
-                );
+                assert_eq!(git_repo.parse_starting_commits("HEAD~1")?, vec![
+                    str_to_sha1("431b84edc0d2fa118d63faa3c2db9c73d630a5ae")?
+                ],);
                 Ok(())
             }
 
@@ -2225,10 +2224,9 @@ mod tests {
                 let git_repo = Repo::from_path(&test_repo.dir)?;
                 test_repo.populate_with_test_branch()?;
 
-                assert_eq!(
-                    git_repo.parse_starting_commits("HEAD~1")?,
-                    vec![str_to_sha1("82ff2bcc9aa94d1bd8faee723d4c8cc190d6061c")?],
-                );
+                assert_eq!(git_repo.parse_starting_commits("HEAD~1")?, vec![
+                    str_to_sha1("82ff2bcc9aa94d1bd8faee723d4c8cc190d6061c")?
+                ],);
                 Ok(())
             }
         }
@@ -2242,13 +2240,10 @@ mod tests {
                 test_repo.populate_with_test_branch()?;
                 test_repo.checkout("main")?;
 
-                assert_eq!(
-                    git_repo.parse_starting_commits("HEAD~2")?,
-                    vec![
-                        str_to_sha1("431b84edc0d2fa118d63faa3c2db9c73d630a5ae")?,
-                        str_to_sha1("af474d8d271490e5c635aad337abdc050034b16a")?,
-                    ],
-                );
+                assert_eq!(git_repo.parse_starting_commits("HEAD~2")?, vec![
+                    str_to_sha1("431b84edc0d2fa118d63faa3c2db9c73d630a5ae")?,
+                    str_to_sha1("af474d8d271490e5c635aad337abdc050034b16a")?,
+                ],);
                 Ok(())
             }
         }
@@ -2261,14 +2256,11 @@ mod tests {
                 let git_repo = Repo::from_path(&test_repo.dir)?;
                 test_repo.populate_with_test_branch()?;
 
-                assert_eq!(
-                    git_repo.parse_starting_commits("HEAD~3")?,
-                    vec![
-                        str_to_sha1("82ff2bcc9aa94d1bd8faee723d4c8cc190d6061c")?,
-                        str_to_sha1("a23e6b05aaeb7d1471b4a838b51f337d5644eeb0")?,
-                        str_to_sha1("7ab82116068982671a8111f27dc10599172334b2")?,
-                    ],
-                );
+                assert_eq!(git_repo.parse_starting_commits("HEAD~3")?, vec![
+                    str_to_sha1("82ff2bcc9aa94d1bd8faee723d4c8cc190d6061c")?,
+                    str_to_sha1("a23e6b05aaeb7d1471b4a838b51f337d5644eeb0")?,
+                    str_to_sha1("7ab82116068982671a8111f27dc10599172334b2")?,
+                ],);
                 Ok(())
             }
         }
@@ -2282,14 +2274,11 @@ mod tests {
                 test_repo.populate_with_test_branch()?;
                 test_repo.checkout("main")?;
 
-                assert_eq!(
-                    git_repo.parse_starting_commits("af474d8..a23e6b0")?,
-                    vec![
-                        str_to_sha1("a23e6b05aaeb7d1471b4a838b51f337d5644eeb0")?,
-                        str_to_sha1("7ab82116068982671a8111f27dc10599172334b2")?,
-                        str_to_sha1("431b84edc0d2fa118d63faa3c2db9c73d630a5ae")?,
-                    ],
-                );
+                assert_eq!(git_repo.parse_starting_commits("af474d8..a23e6b0")?, vec![
+                    str_to_sha1("a23e6b05aaeb7d1471b4a838b51f337d5644eeb0")?,
+                    str_to_sha1("7ab82116068982671a8111f27dc10599172334b2")?,
+                    str_to_sha1("431b84edc0d2fa118d63faa3c2db9c73d630a5ae")?,
+                ],);
                 Ok(())
             }
         }
-- 
cgit v1.2.3