diff --git a/crates/dht/src/bprotocol.rs b/crates/dht/src/bprotocol.rs index 9e3834d..4f7875e 100644 --- a/crates/dht/src/bprotocol.rs +++ b/crates/dht/src/bprotocol.rs @@ -170,7 +170,7 @@ pub struct Node { impl core::fmt::Debug for Node { fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - write!(f, "<{:?}; {}>", self.id, self.addr) + write!(f, "{}={:?}", self.addr, self.id) } } diff --git a/crates/dht/src/dht.rs b/crates/dht/src/dht.rs index 6aacea4..5f36a45 100644 --- a/crates/dht/src/dht.rs +++ b/crates/dht/src/dht.rs @@ -721,12 +721,20 @@ enum Request { Ping, } -#[derive(Debug)] enum ResponseOrError { Response(Response), Error(ErrorDescription), } +impl core::fmt::Debug for ResponseOrError { + fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { + match self { + Self::Response(r) => write!(f, "{r:?}"), + Self::Error(e) => write!(f, "{e:?}"), + } + } +} + struct DhtWorker { socket: UdpSocket, dht: Arc, diff --git a/crates/librqbit_core/src/id20.rs b/crates/librqbit_core/src/id20.rs index 2492f78..f5f0222 100644 --- a/crates/librqbit_core/src/id20.rs +++ b/crates/librqbit_core/src/id20.rs @@ -20,11 +20,9 @@ impl FromStr for Id20 { impl std::fmt::Debug for Id20 { fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { - write!(f, "<")?; for byte in self.0 { write!(f, "{byte:02x?}")?; } - write!(f, ">")?; Ok(()) } }