From 4ee83e2fe5335a8afd78439c35f029c4a472e797 Mon Sep 17 00:00:00 2001 From: DanConwayDev Date: Mon, 16 Dec 2024 09:00:46 +0000 Subject: chore: bump nix flake rust nightly `fmt` overlay update the rust nightly `fmt` overlay which needs to be pinned to a specific version (this case by date) update formatting in main files via `cargo fmt` --- src/lib/git/nostr_url.rs | 136 +++++++++++++++++++++-------------------------- 1 file changed, 62 insertions(+), 74 deletions(-) (limited to 'src/lib/git/nostr_url.rs') diff --git a/src/lib/git/nostr_url.rs b/src/lib/git/nostr_url.rs index 4fbc786..6b38a93 100644 --- a/src/lib/git/nostr_url.rs +++ b/src/lib/git/nostr_url.rs @@ -1,11 +1,11 @@ use core::fmt; use std::{collections::HashMap, str::FromStr}; -use anyhow::{anyhow, bail, Context, Error, Result}; +use anyhow::{Context, Error, Result, anyhow, bail}; use nostr::nips::{nip01::Coordinate, nip05}; use nostr_sdk::{PublicKey, RelayUrl, ToBech32, Url}; -use super::{get_git_config_item, save_git_config_item, Repo}; +use super::{Repo, get_git_config_item, save_git_config_item}; #[derive(Debug, PartialEq, Default, Clone)] pub enum ServerProtocol { @@ -961,24 +961,21 @@ mod tests { #[test] fn standard() -> Result<()> { assert_eq!( - format!( - "{}", - NostrUrlDecoded { - original_string: String::new(), - coordinate: Coordinate { - identifier: "ngit".to_string(), - public_key: PublicKey::parse( - "npub15qydau2hjma6ngxkl2cyar74wzyjshvl65za5k5rl69264ar2exs5cyejr", - ) - .unwrap(), - kind: nostr_sdk::Kind::GitRepoAnnouncement, - relays: vec![RelayUrl::parse("wss://nos.lol").unwrap()], - }, - protocol: None, - user: None, - nip05: None, - } - ), + format!("{}", NostrUrlDecoded { + original_string: String::new(), + coordinate: Coordinate { + identifier: "ngit".to_string(), + public_key: PublicKey::parse( + "npub15qydau2hjma6ngxkl2cyar74wzyjshvl65za5k5rl69264ar2exs5cyejr", + ) + .unwrap(), + kind: nostr_sdk::Kind::GitRepoAnnouncement, + relays: vec![RelayUrl::parse("wss://nos.lol").unwrap()], + }, + protocol: None, + user: None, + nip05: None, + }), "nostr://npub15qydau2hjma6ngxkl2cyar74wzyjshvl65za5k5rl69264ar2exs5cyejr/nos.lol/ngit", ); Ok(()) @@ -987,24 +984,21 @@ mod tests { #[test] fn no_relay() -> Result<()> { assert_eq!( - format!( - "{}", - NostrUrlDecoded { - original_string: String::new(), - coordinate: Coordinate { - identifier: "ngit".to_string(), - public_key: PublicKey::parse( - "npub15qydau2hjma6ngxkl2cyar74wzyjshvl65za5k5rl69264ar2exs5cyejr", - ) - .unwrap(), - kind: nostr_sdk::Kind::GitRepoAnnouncement, - relays: vec![], - }, - protocol: None, - user: None, - nip05: None, - } - ), + format!("{}", NostrUrlDecoded { + original_string: String::new(), + coordinate: Coordinate { + identifier: "ngit".to_string(), + public_key: PublicKey::parse( + "npub15qydau2hjma6ngxkl2cyar74wzyjshvl65za5k5rl69264ar2exs5cyejr", + ) + .unwrap(), + kind: nostr_sdk::Kind::GitRepoAnnouncement, + relays: vec![], + }, + protocol: None, + user: None, + nip05: None, + }), "nostr://npub15qydau2hjma6ngxkl2cyar74wzyjshvl65za5k5rl69264ar2exs5cyejr/ngit", ); Ok(()) @@ -1013,24 +1007,21 @@ mod tests { #[test] fn with_protocol() -> Result<()> { assert_eq!( - format!( - "{}", - NostrUrlDecoded { - original_string: String::new(), - coordinate: Coordinate { - identifier: "ngit".to_string(), - public_key: PublicKey::parse( - "npub15qydau2hjma6ngxkl2cyar74wzyjshvl65za5k5rl69264ar2exs5cyejr", - ) - .unwrap(), - kind: nostr_sdk::Kind::GitRepoAnnouncement, - relays: vec![RelayUrl::parse("wss://nos.lol").unwrap()], - }, - protocol: Some(ServerProtocol::Ssh), - user: None, - nip05: None, - } - ), + format!("{}", NostrUrlDecoded { + original_string: String::new(), + coordinate: Coordinate { + identifier: "ngit".to_string(), + public_key: PublicKey::parse( + "npub15qydau2hjma6ngxkl2cyar74wzyjshvl65za5k5rl69264ar2exs5cyejr", + ) + .unwrap(), + kind: nostr_sdk::Kind::GitRepoAnnouncement, + relays: vec![RelayUrl::parse("wss://nos.lol").unwrap()], + }, + protocol: Some(ServerProtocol::Ssh), + user: None, + nip05: None, + }), "nostr://ssh/npub15qydau2hjma6ngxkl2cyar74wzyjshvl65za5k5rl69264ar2exs5cyejr/nos.lol/ngit", ); Ok(()) @@ -1039,24 +1030,21 @@ mod tests { #[test] fn with_protocol_and_user() -> Result<()> { assert_eq!( - format!( - "{}", - NostrUrlDecoded { - original_string: String::new(), - coordinate: Coordinate { - identifier: "ngit".to_string(), - public_key: PublicKey::parse( - "npub15qydau2hjma6ngxkl2cyar74wzyjshvl65za5k5rl69264ar2exs5cyejr", - ) - .unwrap(), - kind: nostr_sdk::Kind::GitRepoAnnouncement, - relays: vec![RelayUrl::parse("wss://nos.lol").unwrap()], - }, - protocol: Some(ServerProtocol::Ssh), - user: Some("bla".to_string()), - nip05: None, - } - ), + format!("{}", NostrUrlDecoded { + original_string: String::new(), + coordinate: Coordinate { + identifier: "ngit".to_string(), + public_key: PublicKey::parse( + "npub15qydau2hjma6ngxkl2cyar74wzyjshvl65za5k5rl69264ar2exs5cyejr", + ) + .unwrap(), + kind: nostr_sdk::Kind::GitRepoAnnouncement, + relays: vec![RelayUrl::parse("wss://nos.lol").unwrap()], + }, + protocol: Some(ServerProtocol::Ssh), + user: Some("bla".to_string()), + nip05: None, + }), "nostr://bla@ssh/npub15qydau2hjma6ngxkl2cyar74wzyjshvl65za5k5rl69264ar2exs5cyejr/nos.lol/ngit", ); Ok(()) -- cgit v1.2.3