vincenzopalazzo
/
arti
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

RelayId: impl Display in terms of RelayIdRef 

This removes a duplicated copy of the format strings.
This commit is contained in:
Ian Jackson 2023-04-27 18:54:25 +01:00
parent f9358183e0
commit 4b03795915
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
crates/tor-linkspec/src/ids.rs
View File

@ -5,6 +5,8 @@
//! modern identity that is an Ed25519 public key. This code lets us abstract
//! over those types, and over other new types that may exist in the future.
use std::fmt;
use derive_more::{Display, From};
use safelog::Redactable;
use tor_llcrypto::pk::{
@ -48,15 +50,19 @@ pub enum RelayIdType {
Rsa,
}
impl fmt::Display for RelayId {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
fmt::Display::fmt(&self.as_ref(), f)
}
}
/// A single relay identity.
#[derive(Debug, Clone, Copy, Eq, PartialEq, Ord, PartialOrd, Display, From, Hash)]
#[derive(Debug, Clone, Copy, Eq, PartialEq, Ord, PartialOrd, From, Hash)]
#[non_exhaustive]
pub enum RelayId {
/// An Ed25519 identity.
#[display(fmt = "ed25519:{}", _0)]
Ed25519(Ed25519Identity),
/// An RSA identity.
#[display(fmt = "{}", _0)]
Rsa(RsaIdentity),
}