From 83ca4b4467e5457bc97c5d149045ca73f7072bb1 Mon Sep 17 00:00:00 2001
From: Awiteb <a@4rs.nl>
Date: Tue, 25 Aug 2026 14:49:28 +0000
Subject: [PATCH] nostr: remove UnwrapInfallible trait

Replace `UnwrapInfallible` with explicit `let Ok` and `match` patterns.
This removes the need for a custom trait and ensures any future change
in the error type will cause a compile error.

Signed-off-by: Awiteb <a@4rs.nl>
---
 nostr/src/nips/nip66.rs | 13 +++++--------
 nostr/src/util/mod.rs   | 15 ---------------
 2 files changed, 5 insertions(+), 23 deletions(-)

diff --git a/nostr/src/nips/nip66.rs b/nostr/src/nips/nip66.rs
index 763c4505b..52c0fbb54 100644
--- a/nostr/src/nips/nip66.rs
+++ b/nostr/src/nips/nip66.rs
@@ -15,7 +15,6 @@ use core::time::Duration;
 use super::util::{missing_tag_kind, missing_value, take_string, unknown_tag};
 use crate::error::Error;
 use crate::event::{Kind, Tag, impl_tag_codec_conversions};
-use crate::util::UnwrapInfallible;
 
 const RTT_OPEN: &str = "rtt-open";
 const RTT_READ: &str = "rtt-read";
@@ -75,15 +74,13 @@ impl_tag_codec_conversions! {
             RTT_READ => Ok(Self::RttRead(parse_time(iter, RTT_READ)?)),
             RTT_WRITE => Ok(Self::RttWrite(parse_time(iter, RTT_WRITE)?)),
             NETWORK_TYPE => {
-                let network_type = take_string(&mut iter, "network type")?
-                    .parse()
-                    .unwrap_infallible();
+                let Ok(network_type) = take_string(&mut iter, "network type")?
+                    .parse();
                 Ok(Self::NetworkType(network_type))
             }
             RELAY_TYPE => {
-                let relay_type = take_string(&mut iter, "relay type")?
-                    .parse()
-                    .unwrap_infallible();
+                let Ok(relay_type) = take_string(&mut iter, "relay type")?
+                    .parse();
                 Ok(Self::RelayType(relay_type))
             }
             NIP => Ok(Self::Nip(take_string(&mut iter, "NIP")?)),
@@ -91,7 +88,7 @@ impl_tag_codec_conversions! {
                 let value = take_string(&mut iter, "requirement")?;
                 let BoolTag { value, yes } = BoolTag::parse(&value);
                 Ok(Self::Requirement {
-                    requirement: value.parse().unwrap_infallible(),
+                    requirement: match Requirement::from_str(value) { Ok(r) => r },
                     is_required: yes,
                 })
             }
diff --git a/nostr/src/util/mod.rs b/nostr/src/util/mod.rs
index ceb4fe0b7..1a85daa98 100644
--- a/nostr/src/util/mod.rs
+++ b/nostr/src/util/mod.rs
@@ -4,7 +4,6 @@
 
 #[cfg(feature = "rand")]
 use alloc::string::String;
-use core::convert::Infallible;
 #[cfg(feature = "std")]
 use std::sync::LazyLock;
 
@@ -112,17 +111,3 @@ pub(crate) static SECP256K1: LazyLock<Secp256k1<All>> = LazyLock::new(|| {
 
     ctx
 });
-
-pub(crate) trait UnwrapInfallible<T>: Sized {
-    fn unwrap_infallible(self) -> T;
-}
-
-impl<T> UnwrapInfallible<T> for Result<T, Infallible> {
-    #[inline]
-    fn unwrap_infallible(self) -> T {
-        match self {
-            Ok(value) => value,
-            Err(e) => match e {},
-        }
-    }
-}