From e147308277557a0fbbc4a346ce67c15ab0e7cc1a Mon Sep 17 00:00:00 2001
From: Jonas Platte <jplatte+git@posteo.de>
Date: Thu, 23 Sep 2021 18:54:03 +0200
Subject: [PATCH] identifiers: Improve readability of server_name methods

---
 crates/ruma-identifiers/src/mxc_uri.rs       | 4 ++--
 crates/ruma-identifiers/src/room_alias_id.rs | 4 ++--
 crates/ruma-identifiers/src/room_id.rs       | 4 ++--
 crates/ruma-identifiers/src/user_id.rs       | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/crates/ruma-identifiers/src/mxc_uri.rs b/crates/ruma-identifiers/src/mxc_uri.rs
index f3f0ca5b..c6dc53a0 100644
--- a/crates/ruma-identifiers/src/mxc_uri.rs
+++ b/crates/ruma-identifiers/src/mxc_uri.rs
@@ -2,7 +2,7 @@
 //!
 //! [MXC URI]: https://matrix.org/docs/spec/client_server/r0.6.1#mxc-uri
 
-use std::{convert::TryFrom, fmt, num::NonZeroU8};
+use std::{convert::TryInto, fmt, num::NonZeroU8};
 
 use ruma_identifiers_validation::{error::MxcUriError, mxc_uri::validate};
 
@@ -34,7 +34,7 @@ impl MxcUri {
     pub fn parts(&self) -> Result<(&ServerName, &str)> {
         self.extract_slash_idx().map(|idx| {
             (
-                <&ServerName>::try_from(&self.full_uri[6..idx.get() as usize]).unwrap(),
+                self.full_uri[6..idx.get() as usize].try_into().unwrap(),
                 &self.full_uri[idx.get() as usize + 1..],
             )
         })
diff --git a/crates/ruma-identifiers/src/room_alias_id.rs b/crates/ruma-identifiers/src/room_alias_id.rs
index 2d0b9456..41ec5117 100644
--- a/crates/ruma-identifiers/src/room_alias_id.rs
+++ b/crates/ruma-identifiers/src/room_alias_id.rs
@@ -1,6 +1,6 @@
 //! Matrix room alias identifiers.
 
-use std::{convert::TryFrom, fmt, num::NonZeroU8};
+use std::{convert::TryInto, fmt, num::NonZeroU8};
 
 use crate::server_name::ServerName;
 
@@ -37,7 +37,7 @@ impl RoomAliasId {
 
     /// Returns the server name of the room alias ID.
     pub fn server_name(&self) -> &ServerName {
-        <&ServerName>::try_from(&self.full_id[self.colon_idx.get() as usize + 1..]).unwrap()
+        self.full_id[self.colon_idx.get() as usize + 1..].try_into().unwrap()
     }
 }
 
diff --git a/crates/ruma-identifiers/src/room_id.rs b/crates/ruma-identifiers/src/room_id.rs
index 2ed5d2a0..93850f37 100644
--- a/crates/ruma-identifiers/src/room_id.rs
+++ b/crates/ruma-identifiers/src/room_id.rs
@@ -1,6 +1,6 @@
 //! Matrix room identifiers.
 
-use std::{convert::TryFrom, fmt, num::NonZeroU8};
+use std::{convert::TryInto, fmt, num::NonZeroU8};
 
 use crate::ServerName;
 
@@ -51,7 +51,7 @@ impl RoomId {
 
     /// Returns the server name of the room ID.
     pub fn server_name(&self) -> &ServerName {
-        <&ServerName>::try_from(&self.full_id[self.colon_idx.get() as usize + 1..]).unwrap()
+        self.full_id[self.colon_idx.get() as usize + 1..].try_into().unwrap()
     }
 }
 
diff --git a/crates/ruma-identifiers/src/user_id.rs b/crates/ruma-identifiers/src/user_id.rs
index 7449e4c8..629f6d99 100644
--- a/crates/ruma-identifiers/src/user_id.rs
+++ b/crates/ruma-identifiers/src/user_id.rs
@@ -1,6 +1,6 @@
 //! Matrix user identifiers.
 
-use std::{convert::TryFrom, fmt, num::NonZeroU8};
+use std::{convert::TryInto, fmt, num::NonZeroU8};
 
 use crate::ServerName;
 
@@ -82,7 +82,7 @@ impl UserId {
 
     /// Returns the server name of the user ID.
     pub fn server_name(&self) -> &ServerName {
-        <&ServerName>::try_from(&self.full_id[self.colon_idx.get() as usize + 1..]).unwrap()
+        self.full_id[self.colon_idx.get() as usize + 1..].try_into().unwrap()
     }
 
     /// Whether this user ID is a historical one.