From a744f4aae9ffee9dd246090bef486b09433778d0 Mon Sep 17 00:00:00 2001
From: DanConwayDev <DanConwayDev@protonmail.com>
Date: Fri, 2 May 2025 14:37:14 +0100
Subject: chore: nix flake update

update nix dependancies to latest version using default update options

run `cargo clippy --fix` and `cargo fmt` to fix new clippy errors
---
 src/lib/client.rs        |  8 +-------
 src/lib/git/nostr_url.rs |  2 +-
 src/lib/login/mod.rs     | 12 ++----------
 3 files changed, 4 insertions(+), 18 deletions(-)

(limited to 'src/lib')

diff --git a/src/lib/client.rs b/src/lib/client.rs
index 478a16a..3f2ae68 100644
--- a/src/lib/client.rs
+++ b/src/lib/client.rs
@@ -968,13 +968,7 @@ async fn create_relays_request(
     fallback_relays: HashSet<RelayUrl>,
 ) -> Result<FetchRequest> {
     let repo_ref = if let Some(trusted_maintainer_coordinate) = trusted_maintainer_coordinate {
-        if let Ok(repo_ref) =
-            get_repo_ref_from_cache(git_repo_path, trusted_maintainer_coordinate).await
-        {
-            Some(repo_ref)
-        } else {
-            None
-        }
+        (get_repo_ref_from_cache(git_repo_path, trusted_maintainer_coordinate).await).ok()
     } else {
         None
     };
diff --git a/src/lib/git/nostr_url.rs b/src/lib/git/nostr_url.rs
index 54be292..fe58962 100644
--- a/src/lib/git/nostr_url.rs
+++ b/src/lib/git/nostr_url.rs
@@ -327,7 +327,7 @@ impl FromStr for CloneUrl {
                 if s.contains('@') && s
                 .split('@')
                 .nth(0)
-                .map_or(false, |part| !part.contains('/')) {
+                .is_some_and(|part| !part.contains('/')) {
                     "ssh"
                 }
                 // otherwise assume unspecified
diff --git a/src/lib/login/mod.rs b/src/lib/login/mod.rs
index c37375f..bfc7328 100644
--- a/src/lib/login/mod.rs
+++ b/src/lib/login/mod.rs
@@ -93,11 +93,7 @@ pub async fn get_likely_logged_in_user(git_repo_path: &Path) -> Result<Option<Pu
     let git_repo = Repo::from_path(&git_repo_path.to_path_buf())?;
     Ok(
         if let Some(npub) = git_repo.get_git_config_item("nostr.npub", None)? {
-            if let Ok(pubic_key) = PublicKey::parse(&npub) {
-                Some(pubic_key)
-            } else {
-                None
-            }
+            PublicKey::parse(&npub).ok()
         } else {
             None
         },
@@ -107,11 +103,7 @@ pub async fn get_likely_logged_in_user(git_repo_path: &Path) -> Result<Option<Pu
 pub fn get_curent_user(git_repo: &Repo) -> Result<Option<PublicKey>> {
     Ok(
         if let Some(npub) = git_repo.get_git_config_item("nostr.npub", None)? {
-            if let Ok(public_key) = PublicKey::parse(&npub) {
-                Some(public_key)
-            } else {
-                None
-            }
+            PublicKey::parse(&npub).ok()
         } else {
             None
         },
-- 
cgit v1.2.3