From ac53bca7e315848864ff9e51703720b5b466bc42 Mon Sep 17 00:00:00 2001
From: DanConwayDev <DanConwayDev@protonmail.com>
Date: Wed, 16 Jul 2025 10:59:20 +0100
Subject: chore: bump nightly rustfmt

to latest available and apply fmt fixes
---
 src/bin/git_remote_nostr/push.rs  | 36 +++++++++++++++++++++++-------------
 src/bin/git_remote_nostr/utils.rs | 13 ++++++++-----
 src/bin/ngit/sub_commands/list.rs | 13 ++++++++-----
 src/bin/ngit/sub_commands/send.rs |  7 ++++---
 4 files changed, 43 insertions(+), 26 deletions(-)

(limited to 'src/bin')

diff --git a/src/bin/git_remote_nostr/push.rs b/src/bin/git_remote_nostr/push.rs
index 04fc4d8..9ff8af0 100644
--- a/src/bin/git_remote_nostr/push.rs
+++ b/src/bin/git_remote_nostr/push.rs
@@ -1049,10 +1049,13 @@ async fn get_merged_status_events(
             let (ahead, _) =
                 git_repo.get_commits_ahead_behind(&tip_of_remote_branch, &tip_of_pushed_branch)?;
 
-            let commit_events = get_events_from_local_cache(git_repo.get_path()?, vec![
-                nostr::Filter::default().kind(nostr::Kind::GitPatch),
-                // TODO: limit by repo_ref
-            ])
+            let commit_events = get_events_from_local_cache(
+                git_repo.get_path()?,
+                vec![
+                    nostr::Filter::default().kind(nostr::Kind::GitPatch),
+                    // TODO: limit by repo_ref
+                ],
+            )
             .await?;
 
             let merged_proposals_info =
@@ -1129,9 +1132,12 @@ async fn get_merged_proposals_info(
                         proposals.entry(proposal_id).or_default();
                     // ignore revisions without all the merged commits
                     if entry_revision_id == &revision_id {
-                        merged_patches.insert(*commit_hash, MergedPRCommitType::PatchCommit {
-                            event_id: patch_event.id,
-                        });
+                        merged_patches.insert(
+                            *commit_hash,
+                            MergedPRCommitType::PatchCommit {
+                                event_id: patch_event.id,
+                            },
+                        );
                     }
                 }
             }
@@ -1156,9 +1162,12 @@ async fn get_merged_proposals_info(
                             proposals.entry(proposal_id).or_default();
                         // ignore revisions without all the applied commits
                         if entry_revision_id == &revision_id {
-                            merged_patches.insert(*commit_hash, MergedPRCommitType::PatchApplied {
-                                event_id: patch_event.id,
-                            });
+                            merged_patches.insert(
+                                *commit_hash,
+                                MergedPRCommitType::PatchApplied {
+                                    event_id: patch_event.id,
+                                },
+                            );
                         }
                     }
                 }
@@ -1405,9 +1414,10 @@ async fn get_proposal_and_revision_root_from_patch(
                 .clone(),
         )?;
 
-        get_events_from_local_cache(git_repo.get_path()?, vec![
-            nostr::Filter::default().id(proposal_or_revision_id),
-        ])
+        get_events_from_local_cache(
+            git_repo.get_path()?,
+            vec![nostr::Filter::default().id(proposal_or_revision_id)],
+        )
         .await?
         .first()
         .unwrap()
diff --git a/src/bin/git_remote_nostr/utils.rs b/src/bin/git_remote_nostr/utils.rs
index f7e688e..dc75872 100644
--- a/src/bin/git_remote_nostr/utils.rs
+++ b/src/bin/git_remote_nostr/utils.rs
@@ -108,11 +108,14 @@ pub async fn get_open_or_draft_proposals(
             .collect();
 
     let statuses: Vec<nostr::Event> = {
-        let mut statuses = get_events_from_local_cache(git_repo_path, vec![
-            nostr::Filter::default()
-                .kinds(status_kinds().clone())
-                .events(proposals.iter().map(|e| e.id)),
-        ])
+        let mut statuses = get_events_from_local_cache(
+            git_repo_path,
+            vec![
+                nostr::Filter::default()
+                    .kinds(status_kinds().clone())
+                    .events(proposals.iter().map(|e| e.id)),
+            ],
+        )
         .await?;
         statuses.sort_by_key(|e| e.created_at);
         statuses.reverse();
diff --git a/src/bin/ngit/sub_commands/list.rs b/src/bin/ngit/sub_commands/list.rs
index 2c91e66..0330be1 100644
--- a/src/bin/ngit/sub_commands/list.rs
+++ b/src/bin/ngit/sub_commands/list.rs
@@ -49,11 +49,14 @@ pub async fn launch() -> Result<()> {
     }
 
     let statuses: Vec<nostr::Event> = {
-        let mut statuses = get_events_from_local_cache(git_repo_path, vec![
-            nostr::Filter::default()
-                .kinds(status_kinds().clone())
-                .events(proposals_and_revisions.iter().map(|e| e.id)),
-        ])
+        let mut statuses = get_events_from_local_cache(
+            git_repo_path,
+            vec![
+                nostr::Filter::default()
+                    .kinds(status_kinds().clone())
+                    .events(proposals_and_revisions.iter().map(|e| e.id)),
+            ],
+        )
         .await?;
         statuses.sort_by_key(|e| e.created_at);
         statuses.reverse();
diff --git a/src/bin/ngit/sub_commands/send.rs b/src/bin/ngit/sub_commands/send.rs
index 5a5acc8..c84e339 100644
--- a/src/bin/ngit/sub_commands/send.rs
+++ b/src/bin/ngit/sub_commands/send.rs
@@ -378,9 +378,10 @@ async fn get_root_proposal_id_and_mentions_from_in_reply_to(
                 public_key: _,
                 uppercase: false,
             }) => {
-                let events = get_events_from_local_cache(git_repo_path, vec![
-                    nostr::Filter::new().id(*event_id),
-                ])
+                let events = get_events_from_local_cache(
+                    git_repo_path,
+                    vec![nostr::Filter::new().id(*event_id)],
+                )
                 .await?;
 
                 if let Some(first) = events.iter().find(|e| e.id.eq(event_id)) {
-- 
cgit v1.2.3