Skip to content

nostr: remove UnwrapInfallible trait #1464

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
yukibtc merged 1 commit into from
Sep 19, 2026
Merged

nostr: remove UnwrapInfallible trait #1464

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 5 additions & 8 deletions nostr/src/nips/nip66.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down Expand Up @@ -75,23 +74,21 @@ 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")?)),
REQUIREMENT => {
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,
})
}
Expand Down
15 changes: 0 additions & 15 deletions nostr/src/util/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@

#[cfg(feature = "rand")]
use alloc::string::String;
use core::convert::Infallible;
#[cfg(feature = "std")]
use std::sync::LazyLock;

Expand Down Expand Up @@ -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 {},
}
}
}
Loading