chore: bump nightly rustfmt

to latest available and apply fmt fixes

7 files changed, 156 insertions, 117 deletions

diff --git a/src/lib/client.rs b/src/lib/client.rs
index 16cfe30..9253022 100644
--- a/src/lib/client.rs
+++ b/src/lib/client.rs
@@ -1103,16 +1103,18 @@ pub async fn get_state_from_cache(
 ) -> Result<RepoState> {
     if let Some(git_repo_path) = git_repo_path {
         RepoState::try_from(
-            get_events_from_local_cache(git_repo_path, vec![get_filter_state_events(
-                &repo_ref.coordinates(),
-            )])
+            get_events_from_local_cache(
+                git_repo_path,
+                vec![get_filter_state_events(&repo_ref.coordinates())],
+            )
             .await?,
         )
     } else {
         RepoState::try_from(
-            get_event_from_global_cache(git_repo_path, vec![get_filter_state_events(
-                &repo_ref.coordinates(),
-            )])
+            get_event_from_global_cache(
+                git_repo_path,
+                vec![get_filter_state_events(&repo_ref.coordinates())],
+            )
             .await?,
         )
     }
@@ -1178,17 +1180,20 @@ async fn create_relays_request(
         }
 
         if let Some(git_repo_path) = git_repo_path {
-            for event in &get_events_from_local_cache(git_repo_path, vec![
-                nostr::Filter::default()
-                    .kinds(vec![Kind::GitPatch])
-                    .custom_tags(
-                        SingleLetterTag::lowercase(nostr_sdk::Alphabet::A),
-                        repo_coordinates_without_relays
-                            .iter()
-                            .map(|c| c.coordinate.to_string())
-                            .collect::<Vec<String>>(),
-                    ),
-            ])
+            for event in &get_events_from_local_cache(
+                git_repo_path,
+                vec![
+                    nostr::Filter::default()
+                        .kinds(vec![Kind::GitPatch])
+                        .custom_tags(
+                            SingleLetterTag::lowercase(nostr_sdk::Alphabet::A),
+                            repo_coordinates_without_relays
+                                .iter()
+                                .map(|c| c.coordinate.to_string())
+                                .collect::<Vec<String>>(),
+                        ),
+                ],
+            )
             .await?
             {
                 if event_is_patch_set_root(event) || event_is_revision_root(event) {
@@ -1198,11 +1203,11 @@ async fn create_relays_request(
             }
         }
 
-        let profile_events =
-            get_event_from_global_cache(git_repo_path, vec![get_filter_contributor_profiles(
-                contributors.clone(),
-            )])
-            .await?;
+        let profile_events = get_event_from_global_cache(
+            git_repo_path,
+            vec![get_filter_contributor_profiles(contributors.clone())],
+        )
+        .await?;
         for c in &contributors {
             if let Some(event) = profile_events
                 .iter()
@@ -1768,17 +1773,20 @@ pub async fn get_proposals_and_revisions_from_cache(
     git_repo_path: &Path,
     repo_coordinates: HashSet<Nip19Coordinate>,
 ) -> Result<Vec<nostr::Event>> {
-    let mut proposals = get_events_from_local_cache(git_repo_path, vec![
-        nostr::Filter::default()
-            .kind(nostr::Kind::GitPatch)
-            .custom_tags(
-                nostr::SingleLetterTag::lowercase(nostr_sdk::Alphabet::A),
-                repo_coordinates
-                    .iter()
-                    .map(|c| c.coordinate.to_string())
-                    .collect::<Vec<String>>(),
-            ),
-    ])
+    let mut proposals = get_events_from_local_cache(
+        git_repo_path,
+        vec![
+            nostr::Filter::default()
+                .kind(nostr::Kind::GitPatch)
+                .custom_tags(
+                    nostr::SingleLetterTag::lowercase(nostr_sdk::Alphabet::A),
+                    repo_coordinates
+                        .iter()
+                        .map(|c| c.coordinate.to_string())
+                        .collect::<Vec<String>>(),
+                ),
+        ],
+    )
     .await?
     .iter()
     .filter(|e| event_is_patch_set_root(e))
@@ -1794,23 +1802,29 @@ pub async fn get_all_proposal_patch_events_from_cache(
     repo_ref: &RepoRef,
     proposal_id: &nostr::EventId,
 ) -> Result<Vec<nostr::Event>> {
-    let mut commit_events = get_events_from_local_cache(git_repo_path, vec![
-        nostr::Filter::default()
-            .kind(nostr::Kind::GitPatch)
-            .event(*proposal_id),
-        nostr::Filter::default()
-            .kind(nostr::Kind::GitPatch)
-            .id(*proposal_id),
-    ])
+    let mut commit_events = get_events_from_local_cache(
+        git_repo_path,
+        vec![
+            nostr::Filter::default()
+                .kind(nostr::Kind::GitPatch)
+                .event(*proposal_id),
+            nostr::Filter::default()
+                .kind(nostr::Kind::GitPatch)
+                .id(*proposal_id),
+        ],
+    )
     .await?;
 
-    let permissioned_users: HashSet<PublicKey> = [repo_ref.maintainers.clone(), vec![
-        commit_events
-            .iter()
-            .find(|e| e.id.eq(proposal_id))
-            .context("proposal not in cache")?
-            .pubkey,
-    ]]
+    let permissioned_users: HashSet<PublicKey> = [
+        repo_ref.maintainers.clone(),
+        vec![
+            commit_events
+                .iter()
+                .find(|e| e.id.eq(proposal_id))
+                .context("proposal not in cache")?
+                .pubkey,
+        ],
+    ]
     .concat()
     .iter()
     .copied()
@@ -1824,12 +1838,15 @@ pub async fn get_all_proposal_patch_events_from_cache(
         .collect();
 
     if !revision_roots.is_empty() {
-        for event in get_events_from_local_cache(git_repo_path, vec![
-            nostr::Filter::default()
-                .kind(nostr::Kind::GitPatch)
-                .events(revision_roots)
-                .authors(permissioned_users.clone()),
-        ])
+        for event in get_events_from_local_cache(
+            git_repo_path,
+            vec![
+                nostr::Filter::default()
+                    .kind(nostr::Kind::GitPatch)
+                    .events(revision_roots)
+                    .authors(permissioned_users.clone()),
+            ],
+        )
         .await?
         {
             commit_events.push(event);
@@ -1844,9 +1861,10 @@ pub async fn get_all_proposal_patch_events_from_cache(
 }
 
 pub async fn get_event_from_cache_by_id(git_repo: &Repo, event_id: &EventId) -> Result<Event> {
-    Ok(get_events_from_local_cache(git_repo.get_path()?, vec![
-        nostr::Filter::default().id(*event_id),
-    ])
+    Ok(get_events_from_local_cache(
+        git_repo.get_path()?,
+        vec![nostr::Filter::default().id(*event_id)],
+    )
     .await?
     .first()
     .context("failed to find event in cache")?
diff --git a/src/lib/git/identify_ahead_behind.rs b/src/lib/git/identify_ahead_behind.rs
index baea687..d736522 100644
--- a/src/lib/git/identify_ahead_behind.rs
+++ b/src/lib/git/identify_ahead_behind.rs
@@ -184,10 +184,10 @@ mod tests {
             identify_ahead_behind(&git_repo, &Some("feature".to_string()), &None)?;
 
         assert_eq!(from_branch, "feature");
-        assert_eq!(ahead, vec![
-            oid_to_sha1(&feature_oid),
-            oid_to_sha1(&dev_oid_first)
-        ]);
+        assert_eq!(
+            ahead,
+            vec![oid_to_sha1(&feature_oid), oid_to_sha1(&dev_oid_first)]
+        );
         assert_eq!(to_branch, "main");
         assert_eq!(behind, vec![]);
 
diff --git a/src/lib/git/mod.rs b/src/lib/git/mod.rs
index 464990b..d4bf2f5 100644
--- a/src/lib/git/mod.rs
+++ b/src/lib/git/mod.rs
@@ -1490,10 +1490,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(())
             }
 
@@ -1515,10 +1515,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(())
             }
@@ -1547,14 +1547,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(())
             }
         }
@@ -2209,9 +2209,10 @@ 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(())
             }
 
@@ -2221,9 +2222,10 @@ 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(())
             }
         }
@@ -2237,10 +2239,13 @@ 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(())
             }
         }
@@ -2253,11 +2258,14 @@ 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(())
             }
         }
@@ -2271,11 +2279,14 @@ 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(())
             }
         }
diff --git a/src/lib/git_events.rs b/src/lib/git_events.rs
index 3ce7637..69406c1 100644
--- a/src/lib/git_events.rs
+++ b/src/lib/git_events.rs
@@ -134,14 +134,15 @@ pub async fn generate_patch_event(
                     // code that makes it into the main branch, assuming
                     // the commit id is correct
                     Tag::from_standardized(TagStandard::Reference(commit.to_string())),
-                    Tag::custom(TagKind::Custom(std::borrow::Cow::Borrowed("alt")), vec![
-                        format!(
+                    Tag::custom(
+                        TagKind::Custom(std::borrow::Cow::Borrowed("alt")),
+                        vec![format!(
                             "git patch: {}",
                             git_repo
                                 .get_commit_message_summary(commit)
                                 .unwrap_or_default()
-                        ),
-                    ]),
+                        )],
+                    ),
                 ],
                 if let Some(thread_event_id) = thread_event_id {
                     vec![Tag::from_standardized(nostr_sdk::TagStandard::Event {
@@ -205,9 +206,10 @@ pub async fn generate_patch_event(
                     .collect(),
                 vec![
                     // a fallback is now in place to extract this from the patch
-                    Tag::custom(TagKind::Custom(std::borrow::Cow::Borrowed("commit")), vec![
-                        commit.to_string(),
-                    ]),
+                    Tag::custom(
+                        TagKind::Custom(std::borrow::Cow::Borrowed("commit")),
+                        vec![commit.to_string()],
+                    ),
                     // this is required as patches cannot be relied upon to include the 'base
                     // commit'
                     Tag::custom(
diff --git a/src/lib/login/mod.rs b/src/lib/login/mod.rs
index bfc7328..3fcd755 100644
--- a/src/lib/login/mod.rs
+++ b/src/lib/login/mod.rs
@@ -79,11 +79,15 @@ fn print_logged_in_as(
             "failed to find your relay list. consider using another nostr client to create one to enhance your nostr experience."
         );
     }
-    eprintln!("logged in as {}{}", user_ref.metadata.name, match source {
-        SignerInfoSource::CommandLineArguments => " via cli arguments",
-        SignerInfoSource::GitLocal => " to local repository",
-        SignerInfoSource::GitGlobal => "",
-    });
+    eprintln!(
+        "logged in as {}{}",
+        user_ref.metadata.name,
+        match source {
+            SignerInfoSource::CommandLineArguments => " via cli arguments",
+            SignerInfoSource::GitLocal => " to local repository",
+            SignerInfoSource::GitGlobal => "",
+        }
+    );
     Ok(())
 }
 
diff --git a/src/lib/repo_ref.rs b/src/lib/repo_ref.rs
index c1fc288..0236e34 100644
--- a/src/lib/repo_ref.rs
+++ b/src/lib/repo_ref.rs
@@ -578,11 +578,14 @@ pub fn save_repo_config_to_yaml(
                 .context("failed to convert public key into npub")?,
         );
     }
-    serde_yaml::to_writer(file, &RepoConfigYaml {
-        identifier: Some(identifier),
-        maintainers: maintainers_npubs,
-        relays,
-    })
+    serde_yaml::to_writer(
+        file,
+        &RepoConfigYaml {
+            identifier: Some(identifier),
+            maintainers: maintainers_npubs,
+            relays,
+        },
+    )
     .context("failed to write maintainers to maintainers.yaml file serde_yaml")
 }
 
diff --git a/src/lib/repo_state.rs b/src/lib/repo_state.rs
index 04f3cf2..345f05c 100644
--- a/src/lib/repo_state.rs
+++ b/src/lib/repo_state.rs
@@ -56,9 +56,10 @@ impl RepoState {
         add_head(&mut state);
         let mut tags = vec![Tag::identifier(identifier.clone())];
         for (name, value) in &state {
-            tags.push(Tag::custom(nostr_sdk::TagKind::Custom(name.into()), vec![
-                value.clone(),
-            ]));
+            tags.push(Tag::custom(
+                nostr_sdk::TagKind::Custom(name.into()),
+                vec![value.clone()],
+            ));
         }
         let event = sign_event(
             EventBuilder::new(STATE_KIND, "").tags(tags),