11 files changed, 22 insertions, 66 deletions

diff --git a/flake.lock b/flake.lock
index a01b7d4..b89753c 100644
--- a/flake.lock
+++ b/flake.lock
@@ -20,11 +20,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1734119587,
-        "narHash": "sha256-AKU6qqskl0yf2+JdRdD0cfxX4b9x3KKV5RqA6wijmPM=",
+        "lastModified": 1746141548,
+        "narHash": "sha256-IgBWhX7A2oJmZFIrpRuMnw5RAufVnfvOgHWgIdds+hc=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "3566ab7246670a43abd2ffa913cc62dad9cdf7d5",
+        "rev": "f02fddb8acef29a8b32f10a335d44828d7825b78",
         "type": "github"
       },
       "original": {
@@ -36,11 +36,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1728538411,
-        "narHash": "sha256-f0SBJz1eZ2yOuKUr5CA9BHULGXVSn6miBuUWdTyhUhU=",
+        "lastModified": 1744536153,
+        "narHash": "sha256-awS2zRgF4uTwrOKwwiJcByDzDOdo3Q1rPZbiHQg/N38=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "b69de56fac8c2b6f8fd27f2eca01dcda8e0a4221",
+        "rev": "18dd725c29603f582cf1900e0d25f9f1063dbf11",
         "type": "github"
       },
       "original": {
@@ -62,11 +62,11 @@
         "nixpkgs": "nixpkgs_2"
       },
       "locked": {
-        "lastModified": 1734316514,
-        "narHash": "sha256-0aLx44yMblcOGpfFXKCzp2GhU5JaE6OTvdU+JYrXiUc=",
+        "lastModified": 1746153335,
+        "narHash": "sha256-vwKelhJJS8haCdH3t8uf96VFao7/YzJahPG5JLTO1PU=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "83ee8ff74d6294a7657320f16814754c4594127b",
+        "rev": "ebc7823c3ffde594c7733113042b72694d996de9",
         "type": "github"
       },
       "original": {
diff --git a/src/bin/git_remote_nostr/list.rs b/src/bin/git_remote_nostr/list.rs
index b802a4a..eba573b 100644
--- a/src/bin/git_remote_nostr/list.rs
+++ b/src/bin/git_remote_nostr/list.rs
@@ -33,12 +33,7 @@ pub async fn run_list(
     repo_ref: &RepoRef,
     for_push: bool,
 ) -> Result<HashMap<String, HashMap<String, String>>> {
-    let nostr_state =
-        if let Ok(nostr_state) = get_state_from_cache(Some(git_repo.get_path()?), repo_ref).await {
-            Some(nostr_state)
-        } else {
-            None
-        };
+    let nostr_state = (get_state_from_cache(Some(git_repo.get_path()?), repo_ref).await).ok();
 
     let term = console::Term::stderr();
 
@@ -169,7 +164,7 @@ async fn get_open_and_draft_proposals_state(
                                 .as_str(),
                         );
                     }
-                };
+                }
             }
         }
     }
diff --git a/src/bin/git_remote_nostr/push.rs b/src/bin/git_remote_nostr/push.rs
index 6113c0a..0cb1107 100644
--- a/src/bin/git_remote_nostr/push.rs
+++ b/src/bin/git_remote_nostr/push.rs
@@ -792,7 +792,7 @@ fn create_rejected_refspecs_and_remotes_refspecs(
                                     ).as_str(),
                                 )?;
                             }
-                        };
+                        }
                     } else {
                         // remote_value oid is not present locally
                         // TODO can we download the remote reference?
diff --git a/src/bin/ngit/sub_commands/export_keys.rs b/src/bin/ngit/sub_commands/export_keys.rs
index 45b1b89..4a32a3a 100644
--- a/src/bin/ngit/sub_commands/export_keys.rs
+++ b/src/bin/ngit/sub_commands/export_keys.rs
@@ -12,12 +12,7 @@ use crate::git::Repo;
 
 pub async fn launch() -> Result<()> {
     let git_repo_result = Repo::discover().context("failed to find a git repository");
-    let git_repo = {
-        match git_repo_result {
-            Ok(git_repo) => Some(git_repo),
-            Err(_) => None,
-        }
-    };
+    let git_repo = { git_repo_result.ok() };
 
     if let Ok((signer_info, source)) = get_signer_info(&git_repo.as_ref(), &None, &None, &None) {
         if let Ok((_, user_ref, source)) = load_existing_login(
diff --git a/src/bin/ngit/sub_commands/init.rs b/src/bin/ngit/sub_commands/init.rs
index 9c544d6..3c58a52 100644
--- a/src/bin/ngit/sub_commands/init.rs
+++ b/src/bin/ngit/sub_commands/init.rs
@@ -70,21 +70,11 @@ pub async fn launch(cli_args: &Cli, args: &SubCommandArgs) -> Result<()> {
 
     let mut client = Client::default();
 
-    let repo_coordinate = if let Ok(repo_coordinate) =
-        try_and_get_repo_coordinates_when_remote_unknown(&git_repo).await
-    {
-        Some(repo_coordinate)
-    } else {
-        None
-    };
+    let repo_coordinate = (try_and_get_repo_coordinates_when_remote_unknown(&git_repo).await).ok();
 
     let repo_ref = if let Some(repo_coordinate) = &repo_coordinate {
         fetching_with_report(git_repo_path, &client, repo_coordinate).await?;
-        if let Ok(repo_ref) = get_repo_ref_from_cache(Some(git_repo_path), repo_coordinate).await {
-            Some(repo_ref)
-        } else {
-            None
-        }
+        (get_repo_ref_from_cache(Some(git_repo_path), repo_coordinate).await).ok()
     } else {
         None
     };
diff --git a/src/bin/ngit/sub_commands/login.rs b/src/bin/ngit/sub_commands/login.rs
index 06236ec..e76a089 100644
--- a/src/bin/ngit/sub_commands/login.rs
+++ b/src/bin/ngit/sub_commands/login.rs
@@ -32,12 +32,7 @@ pub async fn launch(args: &Cli, command_args: &SubCommandArgs) -> Result<()> {
     };
 
     let git_repo_result = Repo::discover().context("failed to find a git repository");
-    let git_repo = {
-        match git_repo_result {
-            Ok(git_repo) => Some(git_repo),
-            Err(_) => None,
-        }
-    };
+    let git_repo = { git_repo_result.ok() };
 
     let (logged_out, log_in_locally_only) = logout(git_repo.as_ref(), command_args.local).await?;
     if logged_out || log_in_locally_only {
diff --git a/src/bin/ngit/sub_commands/logout.rs b/src/bin/ngit/sub_commands/logout.rs
index 2df96c8..da445b4 100644
--- a/src/bin/ngit/sub_commands/logout.rs
+++ b/src/bin/ngit/sub_commands/logout.rs
@@ -11,12 +11,7 @@ use crate::{
 
 pub async fn launch() -> Result<()> {
     let git_repo_result = Repo::discover().context("failed to find a git repository");
-    let git_repo = {
-        match git_repo_result {
-            Ok(git_repo) => Some(git_repo),
-            Err(_) => None,
-        }
-    };
+    let git_repo = { git_repo_result.ok() };
     logout(git_repo.as_ref()).await
 }
 
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
         },
diff --git a/tests/git_remote_nostr/push.rs b/tests/git_remote_nostr/push.rs
index 4e44642..d041a89 100644
--- a/tests/git_remote_nostr/push.rs
+++ b/tests/git_remote_nostr/push.rs
@@ -1020,7 +1020,7 @@ async fn proposal_three_way_merge_commit_pushed_to_main_leads_to_status_event_is
                 .any(|t| t.as_slice()[1].eq(&proposal_cover_letter_event.id.to_string()))
                 && e.kind.eq(&Kind::GitPatch)
         })
-        .last()
+        .next_back()
         .unwrap();
 
     assert_eq!(