From 7efee5a5af767fccf8ea38ea258a656a366791b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damir=20Jeli=C4=87?= <poljar@termina.org.uk>
Date: Thu, 26 Sep 2024 12:14:36 +0200
Subject: [PATCH] refactor: Rename UserIdentity to OtherUserIdentity in the
 crypto crate

---
 crates/matrix-sdk-crypto/src/error.rs           |  2 +-
 crates/matrix-sdk-crypto/src/identities/mod.rs  |  2 +-
 crates/matrix-sdk-crypto/src/identities/user.rs | 16 ++++++++--------
 crates/matrix-sdk-crypto/src/lib.rs             |  2 +-
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/crates/matrix-sdk-crypto/src/error.rs b/crates/matrix-sdk-crypto/src/error.rs
index 849538b94..3cae36746 100644
--- a/crates/matrix-sdk-crypto/src/error.rs
+++ b/crates/matrix-sdk-crypto/src/error.rs
@@ -27,7 +27,7 @@ use crate::{
     types::{events::room_key_withheld::WithheldCode, SignedKey},
 };
 #[cfg(doc)]
-use crate::{CollectStrategy, Device, LocalTrust, UserIdentity};
+use crate::{CollectStrategy, Device, LocalTrust, OtherUserIdentity};
 
 pub type OlmResult<T> = Result<T, OlmError>;
 pub type MegolmResult<T> = Result<T, MegolmError>;
diff --git a/crates/matrix-sdk-crypto/src/identities/mod.rs b/crates/matrix-sdk-crypto/src/identities/mod.rs
index 3708a31b8..1f51cdf03 100644
--- a/crates/matrix-sdk-crypto/src/identities/mod.rs
+++ b/crates/matrix-sdk-crypto/src/identities/mod.rs
@@ -53,7 +53,7 @@ pub use device::{Device, DeviceData, LocalTrust, UserDevices};
 pub(crate) use manager::IdentityManager;
 use serde::{Deserialize, Deserializer, Serializer};
 pub use user::{
-    OtherUserIdentityData, OwnUserIdentity, OwnUserIdentityData, UserIdentities, UserIdentity,
+    OtherUserIdentityData, OwnUserIdentity, OwnUserIdentityData, UserIdentities, OtherUserIdentity,
     UserIdentityData,
 };
 
diff --git a/crates/matrix-sdk-crypto/src/identities/user.rs b/crates/matrix-sdk-crypto/src/identities/user.rs
index 7b5af637c..e07057acb 100644
--- a/crates/matrix-sdk-crypto/src/identities/user.rs
+++ b/crates/matrix-sdk-crypto/src/identities/user.rs
@@ -47,7 +47,7 @@ pub enum UserIdentities {
     /// Our own user identity.
     Own(OwnUserIdentity),
     /// An identity belonging to another user.
-    Other(UserIdentity),
+    Other(OtherUserIdentity),
 }
 
 impl UserIdentities {
@@ -59,7 +59,7 @@ impl UserIdentities {
 
     /// Destructure the enum into an `UserIdentity` if it's of the correct
     /// type.
-    pub fn other(self) -> Option<UserIdentity> {
+    pub fn other(self) -> Option<OtherUserIdentity> {
         as_variant!(self, Self::Other)
     }
 
@@ -82,7 +82,7 @@ impl UserIdentities {
                 Self::Own(OwnUserIdentity { inner: i, verification_machine, store })
             }
             UserIdentityData::Other(i) => {
-                Self::Other(UserIdentity { inner: i, own_identity, verification_machine })
+                Self::Other(OtherUserIdentity { inner: i, own_identity, verification_machine })
             }
         }
     }
@@ -140,8 +140,8 @@ impl From<OwnUserIdentity> for UserIdentities {
     }
 }
 
-impl From<UserIdentity> for UserIdentities {
-    fn from(i: UserIdentity) -> Self {
+impl From<OtherUserIdentity> for UserIdentities {
+    fn from(i: OtherUserIdentity) -> Self {
         Self::Other(i)
     }
 }
@@ -268,13 +268,13 @@ impl OwnUserIdentity {
 /// This struct wraps a read-only version of the struct and allows verifications
 /// to be requested to verify our own device with the user identity.
 #[derive(Debug, Clone)]
-pub struct UserIdentity {
+pub struct OtherUserIdentity {
     pub(crate) inner: OtherUserIdentityData,
     pub(crate) own_identity: Option<OwnUserIdentityData>,
     pub(crate) verification_machine: VerificationMachine,
 }
 
-impl Deref for UserIdentity {
+impl Deref for OtherUserIdentity {
     type Target = OtherUserIdentityData;
 
     fn deref(&self) -> &Self::Target {
@@ -282,7 +282,7 @@ impl Deref for UserIdentity {
     }
 }
 
-impl UserIdentity {
+impl OtherUserIdentity {
     /// Is this user identity verified.
     pub fn is_verified(&self) -> bool {
         self.own_identity
diff --git a/crates/matrix-sdk-crypto/src/lib.rs b/crates/matrix-sdk-crypto/src/lib.rs
index 41c110a3b..8a4a22f1c 100644
--- a/crates/matrix-sdk-crypto/src/lib.rs
+++ b/crates/matrix-sdk-crypto/src/lib.rs
@@ -81,7 +81,7 @@ pub use file_encryption::{
 pub use gossiping::{GossipRequest, GossippedSecret};
 pub use identities::{
     Device, DeviceData, LocalTrust, OtherUserIdentityData, OwnUserIdentity, OwnUserIdentityData,
-    UserDevices, UserIdentities, UserIdentity, UserIdentityData,
+    UserDevices, UserIdentities, OtherUserIdentity, UserIdentityData,
 };
 pub use machine::{CrossSigningBootstrapRequests, EncryptionSyncChanges, OlmMachine};
 #[cfg(feature = "qrcode")]