From 1a87403ba241d7243104ba9db9e8a600d719d4c2 Mon Sep 17 00:00:00 2001
From: Jonas Platte <jplatte+git@posteo.de>
Date: Thu, 18 Nov 2021 19:49:40 +0100
Subject: [PATCH] Rewrite some Display & Debug implementations

To delete in a more obvious way and to include debug formatting for
Debug impls (i.e. enclose the string in quotes).
---
 crates/ruma-events/src/tag.rs                           | 2 +-
 crates/ruma-identifiers/src/device_key_id.rs            | 2 +-
 crates/ruma-identifiers/src/event_id.rs                 | 2 +-
 crates/ruma-identifiers/src/mxc_uri.rs                  | 4 ++--
 crates/ruma-identifiers/src/room_alias_id.rs            | 2 +-
 crates/ruma-identifiers/src/room_id.rs                  | 2 +-
 crates/ruma-identifiers/src/room_id_or_room_alias_id.rs | 2 +-
 crates/ruma-identifiers/src/user_id.rs                  | 2 +-
 8 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/crates/ruma-events/src/tag.rs b/crates/ruma-events/src/tag.rs
index e1f627f3..d93e5c07 100644
--- a/crates/ruma-events/src/tag.rs
+++ b/crates/ruma-events/src/tag.rs
@@ -140,7 +140,7 @@ where
 
 impl fmt::Display for TagName {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        f.write_str(self.as_ref())
+        self.as_ref().fmt(f)
     }
 }
 
diff --git a/crates/ruma-identifiers/src/device_key_id.rs b/crates/ruma-identifiers/src/device_key_id.rs
index eabf66c1..d250986c 100644
--- a/crates/ruma-identifiers/src/device_key_id.rs
+++ b/crates/ruma-identifiers/src/device_key_id.rs
@@ -13,7 +13,7 @@ pub struct DeviceKeyId {
 
 impl fmt::Debug for DeviceKeyId {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        f.write_str(&self.full_id)
+        self.full_id.fmt(f)
     }
 }
 
diff --git a/crates/ruma-identifiers/src/event_id.rs b/crates/ruma-identifiers/src/event_id.rs
index ea5401e2..eee78412 100644
--- a/crates/ruma-identifiers/src/event_id.rs
+++ b/crates/ruma-identifiers/src/event_id.rs
@@ -45,7 +45,7 @@ pub struct EventId {
 
 impl fmt::Debug for EventId {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        f.write_str(&self.full_id)
+        self.full_id.fmt(f)
     }
 }
 
diff --git a/crates/ruma-identifiers/src/mxc_uri.rs b/crates/ruma-identifiers/src/mxc_uri.rs
index cea8fa8f..f286ff13 100644
--- a/crates/ruma-identifiers/src/mxc_uri.rs
+++ b/crates/ruma-identifiers/src/mxc_uri.rs
@@ -66,13 +66,13 @@ impl MxcUri {
 
 impl fmt::Debug for MxcUri {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        f.write_str(&self.full_uri)
+        self.full_uri.fmt(f)
     }
 }
 
 impl fmt::Display for MxcUri {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        f.write_str(&self.full_uri)
+        self.full_uri.fmt(f)
     }
 }
 
diff --git a/crates/ruma-identifiers/src/room_alias_id.rs b/crates/ruma-identifiers/src/room_alias_id.rs
index 769e4433..7ecaea10 100644
--- a/crates/ruma-identifiers/src/room_alias_id.rs
+++ b/crates/ruma-identifiers/src/room_alias_id.rs
@@ -25,7 +25,7 @@ pub struct RoomAliasId {
 
 impl fmt::Debug for RoomAliasId {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        f.write_str(&self.full_id)
+        self.full_id.fmt(f)
     }
 }
 
diff --git a/crates/ruma-identifiers/src/room_id.rs b/crates/ruma-identifiers/src/room_id.rs
index fe28ffce..731b2f26 100644
--- a/crates/ruma-identifiers/src/room_id.rs
+++ b/crates/ruma-identifiers/src/room_id.rs
@@ -25,7 +25,7 @@ pub struct RoomId {
 
 impl fmt::Debug for RoomId {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        f.write_str(&self.full_id)
+        self.full_id.fmt(f)
     }
 }
 
diff --git a/crates/ruma-identifiers/src/room_id_or_room_alias_id.rs b/crates/ruma-identifiers/src/room_id_or_room_alias_id.rs
index 7df9a762..27d7accc 100644
--- a/crates/ruma-identifiers/src/room_id_or_room_alias_id.rs
+++ b/crates/ruma-identifiers/src/room_id_or_room_alias_id.rs
@@ -36,7 +36,7 @@ pub struct RoomIdOrAliasId {
 
 impl fmt::Debug for RoomIdOrAliasId {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        f.write_str(&self.full_id)
+        self.full_id.fmt(f)
     }
 }
 
diff --git a/crates/ruma-identifiers/src/user_id.rs b/crates/ruma-identifiers/src/user_id.rs
index 22a72d3f..3530979c 100644
--- a/crates/ruma-identifiers/src/user_id.rs
+++ b/crates/ruma-identifiers/src/user_id.rs
@@ -32,7 +32,7 @@ pub struct UserId {
 
 impl fmt::Debug for UserId {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        f.write_str(&self.full_id)
+        self.full_id.fmt(f)
     }
 }