common: Merge ruma-identifiers into ruma-common

.github/CODEOWNERS

@@ -1,7 +1,6 @@
 *                                      @jplatte
 /crates/ruma-common/                   @iinuwa
 /crates/ruma-federation-api/           @DevinR528
-/crates/ruma-identifiers/              @iinuwa
 /crates/ruma-identifiers-validation/   @iinuwa
 /crates/ruma-identity-service-api/     @iinuwa
 /crates/ruma-macros/                   @ruma/macro-owners

crates/ruma-appservice-api/Cargo.toml

@@ -22,7 +22,6 @@ server = []
 [dependencies]
 ruma-client-api = { version = "0.13.0", path = "../ruma-client-api", features = ["client"], optional = true }
 ruma-common = { version = "0.8.0", path = "../ruma-common", features = ["api", "events"] }
-ruma-identifiers = { version = "0.22.0", path = "../ruma-identifiers" }
 ruma-serde = { version = "0.6.0", path = "../ruma-serde" }
 serde = { version = "1.0.118", features = ["derive"] }
 serde_json = "1.0.61"

crates/ruma-appservice-api/src/event/push_events.rs

@@ -7,8 +7,7 @@ pub mod v1 {
     //!
     //! [spec]: https://spec.matrix.org/v1.2/application-service-api/#put_matrixappv1transactionstxnid
 
-    use ruma_common::{api::ruma_api, events::AnyRoomEvent};
+    use ruma_common::{api::ruma_api, events::AnyRoomEvent, TransactionId};
-    use ruma_identifiers::TransactionId;
     use ruma_serde::Raw;
 
     ruma_api! {
@@ -71,7 +70,7 @@ pub mod v1 {
             next_batch: impl Into<String>,
         ) -> serde_json::Result<ruma_client_api::sync::sync_events::v3::Response> {
             use ruma_client_api::sync::sync_events;
-            use ruma_identifiers::RoomId;
+            use ruma_common::RoomId;
             use serde::Deserialize;
             use tracing::warn;
 
@@ -109,7 +108,7 @@ pub mod v1 {
     #[cfg(test)]
     mod helper_tests {
         use ruma_client_api::sync::sync_events;
-        use ruma_identifiers::{room_id, TransactionId};
+        use ruma_common::{room_id, TransactionId};
         use serde_json::{json, value::to_raw_value as to_raw_json_value};
 
         use super::{IncomingRequest, Raw};

crates/ruma-appservice-api/src/query/query_room_alias.rs

@@ -7,8 +7,7 @@ pub mod v1 {
     //!
     //! [spec]: https://spec.matrix.org/v1.2/application-service-api/#get_matrixappv1roomsroomalias
 
-    use ruma_common::api::ruma_api;
+    use ruma_common::{api::ruma_api, RoomAliasId};
-    use ruma_identifiers::RoomAliasId;
 
     ruma_api! {
         metadata: {

crates/ruma-appservice-api/src/query/query_user_id.rs

@@ -7,8 +7,7 @@ pub mod v1 {
     //!
     //! [spec]: https://spec.matrix.org/v1.2/application-service-api/#get_matrixappv1usersuserid
 
-    use ruma_common::api::ruma_api;
+    use ruma_common::{api::ruma_api, UserId};
-    use ruma_identifiers::UserId;
 
     ruma_api! {
         metadata: {

crates/ruma-appservice-api/src/thirdparty/get_location_for_room_alias.rs

@@ -7,8 +7,7 @@ pub mod v1 {
     //!
     //! [spec]: https://spec.matrix.org/v1.2/application-service-api/#get_matrixappv1thirdpartylocation
 
-    use ruma_common::{api::ruma_api, thirdparty::Location};
+    use ruma_common::{api::ruma_api, thirdparty::Location, RoomAliasId};
-    use ruma_identifiers::RoomAliasId;
 
     ruma_api! {
         metadata: {

crates/ruma-appservice-api/src/thirdparty/get_user_for_user_id.rs

@@ -7,8 +7,7 @@ pub mod v1 {
     //!
     //! [spec]: https://spec.matrix.org/v1.2/application-service-api/#get_matrixappv1thirdpartyuser
 
-    use ruma_common::{api::ruma_api, thirdparty::User};
+    use ruma_common::{api::ruma_api, thirdparty::User, UserId};
-    use ruma_identifiers::UserId;
 
     ruma_api! {
         metadata: {

crates/ruma-client-api/Cargo.toml

@@ -29,7 +29,6 @@ js_int = { version = "0.2.0", features = ["serde"] }
 maplit = "1.0.2"
 percent-encoding = "2.1.0"
 ruma-common = { version = "0.8.0", path = "../ruma-common", features = ["api", "events"] }
-ruma-identifiers = { version = "0.22.0", path = "../ruma-identifiers" }
 ruma-serde = { version = "0.6.0", path = "../ruma-serde" }
 serde = { version = "1.0.118", features = ["derive"] }
 serde_json = "1.0.61"

crates/ruma-client-api/src/account/add_3pid.rs

@@ -5,8 +5,7 @@ pub mod v3 {
     //!
     //! [spec]: https://spec.matrix.org/v1.2/client-server-api/#post_matrixclientv3account3pidadd
 
-    use ruma_common::api::ruma_api;
+    use ruma_common::{api::ruma_api, ClientSecret, SessionId};
-    use ruma_identifiers::{ClientSecret, SessionId};
 
     use crate::uiaa::{AuthData, IncomingAuthData, UiaaResponse};
 

crates/ruma-client-api/src/account/bind_3pid.rs

@@ -5,8 +5,7 @@ pub mod v3 {
     //!
     //! [spec]: https://spec.matrix.org/v1.2/client-server-api/#post_matrixclientv3account3pidbind
 
-    use ruma_common::api::ruma_api;
+    use ruma_common::{api::ruma_api, ClientSecret, SessionId};
-    use ruma_identifiers::{ClientSecret, SessionId};
 
     use crate::account::{IdentityServerInfo, IncomingIdentityServerInfo};
 

crates/ruma-client-api/src/account/register.rs

@@ -7,8 +7,7 @@ pub mod v3 {
     //!
     //! [spec]: https://spec.matrix.org/v1.2/client-server-api/#post_matrixclientv3register
 
-    use ruma_common::api::ruma_api;
+    use ruma_common::{api::ruma_api, DeviceId, UserId};
-    use ruma_identifiers::{DeviceId, UserId};
 
     use super::{LoginType, RegistrationKind};
     use crate::uiaa::{AuthData, IncomingAuthData, UiaaResponse};

crates/ruma-client-api/src/account/request_3pid_management_token_via_email.rs

@@ -6,8 +6,7 @@ pub mod v3 {
     //! [spec]: https://spec.matrix.org/v1.2/client-server-api/#post_matrixclientv3account3pidemailrequesttoken
 
     use js_int::UInt;
-    use ruma_common::api::ruma_api;
+    use ruma_common::{api::ruma_api, ClientSecret, SessionId};
-    use ruma_identifiers::{ClientSecret, SessionId};
 
     use crate::account::{IdentityServerInfo, IncomingIdentityServerInfo};
 

crates/ruma-client-api/src/account/request_3pid_management_token_via_msisdn.rs

@@ -6,8 +6,7 @@ pub mod v3 {
     //! [spec]: https://spec.matrix.org/v1.2/client-server-api/#post_matrixclientv3account3pidmsisdnrequesttoken
 
     use js_int::UInt;
-    use ruma_common::api::ruma_api;
+    use ruma_common::{api::ruma_api, ClientSecret, SessionId};
-    use ruma_identifiers::{ClientSecret, SessionId};
 
     use crate::account::{IdentityServerInfo, IncomingIdentityServerInfo};
 

crates/ruma-client-api/src/account/request_openid_token.rs

@@ -7,8 +7,7 @@ pub mod v3 {
 
     use std::time::Duration;
 
-    use ruma_common::{api::ruma_api, authentication::TokenType};
+    use ruma_common::{api::ruma_api, authentication::TokenType, ServerName, UserId};
-    use ruma_identifiers::{ServerName, UserId};
 
     ruma_api! {
         metadata: {

crates/ruma-client-api/src/account/request_password_change_token_via_email.rs

@@ -6,8 +6,7 @@ pub mod v3 {
     //! [spec]: https://spec.matrix.org/v1.2/client-server-api/#post_matrixclientv3accountpasswordemailrequesttoken
 
     use js_int::UInt;
-    use ruma_common::api::ruma_api;
+    use ruma_common::{api::ruma_api, ClientSecret, SessionId};
-    use ruma_identifiers::{ClientSecret, SessionId};
 
     use crate::account::{IdentityServerInfo, IncomingIdentityServerInfo};
 

crates/ruma-client-api/src/account/request_password_change_token_via_msisdn.rs

@@ -6,8 +6,7 @@ pub mod v3 {
     //! [spec]: https://spec.matrix.org/v1.2/client-server-api/#post_matrixclientv3accountpasswordmsisdnrequesttoken
 
     use js_int::UInt;
-    use ruma_common::api::ruma_api;
+    use ruma_common::{api::ruma_api, ClientSecret, SessionId};
-    use ruma_identifiers::{ClientSecret, SessionId};
 
     ruma_api! {
         metadata: {

crates/ruma-client-api/src/account/request_registration_token_via_email.rs

@@ -6,8 +6,7 @@ pub mod v3 {
     //! [spec]: https://spec.matrix.org/v1.2/client-server-api/#post_matrixclientv3registeremailrequesttoken
 
     use js_int::UInt;
-    use ruma_common::api::ruma_api;
+    use ruma_common::{api::ruma_api, ClientSecret, SessionId};
-    use ruma_identifiers::{ClientSecret, SessionId};
 
     use crate::account::{IdentityServerInfo, IncomingIdentityServerInfo};
 

crates/ruma-client-api/src/account/request_registration_token_via_msisdn.rs

@@ -6,8 +6,7 @@ pub mod v3 {
     //! [spec]: https://spec.matrix.org/v1.2/client-server-api/#post_matrixclientv3registermsisdnrequesttoken
 
     use js_int::UInt;
-    use ruma_common::api::ruma_api;
+    use ruma_common::{api::ruma_api, ClientSecret, SessionId};
-    use ruma_identifiers::{ClientSecret, SessionId};
 
     use crate::account::{IdentityServerInfo, IncomingIdentityServerInfo};
 

crates/ruma-client-api/src/account/whoami.rs

@@ -5,8 +5,7 @@ pub mod v3 {
     //!
     //! [spec]: https://spec.matrix.org/v1.2/client-server-api/#get_matrixclientv3accountwhoami
 
-    use ruma_common::api::ruma_api;
+    use ruma_common::{api::ruma_api, DeviceId, UserId};
-    use ruma_identifiers::{DeviceId, UserId};
 
     ruma_api! {
         metadata: {

crates/ruma-client-api/src/alias/create_alias.rs

@@ -5,8 +5,7 @@ pub mod v3 {
     //!
     //! [spec]: https://spec.matrix.org/v1.2/client-server-api/#put_matrixclientv3directoryroomroomalias
 
-    use ruma_common::api::ruma_api;
+    use ruma_common::{api::ruma_api, RoomAliasId, RoomId};
-    use ruma_identifiers::{RoomAliasId, RoomId};
 
     ruma_api! {
         metadata: {

crates/ruma-client-api/src/alias/delete_alias.rs

@@ -5,8 +5,7 @@ pub mod v3 {
     //!
     //! [spec]: https://spec.matrix.org/v1.2/client-server-api/#delete_matrixclientv3directoryroomroomalias
 
-    use ruma_common::api::ruma_api;
+    use ruma_common::{api::ruma_api, RoomAliasId};
-    use ruma_identifiers::RoomAliasId;
 
     ruma_api! {
         metadata: {

crates/ruma-client-api/src/alias/get_alias.rs

@@ -5,8 +5,7 @@ pub mod v3 {
     //!
     //! [spec]: https://spec.matrix.org/v1.2/client-server-api/#get_matrixclientv3directoryroomroomalias
 
-    use ruma_common::api::ruma_api;
+    use ruma_common::{api::ruma_api, RoomAliasId, RoomId, ServerName};
-    use ruma_identifiers::{RoomAliasId, RoomId, ServerName};
 
     ruma_api! {
         metadata: {

crates/ruma-client-api/src/appservice/set_room_visibility.rs

@@ -5,8 +5,7 @@ pub mod v3 {
     //!
     //! [spec]: https://spec.matrix.org/v1.2/application-service-api/#put_matrixclientv3directorylistappservicenetworkidroomid
 
-    use ruma_common::api::ruma_api;
+    use ruma_common::{api::ruma_api, RoomId};
-    use ruma_identifiers::RoomId;
 
     use crate::room::Visibility;
 

crates/ruma-client-api/src/backup.rs

@@ -18,7 +18,7 @@ pub mod update_backup_version;
 use std::collections::BTreeMap;
 
 use js_int::UInt;
-use ruma_identifiers::{DeviceKeyId, UserId};
+use ruma_common::{DeviceKeyId, UserId};
 use ruma_serde::{Base64, Raw};
 use serde::{Deserialize, Serialize};
 

crates/ruma-client-api/src/backup/add_backup_keys.rs

@@ -8,8 +8,7 @@ pub mod v3 {
     use std::collections::BTreeMap;
 
     use js_int::UInt;
-    use ruma_common::api::ruma_api;
+    use ruma_common::{api::ruma_api, RoomId};
-    use ruma_identifiers::RoomId;
 
     use crate::backup::RoomKeyBackup;
 

crates/ruma-client-api/src/backup/add_backup_keys_for_room.rs

@@ -8,8 +8,7 @@ pub mod v3 {
     use std::collections::BTreeMap;
 
     use js_int::UInt;
-    use ruma_common::api::ruma_api;
+    use ruma_common::{api::ruma_api, RoomId};
-    use ruma_identifiers::RoomId;
     use ruma_serde::Raw;
 
     use crate::backup::KeyBackupData;

crates/ruma-client-api/src/backup/add_backup_keys_for_session.rs

@@ -6,8 +6,7 @@ pub mod v3 {
     //! [spec]: https://spec.matrix.org/v1.2/client-server-api/#put_matrixclientv3room_keyskeysroomidsessionid
 
     use js_int::UInt;
-    use ruma_common::api::ruma_api;
+    use ruma_common::{api::ruma_api, RoomId};
-    use ruma_identifiers::RoomId;
     use ruma_serde::Raw;
 
     use crate::backup::KeyBackupData;

crates/ruma-client-api/src/backup/delete_backup_keys_for_room.rs

@@ -6,8 +6,7 @@ pub mod v3 {
     //! [spec]: https://spec.matrix.org/v1.2/client-server-api/#delete_matrixclientv3room_keyskeysroomid
 
     use js_int::UInt;
-    use ruma_common::api::ruma_api;
+    use ruma_common::{api::ruma_api, RoomId};
-    use ruma_identifiers::RoomId;
 
     ruma_api! {
         metadata: {

crates/ruma-client-api/src/backup/delete_backup_keys_for_session.rs

@@ -6,8 +6,7 @@ pub mod v3 {
     //! [spec]: https://spec.matrix.org/v1.2/client-server-api/#delete_matrixclientv3room_keyskeysroomidsessionid
 
     use js_int::UInt;
-    use ruma_common::api::ruma_api;
+    use ruma_common::{api::ruma_api, RoomId};
-    use ruma_identifiers::RoomId;
 
     ruma_api! {
         metadata: {

crates/ruma-client-api/src/backup/get_backup_keys.rs

@@ -9,8 +9,7 @@ pub mod v3 {
 
     use std::collections::BTreeMap;
 
-    use ruma_common::api::ruma_api;
+    use ruma_common::{api::ruma_api, RoomId};
-    use ruma_identifiers::RoomId;
 
     use crate::backup::RoomKeyBackup;
 

crates/ruma-client-api/src/backup/get_backup_keys_for_room.rs

@@ -7,8 +7,7 @@ pub mod v3 {
 
     use std::collections::BTreeMap;
 
-    use ruma_common::api::ruma_api;
+    use ruma_common::{api::ruma_api, RoomId};
-    use ruma_identifiers::RoomId;
     use ruma_serde::Raw;
 
     use crate::backup::KeyBackupData;

crates/ruma-client-api/src/backup/get_backup_keys_for_session.rs

@@ -5,8 +5,7 @@ pub mod v3 {
     //!
     //! [spec]: https://spec.matrix.org/v1.2/client-server-api/#get_matrixclientv3room_keyskeysroomidsessionid
 
-    use ruma_common::api::ruma_api;
+    use ruma_common::{api::ruma_api, RoomId};
-    use ruma_identifiers::RoomId;
     use ruma_serde::Raw;
 
     use crate::backup::KeyBackupData;

crates/ruma-client-api/src/capabilities.rs

@@ -3,7 +3,7 @@
 use std::{borrow::Cow, collections::BTreeMap};
 
 use maplit::btreemap;
-use ruma_identifiers::RoomVersionId;
+use ruma_common::RoomVersionId;
 use ruma_serde::StringEnum;
 use serde::{Deserialize, Serialize};
 use serde_json::{from_value as from_json_value, to_value as to_json_value, Value as JsonValue};

crates/ruma-client-api/src/config/get_global_account_data.rs

@@ -5,8 +5,7 @@ pub mod v3 {
     //!
     //! [spec]: https://spec.matrix.org/v1.2/client-server-api/#get_matrixclientv3useruseridaccount_datatype
 
-    use ruma_common::{api::ruma_api, events::AnyGlobalAccountDataEventContent};
+    use ruma_common::{api::ruma_api, events::AnyGlobalAccountDataEventContent, UserId};
-    use ruma_identifiers::UserId;
     use ruma_serde::Raw;
 
     ruma_api! {

crates/ruma-client-api/src/config/get_room_account_data.rs

@@ -5,8 +5,7 @@ pub mod v3 {
     //!
     //! [spec]: https://spec.matrix.org/v1.2/client-server-api/#get_matrixclientv3useruseridroomsroomidaccount_datatype
 
-    use ruma_common::{api::ruma_api, events::AnyRoomAccountDataEventContent};
+    use ruma_common::{api::ruma_api, events::AnyRoomAccountDataEventContent, RoomId, UserId};
-    use ruma_identifiers::{RoomId, UserId};
     use ruma_serde::Raw;
 
     ruma_api! {

crates/ruma-client-api/src/config/set_global_account_data.rs

@@ -8,8 +8,8 @@ pub mod v3 {
     use ruma_common::{
         api::ruma_api,
         events::{AnyGlobalAccountDataEventContent, GlobalAccountDataEventContent},
+        UserId,
     };
-    use ruma_identifiers::UserId;
     use ruma_serde::Raw;
     use serde_json::value::to_raw_value as to_raw_json_value;
 

crates/ruma-client-api/src/config/set_room_account_data.rs

@@ -8,8 +8,8 @@ pub mod v3 {
     use ruma_common::{
         api::ruma_api,
         events::{AnyRoomAccountDataEventContent, RoomAccountDataEventContent},
+        RoomId, UserId,
     };
-    use ruma_identifiers::{RoomId, UserId};
     use ruma_serde::Raw;
     use serde_json::value::to_raw_value as to_raw_json_value;
 

crates/ruma-client-api/src/context/get_context.rs

@@ -9,8 +9,8 @@ pub mod v3 {
     use ruma_common::{
         api::ruma_api,
         events::{AnyRoomEvent, AnyStateEvent},
+        EventId, RoomId,
     };
-    use ruma_identifiers::{EventId, RoomId};
     use ruma_serde::Raw;
 
     use crate::filter::{IncomingRoomEventFilter, RoomEventFilter};

crates/ruma-client-api/src/device.rs

@@ -1,7 +1,6 @@
 //! Endpoints for managing devices.
 
-use ruma_common::MilliSecondsSinceUnixEpoch;
+use ruma_common::{DeviceId, MilliSecondsSinceUnixEpoch};
-use ruma_identifiers::DeviceId;
 use serde::{Deserialize, Serialize};
 
 pub mod delete_device;

crates/ruma-client-api/src/device/delete_device.rs

@@ -5,8 +5,7 @@ pub mod v3 {
     //!
     //! [spec]: https://spec.matrix.org/v1.2/client-server-api/#delete_matrixclientv3devicesdeviceid
 
-    use ruma_common::api::ruma_api;
+    use ruma_common::{api::ruma_api, DeviceId};
-    use ruma_identifiers::DeviceId;
 
     use crate::uiaa::{AuthData, IncomingAuthData, UiaaResponse};
 

crates/ruma-client-api/src/device/delete_devices.rs

@@ -5,8 +5,7 @@ pub mod v3 {
     //!
     //! [spec]: https://spec.matrix.org/v1.2/client-server-api/#post_matrixclientv3delete_devices
 
-    use ruma_common::api::ruma_api;
+    use ruma_common::{api::ruma_api, DeviceId};
-    use ruma_identifiers::DeviceId;
 
     use crate::uiaa::{AuthData, IncomingAuthData, UiaaResponse};
 

crates/ruma-client-api/src/device/get_device.rs

@@ -5,8 +5,7 @@ pub mod v3 {
     //!
     //! [spec]: https://spec.matrix.org/v1.2/client-server-api/#get_matrixclientv3devicesdeviceid
 
-    use ruma_common::api::ruma_api;
+    use ruma_common::{api::ruma_api, DeviceId};
-    use ruma_identifiers::DeviceId;
 
     use crate::device::Device;
 

crates/ruma-client-api/src/device/update_device.rs

@@ -5,8 +5,7 @@ pub mod v3 {
     //!
     //! [spec]: https://spec.matrix.org/v1.2/client-server-api/#put_matrixclientv3devicesdeviceid
 
-    use ruma_common::api::ruma_api;
+    use ruma_common::{api::ruma_api, DeviceId};
-    use ruma_identifiers::DeviceId;
 
     ruma_api! {
         metadata: {

crates/ruma-client-api/src/directory/get_public_rooms.rs

@@ -6,8 +6,7 @@ pub mod v3 {
     //! [spec]: https://spec.matrix.org/v1.2/client-server-api/#get_matrixclientv3publicrooms
 
     use js_int::UInt;
-    use ruma_common::{api::ruma_api, directory::PublicRoomsChunk};
+    use ruma_common::{api::ruma_api, directory::PublicRoomsChunk, ServerName};
-    use ruma_identifiers::ServerName;
 
     ruma_api! {
         metadata: {
@@ -82,8 +81,10 @@ pub mod v3 {
         #[cfg(feature = "client")]
         #[test]
         fn construct_request_from_refs() {
-            use ruma_common::api::{MatrixVersion, OutgoingRequest as _, SendAccessToken};
+            use ruma_common::{
-            use ruma_identifiers::server_name;
+                api::{MatrixVersion, OutgoingRequest as _, SendAccessToken},
+                server_name,
+            };
 
             let req = super::Request {
                 limit: Some(uint!(10)),

crates/ruma-client-api/src/directory/get_public_rooms_filtered.rs

@@ -9,8 +9,8 @@ pub mod v3 {
     use ruma_common::{
         api::ruma_api,
         directory::{Filter, IncomingFilter, IncomingRoomNetwork, PublicRoomsChunk, RoomNetwork},
+        ServerName,
     };
-    use ruma_identifiers::ServerName;
 
     ruma_api! {
         metadata: {

crates/ruma-client-api/src/directory/get_room_visibility.rs

@@ -5,8 +5,7 @@ pub mod v3 {
     //!
     //! [spec]: https://spec.matrix.org/v1.2/client-server-api/#get_matrixclientv3directorylistroomroomid
 
-    use ruma_common::api::ruma_api;
+    use ruma_common::{api::ruma_api, RoomId};
-    use ruma_identifiers::RoomId;
 
     use crate::room::Visibility;
 

crates/ruma-client-api/src/directory/set_room_visibility.rs

@@ -5,8 +5,7 @@ pub mod v3 {
     //!
     //! [spec]: https://spec.matrix.org/v1.2/client-server-api/#put_matrixclientv3directorylistroomroomid
 
-    use ruma_common::api::ruma_api;
+    use ruma_common::{api::ruma_api, RoomId};
-    use ruma_identifiers::RoomId;
 
     use crate::room::Visibility;
 

crates/ruma-client-api/src/error.rs

@@ -3,11 +3,13 @@
 use std::{collections::BTreeMap, fmt, time::Duration};
 
 use bytes::BufMut;
-use ruma_common::api::{
+use ruma_common::{
-    error::{DeserializationError, IntoHttpError},
+    api::{
-    EndpointError, OutgoingResponse,
+        error::{DeserializationError, IntoHttpError},
+        EndpointError, OutgoingResponse,
+    },
+    RoomVersionId,
 };
-use ruma_identifiers::RoomVersionId;
 use serde::{Deserialize, Serialize};
 use serde_json::{from_slice as from_json_slice, Value as JsonValue};
 

crates/ruma-client-api/src/error/kind_serde.rs

@@ -296,7 +296,7 @@ impl Serialize for ErrorKind {
 
 #[cfg(test)]
 mod tests {
-    use ruma_identifiers::room_version_id;
+    use ruma_common::room_version_id;
     use serde_json::{from_value as from_json_value, json};
 
     use super::ErrorKind;

crates/ruma-client-api/src/filter.rs

@@ -7,7 +7,7 @@ mod lazy_load;
 mod url;
 
 use js_int::UInt;
-use ruma_identifiers::{RoomId, UserId};
+use ruma_common::{RoomId, UserId};
 use ruma_serde::{Outgoing, StringEnum};
 use serde::Serialize;
 

crates/ruma-client-api/src/filter/create_filter.rs

@@ -5,8 +5,7 @@ pub mod v3 {
     //!
     //! [spec]: https://spec.matrix.org/v1.2/client-server-api/#post_matrixclientv3useruseridfilter
 
-    use ruma_common::api::ruma_api;
+    use ruma_common::{api::ruma_api, UserId};
-    use ruma_identifiers::UserId;
 
     use crate::filter::{FilterDefinition, IncomingFilterDefinition};
 
@@ -84,8 +83,10 @@ pub mod v3 {
         #[cfg(feature = "client")]
         #[test]
         fn serialize_request() {
-            use ruma_common::api::{MatrixVersion, OutgoingRequest, SendAccessToken};
+            use ruma_common::{
-            use ruma_identifiers::user_id;
+                api::{MatrixVersion, OutgoingRequest, SendAccessToken},
+                user_id,
+            };
 
             use crate::filter::FilterDefinition;
 

crates/ruma-client-api/src/filter/get_filter.rs

@@ -5,8 +5,7 @@ pub mod v3 {
     //!
     //! [spec]: https://spec.matrix.org/v1.2/client-server-api/#get_matrixclientv3useruseridfilterfilterid
 
-    use ruma_common::api::ruma_api;
+    use ruma_common::{api::ruma_api, UserId};
-    use ruma_identifiers::UserId;
 
     use crate::filter::IncomingFilterDefinition;
 

crates/ruma-client-api/src/keys/claim_keys.rs

@@ -7,8 +7,9 @@ pub mod v3 {
 
     use std::{collections::BTreeMap, time::Duration};
 
-    use ruma_common::{api::ruma_api, encryption::OneTimeKey};
+    use ruma_common::{
-    use ruma_identifiers::{DeviceId, DeviceKeyAlgorithm, DeviceKeyId, UserId};
+        api::ruma_api, encryption::OneTimeKey, DeviceId, DeviceKeyAlgorithm, DeviceKeyId, UserId,
+    };
     use ruma_serde::Raw;
     use serde_json::Value as JsonValue;
 

crates/ruma-client-api/src/keys/get_key_changes.rs

@@ -5,8 +5,7 @@ pub mod v3 {
     //!
     //! [spec]: https://spec.matrix.org/v1.2/client-server-api/#get_matrixclientv3keyschanges
 
-    use ruma_common::api::ruma_api;
+    use ruma_common::{api::ruma_api, UserId};
-    use ruma_identifiers::UserId;
 
     ruma_api! {
         metadata: {

crates/ruma-client-api/src/keys/get_keys.rs

@@ -10,8 +10,8 @@ pub mod v3 {
     use ruma_common::{
         api::ruma_api,
         encryption::{CrossSigningKey, DeviceKeys},
+        DeviceId, UserId,
     };
-    use ruma_identifiers::{DeviceId, UserId};
     use ruma_serde::Raw;
     use serde_json::Value as JsonValue;
 

crates/ruma-client-api/src/keys/upload_keys.rs

@@ -11,8 +11,8 @@ pub mod v3 {
     use ruma_common::{
         api::ruma_api,
         encryption::{DeviceKeys, OneTimeKey},
+        DeviceKeyAlgorithm, DeviceKeyId,
     };
-    use ruma_identifiers::{DeviceKeyAlgorithm, DeviceKeyId};
     use ruma_serde::Raw;
 
     ruma_api! {

crates/ruma-client-api/src/keys/upload_signatures.rs

@@ -10,8 +10,8 @@ pub mod v3 {
     use ruma_common::{
         api::ruma_api,
         encryption::{CrossSigningKey, DeviceKeys},
+        DeviceId, UserId,
     };
-    use ruma_identifiers::{DeviceId, UserId};
     use ruma_serde::{Raw, StringEnum};
     use serde::{Deserialize, Serialize};
     use serde_json::value::RawValue as RawJsonValue;

crates/ruma-client-api/src/knock/knock_room.rs

@@ -5,8 +5,7 @@ pub mod v3 {
     //!
     //! [spec]: https://spec.matrix.org/v1.2/client-server-api/#post_matrixclientv3knockroomidoralias
 
-    use ruma_common::api::ruma_api;
+    use ruma_common::{api::ruma_api, RoomId, RoomOrAliasId, ServerName};
-    use ruma_identifiers::{RoomId, RoomOrAliasId, ServerName};
 
     ruma_api! {
         metadata: {

crates/ruma-client-api/src/media/create_content.rs

@@ -5,8 +5,7 @@ pub mod v3 {
     //!
     //! [spec]: https://spec.matrix.org/v1.2/client-server-api/#post_matrixmediav3upload
 
-    use ruma_common::api::ruma_api;
+    use ruma_common::{api::ruma_api, MxcUri};
-    use ruma_identifiers::MxcUri;
 
     ruma_api! {
         metadata: {

crates/ruma-client-api/src/media/get_content.rs

@@ -5,8 +5,7 @@ pub mod v3 {
     //!
     //! [spec]: https://spec.matrix.org/v1.2/client-server-api/#get_matrixmediav3downloadservernamemediaid
 
-    use ruma_common::api::ruma_api;
+    use ruma_common::{api::ruma_api, Error, MxcUri, ServerName};
-    use ruma_identifiers::{Error, MxcUri, ServerName};
 
     ruma_api! {
         metadata: {

crates/ruma-client-api/src/media/get_content_as_filename.rs

@@ -5,8 +5,7 @@ pub mod v3 {
     //!
     //! [spec]: https://spec.matrix.org/v1.2/client-server-api/#get_matrixmediav3downloadservernamemediaidfilename
 
-    use ruma_common::api::ruma_api;
+    use ruma_common::{api::ruma_api, Error, MxcUri, ServerName};
-    use ruma_identifiers::{Error, MxcUri, ServerName};
 
     ruma_api! {
         metadata: {

crates/ruma-client-api/src/media/get_content_thumbnail.rs

@@ -6,8 +6,7 @@ pub mod v3 {
     //! [spec]: https://spec.matrix.org/v1.2/client-server-api/#get_matrixmediav3thumbnailservernamemediaid
 
     use js_int::UInt;
-    use ruma_common::api::ruma_api;
+    use ruma_common::{api::ruma_api, Error, MxcUri, ServerName};
-    use ruma_identifiers::{Error, MxcUri, ServerName};
     use ruma_serde::StringEnum;
 
     use crate::PrivOwnedStr;

crates/ruma-client-api/src/membership.rs

@@ -14,8 +14,7 @@ pub mod unban_user;
 
 use std::collections::BTreeMap;
 
-use ruma_common::thirdparty::Medium;
+use ruma_common::{thirdparty::Medium, ServerName, ServerSigningKeyId, UserId};
-use ruma_identifiers::{ServerName, ServerSigningKeyId, UserId};
 use ruma_serde::Outgoing;
 use serde::Serialize;
 

crates/ruma-client-api/src/membership/ban_user.rs

@@ -5,8 +5,7 @@ pub mod v3 {
     //!
     //! [spec]: https://spec.matrix.org/v1.2/client-server-api/#post_matrixclientv3roomsroomidban
 
-    use ruma_common::api::ruma_api;
+    use ruma_common::{api::ruma_api, RoomId, UserId};
-    use ruma_identifiers::{RoomId, UserId};
 
     ruma_api! {
         metadata: {

crates/ruma-client-api/src/membership/forget_room.rs

@@ -5,8 +5,7 @@ pub mod v3 {
     //!
     //! [spec]: https://spec.matrix.org/v1.2/client-server-api/#post_matrixclientv3roomsroomidforget
 
-    use ruma_common::api::ruma_api;
+    use ruma_common::{api::ruma_api, RoomId};
-    use ruma_identifiers::RoomId;
 
     ruma_api! {
         metadata: {

crates/ruma-client-api/src/membership/get_member_events.rs

@@ -5,8 +5,7 @@ pub mod v3 {
     //!
     //! [spec]: https://spec.matrix.org/v1.2/client-server-api/#get_matrixclientv3roomsroomidmembers
 
-    use ruma_common::{api::ruma_api, events::room::member::RoomMemberEvent};
+    use ruma_common::{api::ruma_api, events::room::member::RoomMemberEvent, RoomId};
-    use ruma_identifiers::RoomId;
     use ruma_serde::{Raw, StringEnum};
 
     use crate::PrivOwnedStr;

crates/ruma-client-api/src/membership/invite_user.rs

@@ -10,8 +10,7 @@ pub mod v3 {
     //! [spec-mxid]: https://spec.matrix.org/v1.2/client-server-api/#post_matrixclientv3roomsroomidinvite
     //! [spec-3pid]: https://spec.matrix.org/v1.2/client-server-api/#post_matrixclientv3roomsroomidinvite-1
 
-    use ruma_common::api::ruma_api;
+    use ruma_common::{api::ruma_api, RoomId, UserId};
-    use ruma_identifiers::{RoomId, UserId};
     use ruma_serde::Outgoing;
     use serde::Serialize;
 
@@ -81,8 +80,7 @@ pub mod v3 {
 
     #[cfg(test)]
     mod tests {
-        use ruma_common::thirdparty::Medium;
+        use ruma_common::{thirdparty::Medium, user_id};
-        use ruma_identifiers::user_id;
         use serde_json::{from_value as from_json_value, json};
 
         use super::IncomingInvitationRecipient;

crates/ruma-client-api/src/membership/join_room_by_id.rs

@@ -5,8 +5,7 @@ pub mod v3 {
     //!
     //! [spec]: https://spec.matrix.org/v1.2/client-server-api/#post_matrixclientv3roomsroomidjoin
 
-    use ruma_common::api::ruma_api;
+    use ruma_common::{api::ruma_api, RoomId};
-    use ruma_identifiers::RoomId;
 
     use crate::membership::{IncomingThirdPartySigned, ThirdPartySigned};
 

crates/ruma-client-api/src/membership/join_room_by_id_or_alias.rs

@@ -5,8 +5,7 @@ pub mod v3 {
     //!
     //! [spec]: https://spec.matrix.org/v1.2/client-server-api/#post_matrixclientv3joinroomidoralias
 
-    use ruma_common::api::ruma_api;
+    use ruma_common::{api::ruma_api, RoomId, RoomOrAliasId, ServerName};
-    use ruma_identifiers::{RoomId, RoomOrAliasId, ServerName};
 
     use crate::membership::{IncomingThirdPartySigned, ThirdPartySigned};
 

crates/ruma-client-api/src/membership/joined_members.rs

@@ -7,8 +7,7 @@ pub mod v3 {
 
     use std::collections::BTreeMap;
 
-    use ruma_common::api::ruma_api;
+    use ruma_common::{api::ruma_api, MxcUri, RoomId, UserId};
-    use ruma_identifiers::{MxcUri, RoomId, UserId};
     use serde::{Deserialize, Serialize};
 
     ruma_api! {

crates/ruma-client-api/src/membership/joined_rooms.rs

@@ -5,8 +5,7 @@ pub mod v3 {
     //!
     //! [spec]: https://spec.matrix.org/v1.2/client-server-api/#get_matrixclientv3joined_rooms
 
-    use ruma_common::api::ruma_api;
+    use ruma_common::{api::ruma_api, RoomId};
-    use ruma_identifiers::RoomId;
 
     ruma_api! {
         metadata: {

crates/ruma-client-api/src/membership/kick_user.rs

@@ -5,8 +5,7 @@ pub mod v3 {
     //!
     //! [spec]: https://spec.matrix.org/v1.2/client-server-api/#post_matrixclientv3roomsroomidkick
 
-    use ruma_common::api::ruma_api;
+    use ruma_common::{api::ruma_api, RoomId, UserId};
-    use ruma_identifiers::{RoomId, UserId};
 
     ruma_api! {
         metadata: {

crates/ruma-client-api/src/membership/leave_room.rs

@@ -5,8 +5,7 @@ pub mod v3 {
     //!
     //! [spec]: https://spec.matrix.org/v1.2/client-server-api/#post_matrixclientv3roomsroomidleave
 
-    use ruma_common::api::ruma_api;
+    use ruma_common::{api::ruma_api, RoomId};
-    use ruma_identifiers::RoomId;
 
     ruma_api! {
         metadata: {

crates/ruma-client-api/src/membership/unban_user.rs

@@ -5,8 +5,7 @@ pub mod v3 {
     //!
     //! [spec]: https://spec.matrix.org/v1.2/client-server-api/#post_matrixclientv3roomsroomidunban
 
-    use ruma_common::api::ruma_api;
+    use ruma_common::{api::ruma_api, RoomId, UserId};
-    use ruma_identifiers::{RoomId, UserId};
 
     ruma_api! {
         metadata: {

crates/ruma-client-api/src/message/get_message_events.rs

@@ -9,8 +9,8 @@ pub mod v3 {
     use ruma_common::{
         api::ruma_api,
         events::{AnyRoomEvent, AnyStateEvent},
+        RoomId,
     };
-    use ruma_identifiers::RoomId;
     use ruma_serde::Raw;
     use serde::{Deserialize, Serialize};
 
@@ -152,8 +152,10 @@ pub mod v3 {
     #[cfg(all(test, feature = "client"))]
     mod tests {
         use js_int::uint;
-        use ruma_common::api::{MatrixVersion, OutgoingRequest, SendAccessToken};
+        use ruma_common::{
-        use ruma_identifiers::room_id;
+            api::{MatrixVersion, OutgoingRequest, SendAccessToken},
+            room_id,
+        };
 
         use super::{Direction, Request};
         use crate::filter::{LazyLoadOptions, RoomEventFilter};

crates/ruma-client-api/src/message/send_message_event.rs

@@ -8,8 +8,8 @@ pub mod v3 {
     use ruma_common::{
         api::ruma_api,
         events::{AnyMessageLikeEventContent, MessageLikeEventContent},
+        EventId, RoomId, TransactionId,
     };
-    use ruma_identifiers::{EventId, RoomId, TransactionId};
     use ruma_serde::Raw;
     use serde_json::value::to_raw_value as to_raw_json_value;
 

crates/ruma-client-api/src/presence/get_presence.rs

@@ -7,8 +7,7 @@ pub mod v3 {
 
     use std::time::Duration;
 
-    use ruma_common::{api::ruma_api, presence::PresenceState};
+    use ruma_common::{api::ruma_api, presence::PresenceState, UserId};
-    use ruma_identifiers::UserId;
 
     ruma_api! {
         metadata: {

crates/ruma-client-api/src/presence/set_presence.rs

@@ -5,8 +5,7 @@ pub mod v3 {
     //!
     //! [spec]: https://spec.matrix.org/v1.2/client-server-api/#put_matrixclientv3presenceuseridstatus
 
-    use ruma_common::{api::ruma_api, presence::PresenceState};
+    use ruma_common::{api::ruma_api, presence::PresenceState, UserId};
-    use ruma_identifiers::UserId;
 
     ruma_api! {
         metadata: {

crates/ruma-client-api/src/profile/get_avatar_url.rs

@@ -5,8 +5,7 @@ pub mod v3 {
     //!
     //! [spec]: https://spec.matrix.org/v1.2/client-server-api/#get_matrixclientv3profileuseridavatar_url
 
-    use ruma_common::api::ruma_api;
+    use ruma_common::{api::ruma_api, MxcUri, UserId};
-    use ruma_identifiers::{MxcUri, UserId};
 
     ruma_api! {
         metadata: {

crates/ruma-client-api/src/profile/get_display_name.rs

@@ -5,8 +5,7 @@ pub mod v3 {
     //!
     //! [spec]: https://spec.matrix.org/v1.2/client-server-api/#get_matrixclientv3profileuseriddisplayname
 
-    use ruma_common::api::ruma_api;
+    use ruma_common::{api::ruma_api, UserId};
-    use ruma_identifiers::UserId;
 
     ruma_api! {
         metadata: {

crates/ruma-client-api/src/profile/get_profile.rs

@@ -5,8 +5,7 @@ pub mod v3 {
     //!
     //! [spec]: https://spec.matrix.org/v1.2/client-server-api/#get_matrixclientv3profileuserid
 
-    use ruma_common::api::ruma_api;
+    use ruma_common::{api::ruma_api, MxcUri, UserId};
-    use ruma_identifiers::{MxcUri, UserId};
 
     ruma_api! {
         metadata: {

crates/ruma-client-api/src/profile/set_avatar_url.rs

@@ -5,8 +5,7 @@ pub mod v3 {
     //!
     //! [spec]: https://spec.matrix.org/v1.2/client-server-api/#put_matrixclientv3profileuseridavatar_url
 
-    use ruma_common::api::ruma_api;
+    use ruma_common::{api::ruma_api, MxcUri, UserId};
-    use ruma_identifiers::{MxcUri, UserId};
 
     ruma_api! {
         metadata: {

crates/ruma-client-api/src/profile/set_display_name.rs

@@ -5,8 +5,7 @@ pub mod v3 {
     //!
     //! [spec]: https://spec.matrix.org/v1.2/client-server-api/#put_matrixclientv3profileuseriddisplayname
 
-    use ruma_common::api::ruma_api;
+    use ruma_common::{api::ruma_api, UserId};
-    use ruma_identifiers::UserId;
 
     ruma_api! {
         metadata: {

crates/ruma-client-api/src/push/get_notifications.rs

@@ -7,9 +7,8 @@ pub mod v3 {
 
     use js_int::UInt;
     use ruma_common::{
-        api::ruma_api, events::AnySyncRoomEvent, push::Action, MilliSecondsSinceUnixEpoch,
+        api::ruma_api, events::AnySyncRoomEvent, push::Action, MilliSecondsSinceUnixEpoch, RoomId,
     };
-    use ruma_identifiers::RoomId;
     use ruma_serde::Raw;
     use serde::{Deserialize, Serialize};
 

crates/ruma-client-api/src/read_marker/set_read_marker.rs

@@ -5,8 +5,7 @@ pub mod v3 {
     //!
     //! [spec]: https://spec.matrix.org/v1.2/client-server-api/#post_matrixclientv3roomsroomidread_markers
 
-    use ruma_common::api::ruma_api;
+    use ruma_common::{api::ruma_api, EventId, RoomId};
-    use ruma_identifiers::{EventId, RoomId};
 
     ruma_api! {
         metadata: {

crates/ruma-client-api/src/receipt/create_receipt.rs

@@ -5,8 +5,7 @@ pub mod v3 {
     //!
     //! [spec]: https://spec.matrix.org/v1.2/client-server-api/#post_matrixclientv3roomsroomidreceiptreceipttypeeventid
 
-    use ruma_common::{api::ruma_api, receipt::ReceiptType};
+    use ruma_common::{api::ruma_api, receipt::ReceiptType, EventId, RoomId};
-    use ruma_identifiers::{EventId, RoomId};
 
     ruma_api! {
         metadata: {

crates/ruma-client-api/src/redact/redact_event.rs

@@ -5,8 +5,7 @@ pub mod v3 {
     //!
     //! [spec]: https://spec.matrix.org/v1.2/client-server-api/#put_matrixclientv3roomsroomidredacteventidtxnid
 
-    use ruma_common::api::ruma_api;
+    use ruma_common::{api::ruma_api, EventId, RoomId, TransactionId};
-    use ruma_identifiers::{EventId, RoomId, TransactionId};
 
     ruma_api! {
         metadata: {

crates/ruma-client-api/src/room/aliases.rs

@@ -5,8 +5,7 @@ pub mod v3 {
     //!
     //! [spec]: https://spec.matrix.org/v1.2/client-server-api/#get_matrixclientv3roomsroomidaliases
 
-    use ruma_common::api::ruma_api;
+    use ruma_common::{api::ruma_api, RoomAliasId, RoomId};
-    use ruma_identifiers::{RoomAliasId, RoomId};
 
     ruma_api! {
         metadata: {

crates/ruma-client-api/src/room/create_room.rs

@@ -16,8 +16,8 @@ pub mod v3 {
             AnyInitialStateEvent,
         },
         room::RoomType,
+        RoomId, RoomName, RoomVersionId, UserId,
     };
-    use ruma_identifiers::{RoomId, RoomName, RoomVersionId, UserId};
     use ruma_serde::{Raw, StringEnum};
     use serde::{Deserialize, Serialize};
 

crates/ruma-client-api/src/room/get_room_event.rs

@@ -5,8 +5,7 @@ pub mod v3 {
     //!
     //! [spec]: https://spec.matrix.org/v1.2/client-server-api/#get_matrixclientv3roomsroomideventeventid
 
-    use ruma_common::{api::ruma_api, events::AnyRoomEvent};
+    use ruma_common::{api::ruma_api, events::AnyRoomEvent, EventId, RoomId};
-    use ruma_identifiers::{EventId, RoomId};
     use ruma_serde::Raw;
 
     ruma_api! {

crates/ruma-client-api/src/room/report_content.rs

@@ -6,8 +6,7 @@ pub mod v3 {
     //! [spec]: https://spec.matrix.org/v1.2/client-server-api/#post_matrixclientv3roomsroomidreporteventid
 
     use js_int::Int;
-    use ruma_common::api::ruma_api;
+    use ruma_common::{api::ruma_api, EventId, RoomId};
-    use ruma_identifiers::{EventId, RoomId};
 
     ruma_api! {
         metadata: {

crates/ruma-client-api/src/room/upgrade_room.rs

@@ -5,8 +5,7 @@ pub mod v3 {
     //!
     //! [spec]: https://spec.matrix.org/v1.2/client-server-api/#post_matrixclientv3roomsroomidupgrade
 
-    use ruma_common::api::ruma_api;
+    use ruma_common::{api::ruma_api, RoomId, RoomVersionId};
-    use ruma_identifiers::{RoomId, RoomVersionId};
 
     ruma_api! {
         metadata: {

crates/ruma-client-api/src/search/search_events.rs

@@ -11,8 +11,8 @@ pub mod v3 {
     use ruma_common::{
         api::ruma_api,
         events::{AnyRoomEvent, AnyStateEvent},
+        EventId, MxcUri, RoomId, UserId,
     };
-    use ruma_identifiers::{EventId, MxcUri, RoomId, UserId};
     use ruma_serde::{Outgoing, Raw, StringEnum};
     use serde::{Deserialize, Serialize};
 

crates/ruma-client-api/src/server/get_user_info.rs

@@ -7,8 +7,7 @@ pub mod v3 {
 
     use std::collections::BTreeMap;
 
-    use ruma_common::{api::ruma_api, MilliSecondsSinceUnixEpoch};
+    use ruma_common::{api::ruma_api, MilliSecondsSinceUnixEpoch, UserId};
-    use ruma_identifiers::UserId;
     use serde::{Deserialize, Serialize};
 
     ruma_api! {

crates/ruma-client-api/src/session/get_login_types.rs

@@ -7,8 +7,7 @@ pub mod v3 {
 
     use std::borrow::Cow;
 
-    use ruma_common::api::ruma_api;
+    use ruma_common::{api::ruma_api, MxcUri};
-    use ruma_identifiers::MxcUri;
     use ruma_serde::{JsonObject, StringEnum};
     use serde::{de::DeserializeOwned, Deserialize, Serialize};
     use serde_json::Value as JsonValue;

crates/ruma-client-api/src/session/login.rs

@@ -5,8 +5,7 @@ pub mod v3 {
     //!
     //! [spec]: https://spec.matrix.org/v1.2/client-server-api/#post_matrixclientv3login
 
-    use ruma_common::api::ruma_api;
+    use ruma_common::{api::ruma_api, DeviceId, ServerName, UserId};
-    use ruma_identifiers::{DeviceId, ServerName, UserId};
     use ruma_serde::{JsonObject, Outgoing};
     use serde::{
         de::{self, DeserializeOwned},

crates/ruma-client-api/src/session/login_fallback.rs

@@ -2,8 +2,7 @@
 //!
 //! [spec]: https://spec.matrix.org/v1.2/client-server-api/#login-fallback
 
-use ruma_common::api::ruma_api;
+use ruma_common::{api::ruma_api, DeviceId};
-use ruma_identifiers::DeviceId;
 
 ruma_api! {
     metadata: {

crates/ruma-client-api/src/space.rs

@@ -3,9 +3,8 @@
 use js_int::UInt;
 use ruma_common::{
     directory::PublicRoomJoinRule, events::space::child::HierarchySpaceChildStateEvent,
-    room::RoomType,
+    room::RoomType, MxcUri, RoomAliasId, RoomId, RoomName,
 };
-use ruma_identifiers::{MxcUri, RoomAliasId, RoomId, RoomName};
 use ruma_serde::Raw;
 use serde::{Deserialize, Serialize};
 

crates/ruma-client-api/src/space/get_hierarchy.rs

@@ -6,8 +6,7 @@ pub mod v1 {
     //! [spec]: https://spec.matrix.org/v1.2/client-server-api/#get_matrixclientv1roomsroomidhierarchy
 
     use js_int::UInt;
-    use ruma_common::api::ruma_api;
+    use ruma_common::{api::ruma_api, RoomId};
-    use ruma_identifiers::RoomId;
 
     use crate::space::SpaceHierarchyRoomsChunk;
 

crates/ruma-client-api/src/state/get_state_events.rs

@@ -5,8 +5,7 @@ pub mod v3 {
     //!
     //! [spec]: https://spec.matrix.org/v1.2/client-server-api/#get_matrixclientv3roomsroomidstate
 
-    use ruma_common::{api::ruma_api, events::AnyStateEvent};
+    use ruma_common::{api::ruma_api, events::AnyStateEvent, RoomId};
-    use ruma_identifiers::RoomId;
     use ruma_serde::Raw;
 
     ruma_api! {