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

Add a default debug_redacted impl to save space.

This commit is contained in:
Nick Mathewson 2022-11-23 13:04:18 -05:00
parent 29f903bdac
commit c62958c76f
3 changed files with 3 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
crates/safelog/src/impls.rs
View File

@ -9,20 +9,12 @@ impl Redactable for std::net::Ipv4Addr {
fn display_redacted(&self, f: &mut Formatter<'_>) -> fmt::Result {
write!(f, "{}.x.x.x", self.octets()[0])
}
fn debug_redacted(&self, f: &mut Formatter<'_>) -> fmt::Result {
self.display_redacted(f)
}
}
impl Redactable for std::net::Ipv6Addr {
fn display_redacted(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
write!(f, "{:x}:x:x:…", self.segments()[0])
}
fn debug_redacted(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
self.display_redacted(f)
}
}
impl Redactable for std::net::IpAddr {
@ -32,30 +24,18 @@ impl Redactable for std::net::IpAddr {
std::net::IpAddr::V6(v6) => v6.display_redacted(f),
}
}
fn debug_redacted(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
self.display_redacted(f)
}
}
impl Redactable for std::net::SocketAddrV4 {
fn display_redacted(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
write!(f, "{}:{}", self.ip().redacted(), self.port())
}
fn debug_redacted(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
self.display_redacted(f)
}
}
impl Redactable for std::net::SocketAddrV6 {
fn display_redacted(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
write!(f, "[{}]:{}", self.ip().redacted(), self.port())
}
fn debug_redacted(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
self.display_redacted(f)
}
}
impl Redactable for std::net::SocketAddr {
@ -65,8 +45,4 @@ impl Redactable for std::net::SocketAddr {
std::net::SocketAddr::V6(v6) => v6.display_redacted(f),
}
}
fn debug_redacted(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
self.display_redacted(f)
}
}

8
crates/safelog/src/lib.rs
View File

@ -211,7 +211,9 @@ pub trait Redactable: std::fmt::Display + std::fmt::Debug {
/// As `Display::fmt`, but produce a redacted representation.
fn display_redacted(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result;
/// As `Debug::fmt`, but produce a redacted representation.
fn debug_redacted(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result;
fn debug_redacted(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
self.display_redacted(f)
}
/// Return a smart pointer that will display or debug this object as its
/// redacted form.
fn redacted(&self) -> Redacted<&Self> {
@ -231,10 +233,6 @@ impl<'a, T: Redactable + ?Sized> Redactable for &'a T {
fn display_redacted(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
(*self).display_redacted(f)
}
fn debug_redacted(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
(*self).debug_redacted(f)
}
}
/// A wrapper around a `Redactable` that displays it in redacted format.

4
crates/tor-linkspec/src/transport.rs
View File

@ -300,10 +300,6 @@ impl Redactable for BridgeAddr {
BridgeAddr::None => write!(f, "{}", NONE_ADDR),
}
}
fn debug_redacted(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
self.display_redacted(f)
}
}
/// A set of options to be passed along to a pluggable transport along with a