From e5c93ab928438e282f11f2bbd722a025a4eaee49 Mon Sep 17 00:00:00 2001
From: Jonas Platte <jplatte+git@posteo.de>
Date: Fri, 18 Jun 2021 13:40:32 +0200
Subject: [PATCH] identifiers: Fix up Rc / Arc conversions

---
 crates/ruma-identifiers/CHANGELOG.md       |  4 +++
 crates/ruma-identifiers/src/server_name.rs | 34 +++++++++-------------
 2 files changed, 18 insertions(+), 20 deletions(-)

diff --git a/crates/ruma-identifiers/CHANGELOG.md b/crates/ruma-identifiers/CHANGELOG.md
index d0b5efb3..8260ce1b 100644
--- a/crates/ruma-identifiers/CHANGELOG.md
+++ b/crates/ruma-identifiers/CHANGELOG.md
@@ -1,5 +1,9 @@
 # [unreleased]
 
+Improvement:
+
+* Add conversions of borrowed `ServerName`, `DeviceId` and `KeyName` to `Arc<_>` and `Rc<_>`
+
 # 0.19.2
 
 Improvements:
diff --git a/crates/ruma-identifiers/src/server_name.rs b/crates/ruma-identifiers/src/server_name.rs
index d826af1b..e59ea8c8 100644
--- a/crates/ruma-identifiers/src/server_name.rs
+++ b/crates/ruma-identifiers/src/server_name.rs
@@ -63,6 +63,20 @@ impl From<&ServerName> for Box<ServerName> {
     }
 }
 
+impl From<&ServerName> for Rc<ServerName> {
+    fn from(s: &ServerName) -> Self {
+        let rc = Rc::<str>::from(s.as_str());
+        unsafe { Rc::from_raw(Rc::into_raw(rc) as *const ServerName) }
+    }
+}
+
+impl From<&ServerName> for Arc<ServerName> {
+    fn from(s: &ServerName) -> Self {
+        let arc = Arc::<str>::from(s.as_str());
+        unsafe { Arc::from_raw(Arc::into_raw(arc) as *const ServerName) }
+    }
+}
+
 fn try_from<S>(server_name: S) -> Result<Box<ServerName>, crate::Error>
 where
     S: AsRef<str> + Into<Box<str>>,
@@ -114,26 +128,6 @@ impl TryFrom<&str> for Box<ServerName> {
     }
 }
 
-impl TryFrom<&ServerName> for Rc<ServerName> {
-    type Error = crate::Error;
-
-    fn try_from(s: &ServerName) -> Result<Self, Self::Error> {
-        validate(s.as_str())?;
-        let rc = Rc::<str>::from(s.as_str());
-        Ok(unsafe { Rc::from_raw(Rc::into_raw(rc) as *const ServerName) })
-    }
-}
-
-impl TryFrom<&ServerName> for Arc<ServerName> {
-    type Error = crate::Error;
-
-    fn try_from(s: &ServerName) -> Result<Self, Self::Error> {
-        validate(s.as_str())?;
-        let arc = Arc::<str>::from(s.as_str());
-        Ok(unsafe { Arc::from_raw(Arc::into_raw(arc) as *const ServerName) })
-    }
-}
-
 impl TryFrom<String> for Box<ServerName> {
     type Error = crate::Error;