From 088d1872b73cc6c80e0b54eebaa53429c78c5d32 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C3=A9vin=20Commaille?= <76261501+zecakeh@users.noreply.github.com> Date: Wed, 9 Mar 2022 18:46:51 +0100 Subject: [PATCH] common: Merge ruma-identifiers into ruma-common --- .github/CODEOWNERS | 1 - crates/ruma-appservice-api/Cargo.toml | 1 - .../src/event/push_events.rs | 7 +- .../src/query/query_room_alias.rs | 3 +- .../src/query/query_user_id.rs | 3 +- .../thirdparty/get_location_for_room_alias.rs | 3 +- .../src/thirdparty/get_user_for_user_id.rs | 3 +- crates/ruma-client-api/Cargo.toml | 1 - .../ruma-client-api/src/account/add_3pid.rs | 3 +- .../ruma-client-api/src/account/bind_3pid.rs | 3 +- .../ruma-client-api/src/account/register.rs | 3 +- ...request_3pid_management_token_via_email.rs | 3 +- ...equest_3pid_management_token_via_msisdn.rs | 3 +- .../src/account/request_openid_token.rs | 3 +- ...request_password_change_token_via_email.rs | 3 +- ...equest_password_change_token_via_msisdn.rs | 3 +- .../request_registration_token_via_email.rs | 3 +- .../request_registration_token_via_msisdn.rs | 3 +- crates/ruma-client-api/src/account/whoami.rs | 3 +- .../ruma-client-api/src/alias/create_alias.rs | 3 +- .../ruma-client-api/src/alias/delete_alias.rs | 3 +- crates/ruma-client-api/src/alias/get_alias.rs | 3 +- .../src/appservice/set_room_visibility.rs | 3 +- crates/ruma-client-api/src/backup.rs | 2 +- .../src/backup/add_backup_keys.rs | 3 +- .../src/backup/add_backup_keys_for_room.rs | 3 +- .../src/backup/add_backup_keys_for_session.rs | 3 +- .../src/backup/delete_backup_keys_for_room.rs | 3 +- .../backup/delete_backup_keys_for_session.rs | 3 +- .../src/backup/get_backup_keys.rs | 3 +- .../src/backup/get_backup_keys_for_room.rs | 3 +- .../src/backup/get_backup_keys_for_session.rs | 3 +- crates/ruma-client-api/src/capabilities.rs | 2 +- .../src/config/get_global_account_data.rs | 3 +- .../src/config/get_room_account_data.rs | 3 +- .../src/config/set_global_account_data.rs | 2 +- .../src/config/set_room_account_data.rs | 2 +- .../src/context/get_context.rs | 2 +- crates/ruma-client-api/src/device.rs | 3 +- .../src/device/delete_device.rs | 3 +- .../src/device/delete_devices.rs | 3 +- .../ruma-client-api/src/device/get_device.rs | 3 +- .../src/device/update_device.rs | 3 +- .../src/directory/get_public_rooms.rs | 9 +- .../directory/get_public_rooms_filtered.rs | 2 +- .../src/directory/get_room_visibility.rs | 3 +- .../src/directory/set_room_visibility.rs | 3 +- crates/ruma-client-api/src/error.rs | 10 +- .../ruma-client-api/src/error/kind_serde.rs | 2 +- crates/ruma-client-api/src/filter.rs | 2 +- .../src/filter/create_filter.rs | 9 +- .../ruma-client-api/src/filter/get_filter.rs | 3 +- crates/ruma-client-api/src/keys/claim_keys.rs | 5 +- .../src/keys/get_key_changes.rs | 3 +- crates/ruma-client-api/src/keys/get_keys.rs | 2 +- .../ruma-client-api/src/keys/upload_keys.rs | 2 +- .../src/keys/upload_signatures.rs | 2 +- .../ruma-client-api/src/knock/knock_room.rs | 3 +- .../src/media/create_content.rs | 3 +- .../ruma-client-api/src/media/get_content.rs | 3 +- .../src/media/get_content_as_filename.rs | 3 +- .../src/media/get_content_thumbnail.rs | 3 +- crates/ruma-client-api/src/membership.rs | 3 +- .../src/membership/ban_user.rs | 3 +- .../src/membership/forget_room.rs | 3 +- .../src/membership/get_member_events.rs | 3 +- .../src/membership/invite_user.rs | 6 +- .../src/membership/join_room_by_id.rs | 3 +- .../membership/join_room_by_id_or_alias.rs | 3 +- .../src/membership/joined_members.rs | 3 +- .../src/membership/joined_rooms.rs | 3 +- .../src/membership/kick_user.rs | 3 +- .../src/membership/leave_room.rs | 3 +- .../src/membership/unban_user.rs | 3 +- .../src/message/get_message_events.rs | 8 +- .../src/message/send_message_event.rs | 2 +- .../src/presence/get_presence.rs | 3 +- .../src/presence/set_presence.rs | 3 +- .../src/profile/get_avatar_url.rs | 3 +- .../src/profile/get_display_name.rs | 3 +- .../src/profile/get_profile.rs | 3 +- .../src/profile/set_avatar_url.rs | 3 +- .../src/profile/set_display_name.rs | 3 +- .../src/push/get_notifications.rs | 3 +- .../src/read_marker/set_read_marker.rs | 3 +- .../src/receipt/create_receipt.rs | 3 +- .../src/redact/redact_event.rs | 3 +- crates/ruma-client-api/src/room/aliases.rs | 3 +- .../ruma-client-api/src/room/create_room.rs | 2 +- .../src/room/get_room_event.rs | 3 +- .../src/room/report_content.rs | 3 +- .../ruma-client-api/src/room/upgrade_room.rs | 3 +- .../src/search/search_events.rs | 2 +- .../src/server/get_user_info.rs | 3 +- .../src/session/get_login_types.rs | 3 +- crates/ruma-client-api/src/session/login.rs | 3 +- .../src/session/login_fallback.rs | 3 +- crates/ruma-client-api/src/space.rs | 3 +- .../src/space/get_hierarchy.rs | 3 +- .../src/state/get_state_events.rs | 3 +- .../src/state/get_state_events_for_key.rs | 2 +- .../src/state/send_state_event.rs | 2 +- .../ruma-client-api/src/sync/sync_events.rs | 2 +- crates/ruma-client-api/src/tag/create_tag.rs | 3 +- crates/ruma-client-api/src/tag/delete_tag.rs | 3 +- crates/ruma-client-api/src/tag/get_tags.rs | 3 +- .../thirdparty/get_location_for_room_alias.rs | 3 +- .../src/thirdparty/get_user_for_user_id.rs | 3 +- .../src/to_device/send_event_to_device.rs | 2 +- .../src/typing/create_typing_event.rs | 3 +- crates/ruma-client-api/src/uiaa.rs | 2 +- .../src/user_directory/search_users.rs | 3 +- crates/ruma-client/Cargo.toml | 1 - crates/ruma-client/src/client.rs | 2 +- crates/ruma-client/src/http_client.rs | 6 +- crates/ruma-client/src/lib.rs | 9 +- crates/ruma-common/Cargo.toml | 22 +- crates/ruma-common/src/api.rs | 3 +- crates/ruma-common/src/api/error.rs | 2 +- crates/ruma-common/src/directory.rs | 3 +- crates/ruma-common/src/encryption.rs | 3 +- crates/ruma-common/src/events.rs | 4 +- crates/ruma-common/src/events/_custom.rs | 2 +- crates/ruma-common/src/events/direct.rs | 7 +- crates/ruma-common/src/events/enums.rs | 3 +- crates/ruma-common/src/events/event_kinds.rs | 3 +- crates/ruma-common/src/events/file.rs | 2 +- .../src/events/forwarded_room_key.rs | 3 +- crates/ruma-common/src/events/fully_read.rs | 3 +- .../src/events/ignored_user_list.rs | 5 +- .../src/events/key/verification.rs | 3 +- .../src/events/key/verification/accept.rs | 4 +- .../src/events/key/verification/cancel.rs | 3 +- .../src/events/key/verification/done.rs | 4 +- .../src/events/key/verification/key.rs | 2 +- .../src/events/key/verification/mac.rs | 2 +- .../src/events/key/verification/ready.rs | 4 +- .../src/events/key/verification/request.rs | 3 +- .../src/events/key/verification/start.rs | 4 +- crates/ruma-common/src/events/pdu.rs | 3 +- .../src/events/policy/rule/room.rs | 12 +- crates/ruma-common/src/events/presence.rs | 6 +- crates/ruma-common/src/events/push_rules.rs | 3 +- crates/ruma-common/src/events/reaction.rs | 5 +- crates/ruma-common/src/events/receipt.rs | 4 +- crates/ruma-common/src/events/relation.rs | 3 +- crates/ruma-common/src/events/room.rs | 3 +- crates/ruma-common/src/events/room/aliases.rs | 10 +- crates/ruma-common/src/events/room/avatar.rs | 2 +- .../src/events/room/canonical_alias.rs | 6 +- crates/ruma-common/src/events/room/create.rs | 6 +- .../ruma-common/src/events/room/encrypted.rs | 4 +- .../ruma-common/src/events/room/join_rules.rs | 5 +- crates/ruma-common/src/events/room/member.rs | 6 +- crates/ruma-common/src/events/room/message.rs | 7 +- .../src/events/room/message/feedback.rs | 3 +- .../src/events/room/message/relation_serde.rs | 4 +- .../src/events/room/message/reply.rs | 6 +- crates/ruma-common/src/events/room/name.rs | 6 +- .../src/events/room/pinned_events.rs | 8 +- .../src/events/room/power_levels.rs | 11 +- .../ruma-common/src/events/room/redaction.rs | 11 +- .../ruma-common/src/events/room/server_acl.rs | 5 +- .../ruma-common/src/events/room/tombstone.rs | 3 +- crates/ruma-common/src/events/room_key.rs | 5 +- .../src/events/room_key_request.rs | 3 +- .../ruma-common/src/events/secret/request.rs | 3 +- crates/ruma-common/src/events/secret/send.rs | 3 +- crates/ruma-common/src/events/space/child.rs | 7 +- crates/ruma-common/src/events/space/parent.rs | 5 +- crates/ruma-common/src/events/sticker.rs | 3 +- crates/ruma-common/src/events/typing.rs | 3 +- crates/ruma-common/src/events/unsigned.rs | 2 +- .../lib.rs => ruma-common/src/identifiers.rs} | 37 +-- .../src/identifiers}/client_secret.rs | 0 .../src/identifiers}/crypto_algorithms.rs | 14 +- .../src/identifiers}/device_id.rs | 4 +- .../src/identifiers}/device_key_id.rs | 6 +- .../src/identifiers}/event_id.rs | 12 +- .../src/identifiers}/key_id.rs | 5 +- .../src/identifiers}/key_name.rs | 0 .../src/identifiers}/macros.rs | 17 +- .../src/identifiers}/matrix_uri.rs | 3 +- .../src/identifiers}/mxc_uri.rs | 4 +- .../src/identifiers}/room_alias_id.rs | 6 +- .../src/identifiers}/room_id.rs | 12 +- .../src/identifiers}/room_name.rs | 0 .../src/identifiers}/room_or_room_alias_id.rs | 8 +- .../src/identifiers}/room_version_id.rs | 17 +- .../src/identifiers}/server_name.rs | 0 .../src/identifiers}/session_id.rs | 0 .../src/identifiers}/signatures.rs | 14 +- .../src/identifiers}/transaction_id.rs | 0 .../src/identifiers}/user_id.rs | 19 +- crates/ruma-common/src/lib.rs | 8 +- crates/ruma-common/src/push.rs | 3 +- crates/ruma-common/src/push/condition.rs | 5 +- crates/ruma-common/src/push/predefined.rs | 2 +- crates/ruma-common/src/thirdparty.rs | 3 +- crates/ruma-common/src/to_device.rs | 3 +- crates/ruma-common/tests/api/conversions.rs | 10 +- .../tests/api/manual_endpoint_impl.rs | 14 +- .../tests/api/ruma_api_lifetime.rs | 8 +- .../ruma-common/tests/api/ruma_api_macros.rs | 2 +- .../ruma-common/tests/api/ui/03-move-value.rs | 9 +- crates/ruma-common/tests/events/enums.rs | 2 +- .../tests/events/ephemeral_event.rs | 3 +- .../ruma-common/tests/events/event_enums.rs | 3 +- crates/ruma-common/tests/events/file.rs | 4 +- .../ruma-common/tests/events/initial_state.rs | 6 +- crates/ruma-common/tests/events/message.rs | 4 +- .../ruma-common/tests/events/message_event.rs | 4 +- crates/ruma-common/tests/events/pdu.rs | 4 +- crates/ruma-common/tests/events/redacted.rs | 4 +- crates/ruma-common/tests/events/redaction.rs | 4 +- .../ruma-common/tests/events/room_message.rs | 4 +- .../ruma-common/tests/events/state_event.rs | 4 +- crates/ruma-common/tests/events/stripped.rs | 10 +- crates/ruma-common/tests/events/to_device.rs | 6 +- .../tests/events/ui/04-event-sanity-check.rs | 7 +- .../tests/identifiers/id_macros.rs | 6 + crates/ruma-common/tests/identifiers/mod.rs | 1 + .../identifiers/ui/01-valid-id-macros.rs | 13 + .../identifiers/ui/02-invalid-id-macros.rs | 10 + .../ui/02-invalid-id-macros.stderr | 71 +++++ crates/ruma-common/tests/tests.rs | 1 + crates/ruma-federation-api/Cargo.toml | 1 - .../authorization/get_event_authorization.rs | 3 +- .../src/backfill/get_backfill.rs | 3 +- .../src/device/get_devices.rs | 2 +- crates/ruma-federation-api/src/discovery.rs | 3 +- .../src/discovery/discover_homeserver.rs | 3 +- .../src/discovery/get_remote_server_keys.rs | 3 +- .../discovery/get_remote_server_keys_batch.rs | 3 +- .../src/event/get_event.rs | 3 +- .../src/event/get_missing_events.rs | 3 +- .../src/event/get_room_state.rs | 3 +- .../src/event/get_room_state_ids.rs | 3 +- .../src/keys/claim_keys.rs | 5 +- .../ruma-federation-api/src/keys/get_keys.rs | 2 +- .../src/knock/create_knock_event_template.rs | 3 +- .../src/knock/send_knock.rs | 3 +- .../src/membership/create_invite/v1.rs | 3 +- .../src/membership/create_invite/v2.rs | 3 +- .../src/membership/create_join_event/v1.rs | 3 +- .../src/membership/create_join_event/v2.rs | 3 +- .../src/membership/create_leave_event/v1.rs | 3 +- .../src/membership/create_leave_event/v2.rs | 3 +- .../src/membership/prepare_join_event.rs | 3 +- .../src/membership/prepare_leave_event.rs | 3 +- .../src/openid/get_openid_userinfo.rs | 3 +- .../src/query/get_profile_information.rs | 3 +- .../src/query/get_room_information.rs | 3 +- .../src/serde/pdu_process_response.rs | 4 +- crates/ruma-federation-api/src/space.rs | 3 +- .../src/space/get_hierarchy.rs | 3 +- .../src/thirdparty/bind_callback.rs | 5 +- .../src/thirdparty/exchange_invite.rs | 2 +- .../src/transactions/edu.rs | 4 +- .../transactions/send_transaction_message.rs | 5 +- crates/ruma-identifiers-validation/Cargo.toml | 2 +- crates/ruma-identifiers/CHANGELOG.md | 289 ------------------ crates/ruma-identifiers/Cargo.toml | 38 --- crates/ruma-identifiers/README.md | 7 - crates/ruma-identifiers/tests/id-macros.rs | 6 - .../tests/ui/01-valid-id-macros.rs | 13 - .../tests/ui/02-invalid-id-macros.rs | 10 - .../tests/ui/02-invalid-id-macros.stderr | 71 ----- crates/ruma-identity-service-api/Cargo.toml | 1 - .../src/association/bind_3pid.rs | 6 +- .../src/association/check_3pid_validity.rs | 3 +- .../email/create_email_validation_session.rs | 3 +- .../src/association/email/validate_email.rs | 3 +- .../email/validate_email_by_end_user.rs | 3 +- .../create_msisdn_validation_session.rs | 3 +- .../src/association/msisdn/validate_msisdn.rs | 3 +- .../msisdn/validate_msisdn_by_phone_number.rs | 3 +- .../src/association/unbind_3pid.rs | 5 +- .../authentication/get_account_information.rs | 3 +- .../src/authentication/register.rs | 3 +- .../src/invitation/sign_invitation_ed25519.rs | 3 +- .../src/invitation/store_invitation.rs | 6 +- .../src/keys/get_public_key.rs | 3 +- .../src/lookup/lookup_3pid.rs | 3 +- crates/ruma-macros/src/events/event.rs | 8 +- .../ruma-macros/src/events/event_content.rs | 3 +- crates/ruma-macros/src/events/event_enum.rs | 16 +- crates/ruma-macros/src/identifiers.rs | 4 +- crates/ruma-push-gateway-api/Cargo.toml | 1 - .../src/send_event_notification.rs | 8 +- crates/ruma-serde/Cargo.toml | 2 +- crates/ruma-serde/tests/empty_strings.rs | 2 +- crates/ruma-signatures/Cargo.toml | 2 +- crates/ruma-signatures/src/error.rs | 6 +- crates/ruma-signatures/src/functions.rs | 8 +- crates/ruma-signatures/src/lib.rs | 2 +- crates/ruma-state-res/Cargo.toml | 1 - .../ruma-state-res/benches/state_res_bench.rs | 6 +- crates/ruma-state-res/src/event_auth.rs | 20 +- crates/ruma-state-res/src/lib.rs | 6 +- crates/ruma-state-res/src/room_version.rs | 2 +- crates/ruma-state-res/src/state_event.rs | 3 +- crates/ruma-state-res/src/test_utils.rs | 7 +- crates/ruma/Cargo.toml | 6 +- crates/ruma/examples/hello_world.rs | 2 +- crates/ruma/src/lib.rs | 18 +- crates/ruma/tests/outgoing.rs | 8 +- examples/joke_bot/src/main.rs | 3 +- xtask/src/ci.rs | 2 +- 309 files changed, 638 insertions(+), 1151 deletions(-) rename crates/{ruma-identifiers/src/lib.rs => ruma-common/src/identifiers.rs} (78%) rename crates/{ruma-identifiers/src => ruma-common/src/identifiers}/client_secret.rs (100%) rename crates/{ruma-identifiers/src => ruma-common/src/identifiers}/crypto_algorithms.rs (80%) rename crates/{ruma-identifiers/src => ruma-common/src/identifiers}/device_id.rs (95%) rename crates/{ruma-identifiers/src => ruma-common/src/identifiers}/device_key_id.rs (94%) rename crates/{ruma-identifiers/src => ruma-common/src/identifiers}/event_id.rs (96%) rename crates/{ruma-identifiers/src => ruma-common/src/identifiers}/key_id.rs (98%) rename crates/{ruma-identifiers/src => ruma-common/src/identifiers}/key_name.rs (100%) rename crates/{ruma-identifiers/src => ruma-common/src/identifiers}/macros.rs (95%) rename crates/{ruma-identifiers/src => ruma-common/src/identifiers}/matrix_uri.rs (99%) rename crates/{ruma-identifiers/src => ruma-common/src/identifiers}/mxc_uri.rs (97%) rename crates/{ruma-identifiers/src => ruma-common/src/identifiers}/room_alias_id.rs (96%) rename crates/{ruma-identifiers/src => ruma-common/src/identifiers}/room_id.rs (94%) rename crates/{ruma-identifiers/src => ruma-common/src/identifiers}/room_name.rs (100%) rename crates/{ruma-identifiers/src => ruma-common/src/identifiers}/room_or_room_alias_id.rs (97%) rename crates/{ruma-identifiers/src => ruma-common/src/identifiers}/room_version_id.rs (95%) rename crates/{ruma-identifiers/src => ruma-common/src/identifiers}/server_name.rs (100%) rename crates/{ruma-identifiers/src => ruma-common/src/identifiers}/session_id.rs (100%) rename crates/{ruma-identifiers/src => ruma-common/src/identifiers}/signatures.rs (84%) rename crates/{ruma-identifiers/src => ruma-common/src/identifiers}/transaction_id.rs (100%) rename crates/{ruma-identifiers/src => ruma-common/src/identifiers}/user_id.rs (96%) create mode 100644 crates/ruma-common/tests/identifiers/id_macros.rs create mode 100644 crates/ruma-common/tests/identifiers/mod.rs create mode 100644 crates/ruma-common/tests/identifiers/ui/01-valid-id-macros.rs create mode 100644 crates/ruma-common/tests/identifiers/ui/02-invalid-id-macros.rs create mode 100644 crates/ruma-common/tests/identifiers/ui/02-invalid-id-macros.stderr delete mode 100644 crates/ruma-identifiers/CHANGELOG.md delete mode 100644 crates/ruma-identifiers/Cargo.toml delete mode 100644 crates/ruma-identifiers/README.md delete mode 100644 crates/ruma-identifiers/tests/id-macros.rs delete mode 100644 crates/ruma-identifiers/tests/ui/01-valid-id-macros.rs delete mode 100644 crates/ruma-identifiers/tests/ui/02-invalid-id-macros.rs delete mode 100644 crates/ruma-identifiers/tests/ui/02-invalid-id-macros.stderr diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index d2b43d7c..6fd1d8d5 100644 --- a/.github/CODEOWNERS +++ b/.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 diff --git a/crates/ruma-appservice-api/Cargo.toml b/crates/ruma-appservice-api/Cargo.toml index 2de31fa2..ab67da8b 100644 --- a/crates/ruma-appservice-api/Cargo.toml +++ b/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" diff --git a/crates/ruma-appservice-api/src/event/push_events.rs b/crates/ruma-appservice-api/src/event/push_events.rs index 929414f0..9697daa0 100644 --- a/crates/ruma-appservice-api/src/event/push_events.rs +++ b/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_identifiers::TransactionId; + use ruma_common::{api::ruma_api, events::AnyRoomEvent, TransactionId}; use ruma_serde::Raw; ruma_api! { @@ -71,7 +70,7 @@ pub mod v1 { next_batch: impl Into, ) -> serde_json::Result { 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}; diff --git a/crates/ruma-appservice-api/src/query/query_room_alias.rs b/crates/ruma-appservice-api/src/query/query_room_alias.rs index 85b67eed..9d6e1ba7 100644 --- a/crates/ruma-appservice-api/src/query/query_room_alias.rs +++ b/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_identifiers::RoomAliasId; + use ruma_common::{api::ruma_api, RoomAliasId}; ruma_api! { metadata: { diff --git a/crates/ruma-appservice-api/src/query/query_user_id.rs b/crates/ruma-appservice-api/src/query/query_user_id.rs index d1a1d4c2..8f418188 100644 --- a/crates/ruma-appservice-api/src/query/query_user_id.rs +++ b/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_identifiers::UserId; + use ruma_common::{api::ruma_api, UserId}; ruma_api! { metadata: { diff --git a/crates/ruma-appservice-api/src/thirdparty/get_location_for_room_alias.rs b/crates/ruma-appservice-api/src/thirdparty/get_location_for_room_alias.rs index 7e09d2bf..17dde70a 100644 --- a/crates/ruma-appservice-api/src/thirdparty/get_location_for_room_alias.rs +++ b/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_identifiers::RoomAliasId; + use ruma_common::{api::ruma_api, thirdparty::Location, RoomAliasId}; ruma_api! { metadata: { diff --git a/crates/ruma-appservice-api/src/thirdparty/get_user_for_user_id.rs b/crates/ruma-appservice-api/src/thirdparty/get_user_for_user_id.rs index ec6c077c..cc904783 100644 --- a/crates/ruma-appservice-api/src/thirdparty/get_user_for_user_id.rs +++ b/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_identifiers::UserId; + use ruma_common::{api::ruma_api, thirdparty::User, UserId}; ruma_api! { metadata: { diff --git a/crates/ruma-client-api/Cargo.toml b/crates/ruma-client-api/Cargo.toml index 7db67d13..2aa884a0 100644 --- a/crates/ruma-client-api/Cargo.toml +++ b/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" diff --git a/crates/ruma-client-api/src/account/add_3pid.rs b/crates/ruma-client-api/src/account/add_3pid.rs index 4b380f8b..998ef8e9 100644 --- a/crates/ruma-client-api/src/account/add_3pid.rs +++ b/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_identifiers::{ClientSecret, SessionId}; + use ruma_common::{api::ruma_api, ClientSecret, SessionId}; use crate::uiaa::{AuthData, IncomingAuthData, UiaaResponse}; diff --git a/crates/ruma-client-api/src/account/bind_3pid.rs b/crates/ruma-client-api/src/account/bind_3pid.rs index 6989a97a..a352448e 100644 --- a/crates/ruma-client-api/src/account/bind_3pid.rs +++ b/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_identifiers::{ClientSecret, SessionId}; + use ruma_common::{api::ruma_api, ClientSecret, SessionId}; use crate::account::{IdentityServerInfo, IncomingIdentityServerInfo}; diff --git a/crates/ruma-client-api/src/account/register.rs b/crates/ruma-client-api/src/account/register.rs index 4c4ecfe5..a0ddda1a 100644 --- a/crates/ruma-client-api/src/account/register.rs +++ b/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_identifiers::{DeviceId, UserId}; + use ruma_common::{api::ruma_api, DeviceId, UserId}; use super::{LoginType, RegistrationKind}; use crate::uiaa::{AuthData, IncomingAuthData, UiaaResponse}; diff --git a/crates/ruma-client-api/src/account/request_3pid_management_token_via_email.rs b/crates/ruma-client-api/src/account/request_3pid_management_token_via_email.rs index 6b5a099f..17f58539 100644 --- a/crates/ruma-client-api/src/account/request_3pid_management_token_via_email.rs +++ b/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_identifiers::{ClientSecret, SessionId}; + use ruma_common::{api::ruma_api, ClientSecret, SessionId}; use crate::account::{IdentityServerInfo, IncomingIdentityServerInfo}; diff --git a/crates/ruma-client-api/src/account/request_3pid_management_token_via_msisdn.rs b/crates/ruma-client-api/src/account/request_3pid_management_token_via_msisdn.rs index 90239b6c..4f5fd375 100644 --- a/crates/ruma-client-api/src/account/request_3pid_management_token_via_msisdn.rs +++ b/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_identifiers::{ClientSecret, SessionId}; + use ruma_common::{api::ruma_api, ClientSecret, SessionId}; use crate::account::{IdentityServerInfo, IncomingIdentityServerInfo}; diff --git a/crates/ruma-client-api/src/account/request_openid_token.rs b/crates/ruma-client-api/src/account/request_openid_token.rs index 7812686f..37953272 100644 --- a/crates/ruma-client-api/src/account/request_openid_token.rs +++ b/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_identifiers::{ServerName, UserId}; + use ruma_common::{api::ruma_api, authentication::TokenType, ServerName, UserId}; ruma_api! { metadata: { diff --git a/crates/ruma-client-api/src/account/request_password_change_token_via_email.rs b/crates/ruma-client-api/src/account/request_password_change_token_via_email.rs index 814f4ba2..a08c503d 100644 --- a/crates/ruma-client-api/src/account/request_password_change_token_via_email.rs +++ b/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_identifiers::{ClientSecret, SessionId}; + use ruma_common::{api::ruma_api, ClientSecret, SessionId}; use crate::account::{IdentityServerInfo, IncomingIdentityServerInfo}; diff --git a/crates/ruma-client-api/src/account/request_password_change_token_via_msisdn.rs b/crates/ruma-client-api/src/account/request_password_change_token_via_msisdn.rs index b099ee7c..acbbeb64 100644 --- a/crates/ruma-client-api/src/account/request_password_change_token_via_msisdn.rs +++ b/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_identifiers::{ClientSecret, SessionId}; + use ruma_common::{api::ruma_api, ClientSecret, SessionId}; ruma_api! { metadata: { diff --git a/crates/ruma-client-api/src/account/request_registration_token_via_email.rs b/crates/ruma-client-api/src/account/request_registration_token_via_email.rs index 18fc213d..8633a6aa 100644 --- a/crates/ruma-client-api/src/account/request_registration_token_via_email.rs +++ b/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_identifiers::{ClientSecret, SessionId}; + use ruma_common::{api::ruma_api, ClientSecret, SessionId}; use crate::account::{IdentityServerInfo, IncomingIdentityServerInfo}; diff --git a/crates/ruma-client-api/src/account/request_registration_token_via_msisdn.rs b/crates/ruma-client-api/src/account/request_registration_token_via_msisdn.rs index 918b52d3..a4833155 100644 --- a/crates/ruma-client-api/src/account/request_registration_token_via_msisdn.rs +++ b/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_identifiers::{ClientSecret, SessionId}; + use ruma_common::{api::ruma_api, ClientSecret, SessionId}; use crate::account::{IdentityServerInfo, IncomingIdentityServerInfo}; diff --git a/crates/ruma-client-api/src/account/whoami.rs b/crates/ruma-client-api/src/account/whoami.rs index 4fcef0c7..44b4ba0b 100644 --- a/crates/ruma-client-api/src/account/whoami.rs +++ b/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_identifiers::{DeviceId, UserId}; + use ruma_common::{api::ruma_api, DeviceId, UserId}; ruma_api! { metadata: { diff --git a/crates/ruma-client-api/src/alias/create_alias.rs b/crates/ruma-client-api/src/alias/create_alias.rs index dacd94ac..4feb4f2a 100644 --- a/crates/ruma-client-api/src/alias/create_alias.rs +++ b/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_identifiers::{RoomAliasId, RoomId}; + use ruma_common::{api::ruma_api, RoomAliasId, RoomId}; ruma_api! { metadata: { diff --git a/crates/ruma-client-api/src/alias/delete_alias.rs b/crates/ruma-client-api/src/alias/delete_alias.rs index f669f3c4..e207bd0e 100644 --- a/crates/ruma-client-api/src/alias/delete_alias.rs +++ b/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_identifiers::RoomAliasId; + use ruma_common::{api::ruma_api, RoomAliasId}; ruma_api! { metadata: { diff --git a/crates/ruma-client-api/src/alias/get_alias.rs b/crates/ruma-client-api/src/alias/get_alias.rs index acdd197d..eda7c47b 100644 --- a/crates/ruma-client-api/src/alias/get_alias.rs +++ b/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_identifiers::{RoomAliasId, RoomId, ServerName}; + use ruma_common::{api::ruma_api, RoomAliasId, RoomId, ServerName}; ruma_api! { metadata: { diff --git a/crates/ruma-client-api/src/appservice/set_room_visibility.rs b/crates/ruma-client-api/src/appservice/set_room_visibility.rs index 969b1797..9c2a19d3 100644 --- a/crates/ruma-client-api/src/appservice/set_room_visibility.rs +++ b/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_identifiers::RoomId; + use ruma_common::{api::ruma_api, RoomId}; use crate::room::Visibility; diff --git a/crates/ruma-client-api/src/backup.rs b/crates/ruma-client-api/src/backup.rs index b434a98f..20034277 100644 --- a/crates/ruma-client-api/src/backup.rs +++ b/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}; diff --git a/crates/ruma-client-api/src/backup/add_backup_keys.rs b/crates/ruma-client-api/src/backup/add_backup_keys.rs index f74cec73..0776f67b 100644 --- a/crates/ruma-client-api/src/backup/add_backup_keys.rs +++ b/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_identifiers::RoomId; + use ruma_common::{api::ruma_api, RoomId}; use crate::backup::RoomKeyBackup; diff --git a/crates/ruma-client-api/src/backup/add_backup_keys_for_room.rs b/crates/ruma-client-api/src/backup/add_backup_keys_for_room.rs index 090a0bef..14473672 100644 --- a/crates/ruma-client-api/src/backup/add_backup_keys_for_room.rs +++ b/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_identifiers::RoomId; + use ruma_common::{api::ruma_api, RoomId}; use ruma_serde::Raw; use crate::backup::KeyBackupData; diff --git a/crates/ruma-client-api/src/backup/add_backup_keys_for_session.rs b/crates/ruma-client-api/src/backup/add_backup_keys_for_session.rs index bd06a400..9629eb79 100644 --- a/crates/ruma-client-api/src/backup/add_backup_keys_for_session.rs +++ b/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_identifiers::RoomId; + use ruma_common::{api::ruma_api, RoomId}; use ruma_serde::Raw; use crate::backup::KeyBackupData; diff --git a/crates/ruma-client-api/src/backup/delete_backup_keys_for_room.rs b/crates/ruma-client-api/src/backup/delete_backup_keys_for_room.rs index e3a257d3..40711833 100644 --- a/crates/ruma-client-api/src/backup/delete_backup_keys_for_room.rs +++ b/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_identifiers::RoomId; + use ruma_common::{api::ruma_api, RoomId}; ruma_api! { metadata: { diff --git a/crates/ruma-client-api/src/backup/delete_backup_keys_for_session.rs b/crates/ruma-client-api/src/backup/delete_backup_keys_for_session.rs index b3aee494..2da5b65e 100644 --- a/crates/ruma-client-api/src/backup/delete_backup_keys_for_session.rs +++ b/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_identifiers::RoomId; + use ruma_common::{api::ruma_api, RoomId}; ruma_api! { metadata: { diff --git a/crates/ruma-client-api/src/backup/get_backup_keys.rs b/crates/ruma-client-api/src/backup/get_backup_keys.rs index 043af03b..b08d99cc 100644 --- a/crates/ruma-client-api/src/backup/get_backup_keys.rs +++ b/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_identifiers::RoomId; + use ruma_common::{api::ruma_api, RoomId}; use crate::backup::RoomKeyBackup; diff --git a/crates/ruma-client-api/src/backup/get_backup_keys_for_room.rs b/crates/ruma-client-api/src/backup/get_backup_keys_for_room.rs index 5a078e96..d171c8e6 100644 --- a/crates/ruma-client-api/src/backup/get_backup_keys_for_room.rs +++ b/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_identifiers::RoomId; + use ruma_common::{api::ruma_api, RoomId}; use ruma_serde::Raw; use crate::backup::KeyBackupData; diff --git a/crates/ruma-client-api/src/backup/get_backup_keys_for_session.rs b/crates/ruma-client-api/src/backup/get_backup_keys_for_session.rs index a40da725..e5284a98 100644 --- a/crates/ruma-client-api/src/backup/get_backup_keys_for_session.rs +++ b/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_identifiers::RoomId; + use ruma_common::{api::ruma_api, RoomId}; use ruma_serde::Raw; use crate::backup::KeyBackupData; diff --git a/crates/ruma-client-api/src/capabilities.rs b/crates/ruma-client-api/src/capabilities.rs index 23c833b7..5fea7e50 100644 --- a/crates/ruma-client-api/src/capabilities.rs +++ b/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}; diff --git a/crates/ruma-client-api/src/config/get_global_account_data.rs b/crates/ruma-client-api/src/config/get_global_account_data.rs index bf2baf34..e244042a 100644 --- a/crates/ruma-client-api/src/config/get_global_account_data.rs +++ b/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_identifiers::UserId; + use ruma_common::{api::ruma_api, events::AnyGlobalAccountDataEventContent, UserId}; use ruma_serde::Raw; ruma_api! { diff --git a/crates/ruma-client-api/src/config/get_room_account_data.rs b/crates/ruma-client-api/src/config/get_room_account_data.rs index db0e6e61..394ad70e 100644 --- a/crates/ruma-client-api/src/config/get_room_account_data.rs +++ b/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_identifiers::{RoomId, UserId}; + use ruma_common::{api::ruma_api, events::AnyRoomAccountDataEventContent, RoomId, UserId}; use ruma_serde::Raw; ruma_api! { diff --git a/crates/ruma-client-api/src/config/set_global_account_data.rs b/crates/ruma-client-api/src/config/set_global_account_data.rs index 7c91133f..4450190c 100644 --- a/crates/ruma-client-api/src/config/set_global_account_data.rs +++ b/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; diff --git a/crates/ruma-client-api/src/config/set_room_account_data.rs b/crates/ruma-client-api/src/config/set_room_account_data.rs index 4c7fe522..ef624248 100644 --- a/crates/ruma-client-api/src/config/set_room_account_data.rs +++ b/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; diff --git a/crates/ruma-client-api/src/context/get_context.rs b/crates/ruma-client-api/src/context/get_context.rs index 17d2f063..90fda604 100644 --- a/crates/ruma-client-api/src/context/get_context.rs +++ b/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}; diff --git a/crates/ruma-client-api/src/device.rs b/crates/ruma-client-api/src/device.rs index fbb16c5c..8ae251ca 100644 --- a/crates/ruma-client-api/src/device.rs +++ b/crates/ruma-client-api/src/device.rs @@ -1,7 +1,6 @@ //! Endpoints for managing devices. -use ruma_common::MilliSecondsSinceUnixEpoch; -use ruma_identifiers::DeviceId; +use ruma_common::{DeviceId, MilliSecondsSinceUnixEpoch}; use serde::{Deserialize, Serialize}; pub mod delete_device; diff --git a/crates/ruma-client-api/src/device/delete_device.rs b/crates/ruma-client-api/src/device/delete_device.rs index 1869271e..51a1136b 100644 --- a/crates/ruma-client-api/src/device/delete_device.rs +++ b/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_identifiers::DeviceId; + use ruma_common::{api::ruma_api, DeviceId}; use crate::uiaa::{AuthData, IncomingAuthData, UiaaResponse}; diff --git a/crates/ruma-client-api/src/device/delete_devices.rs b/crates/ruma-client-api/src/device/delete_devices.rs index a7003b09..2f120937 100644 --- a/crates/ruma-client-api/src/device/delete_devices.rs +++ b/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_identifiers::DeviceId; + use ruma_common::{api::ruma_api, DeviceId}; use crate::uiaa::{AuthData, IncomingAuthData, UiaaResponse}; diff --git a/crates/ruma-client-api/src/device/get_device.rs b/crates/ruma-client-api/src/device/get_device.rs index 4443f57a..d04d07db 100644 --- a/crates/ruma-client-api/src/device/get_device.rs +++ b/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_identifiers::DeviceId; + use ruma_common::{api::ruma_api, DeviceId}; use crate::device::Device; diff --git a/crates/ruma-client-api/src/device/update_device.rs b/crates/ruma-client-api/src/device/update_device.rs index 8b79020b..c9be8abb 100644 --- a/crates/ruma-client-api/src/device/update_device.rs +++ b/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_identifiers::DeviceId; + use ruma_common::{api::ruma_api, DeviceId}; ruma_api! { metadata: { diff --git a/crates/ruma-client-api/src/directory/get_public_rooms.rs b/crates/ruma-client-api/src/directory/get_public_rooms.rs index 9b194f3c..1eca9513 100644 --- a/crates/ruma-client-api/src/directory/get_public_rooms.rs +++ b/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_identifiers::ServerName; + use ruma_common::{api::ruma_api, directory::PublicRoomsChunk, 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_identifiers::server_name; + use ruma_common::{ + api::{MatrixVersion, OutgoingRequest as _, SendAccessToken}, + server_name, + }; let req = super::Request { limit: Some(uint!(10)), diff --git a/crates/ruma-client-api/src/directory/get_public_rooms_filtered.rs b/crates/ruma-client-api/src/directory/get_public_rooms_filtered.rs index 14c83197..62f06b5c 100644 --- a/crates/ruma-client-api/src/directory/get_public_rooms_filtered.rs +++ b/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: { diff --git a/crates/ruma-client-api/src/directory/get_room_visibility.rs b/crates/ruma-client-api/src/directory/get_room_visibility.rs index 6819d990..41ac7569 100644 --- a/crates/ruma-client-api/src/directory/get_room_visibility.rs +++ b/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_identifiers::RoomId; + use ruma_common::{api::ruma_api, RoomId}; use crate::room::Visibility; diff --git a/crates/ruma-client-api/src/directory/set_room_visibility.rs b/crates/ruma-client-api/src/directory/set_room_visibility.rs index bb119062..45b4069d 100644 --- a/crates/ruma-client-api/src/directory/set_room_visibility.rs +++ b/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_identifiers::RoomId; + use ruma_common::{api::ruma_api, RoomId}; use crate::room::Visibility; diff --git a/crates/ruma-client-api/src/error.rs b/crates/ruma-client-api/src/error.rs index 23f1f4d9..dc113e94 100644 --- a/crates/ruma-client-api/src/error.rs +++ b/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::{ - error::{DeserializationError, IntoHttpError}, - EndpointError, OutgoingResponse, +use ruma_common::{ + api::{ + 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}; diff --git a/crates/ruma-client-api/src/error/kind_serde.rs b/crates/ruma-client-api/src/error/kind_serde.rs index 6760125a..9179dfaf 100644 --- a/crates/ruma-client-api/src/error/kind_serde.rs +++ b/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; diff --git a/crates/ruma-client-api/src/filter.rs b/crates/ruma-client-api/src/filter.rs index b6ebb4c5..fb947c57 100644 --- a/crates/ruma-client-api/src/filter.rs +++ b/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; diff --git a/crates/ruma-client-api/src/filter/create_filter.rs b/crates/ruma-client-api/src/filter/create_filter.rs index d29946c8..37d77179 100644 --- a/crates/ruma-client-api/src/filter/create_filter.rs +++ b/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_identifiers::UserId; + use ruma_common::{api::ruma_api, 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_identifiers::user_id; + use ruma_common::{ + api::{MatrixVersion, OutgoingRequest, SendAccessToken}, + user_id, + }; use crate::filter::FilterDefinition; diff --git a/crates/ruma-client-api/src/filter/get_filter.rs b/crates/ruma-client-api/src/filter/get_filter.rs index ab24a2b4..073cb03d 100644 --- a/crates/ruma-client-api/src/filter/get_filter.rs +++ b/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_identifiers::UserId; + use ruma_common::{api::ruma_api, UserId}; use crate::filter::IncomingFilterDefinition; diff --git a/crates/ruma-client-api/src/keys/claim_keys.rs b/crates/ruma-client-api/src/keys/claim_keys.rs index 2787d1b8..cbffff53 100644 --- a/crates/ruma-client-api/src/keys/claim_keys.rs +++ b/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_identifiers::{DeviceId, DeviceKeyAlgorithm, DeviceKeyId, UserId}; + use ruma_common::{ + api::ruma_api, encryption::OneTimeKey, DeviceId, DeviceKeyAlgorithm, DeviceKeyId, UserId, + }; use ruma_serde::Raw; use serde_json::Value as JsonValue; diff --git a/crates/ruma-client-api/src/keys/get_key_changes.rs b/crates/ruma-client-api/src/keys/get_key_changes.rs index f2c3f02d..9c3aea7f 100644 --- a/crates/ruma-client-api/src/keys/get_key_changes.rs +++ b/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_identifiers::UserId; + use ruma_common::{api::ruma_api, UserId}; ruma_api! { metadata: { diff --git a/crates/ruma-client-api/src/keys/get_keys.rs b/crates/ruma-client-api/src/keys/get_keys.rs index 884cecf4..baf4d6fc 100644 --- a/crates/ruma-client-api/src/keys/get_keys.rs +++ b/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; diff --git a/crates/ruma-client-api/src/keys/upload_keys.rs b/crates/ruma-client-api/src/keys/upload_keys.rs index 31169ad5..aaad12ab 100644 --- a/crates/ruma-client-api/src/keys/upload_keys.rs +++ b/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! { diff --git a/crates/ruma-client-api/src/keys/upload_signatures.rs b/crates/ruma-client-api/src/keys/upload_signatures.rs index ac2ea66f..bfab8eb0 100644 --- a/crates/ruma-client-api/src/keys/upload_signatures.rs +++ b/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; diff --git a/crates/ruma-client-api/src/knock/knock_room.rs b/crates/ruma-client-api/src/knock/knock_room.rs index 35d17052..610044bf 100644 --- a/crates/ruma-client-api/src/knock/knock_room.rs +++ b/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_identifiers::{RoomId, RoomOrAliasId, ServerName}; + use ruma_common::{api::ruma_api, RoomId, RoomOrAliasId, ServerName}; ruma_api! { metadata: { diff --git a/crates/ruma-client-api/src/media/create_content.rs b/crates/ruma-client-api/src/media/create_content.rs index f668b3c3..abd1e745 100644 --- a/crates/ruma-client-api/src/media/create_content.rs +++ b/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_identifiers::MxcUri; + use ruma_common::{api::ruma_api, MxcUri}; ruma_api! { metadata: { diff --git a/crates/ruma-client-api/src/media/get_content.rs b/crates/ruma-client-api/src/media/get_content.rs index 517f1556..d4bec5de 100644 --- a/crates/ruma-client-api/src/media/get_content.rs +++ b/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_identifiers::{Error, MxcUri, ServerName}; + use ruma_common::{api::ruma_api, Error, MxcUri, ServerName}; ruma_api! { metadata: { diff --git a/crates/ruma-client-api/src/media/get_content_as_filename.rs b/crates/ruma-client-api/src/media/get_content_as_filename.rs index 032ad710..8f48c736 100644 --- a/crates/ruma-client-api/src/media/get_content_as_filename.rs +++ b/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_identifiers::{Error, MxcUri, ServerName}; + use ruma_common::{api::ruma_api, Error, MxcUri, ServerName}; ruma_api! { metadata: { diff --git a/crates/ruma-client-api/src/media/get_content_thumbnail.rs b/crates/ruma-client-api/src/media/get_content_thumbnail.rs index 00c430d6..7a7b88cc 100644 --- a/crates/ruma-client-api/src/media/get_content_thumbnail.rs +++ b/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_identifiers::{Error, MxcUri, ServerName}; + use ruma_common::{api::ruma_api, Error, MxcUri, ServerName}; use ruma_serde::StringEnum; use crate::PrivOwnedStr; diff --git a/crates/ruma-client-api/src/membership.rs b/crates/ruma-client-api/src/membership.rs index b1c94de5..a788d0a1 100644 --- a/crates/ruma-client-api/src/membership.rs +++ b/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_identifiers::{ServerName, ServerSigningKeyId, UserId}; +use ruma_common::{thirdparty::Medium, ServerName, ServerSigningKeyId, UserId}; use ruma_serde::Outgoing; use serde::Serialize; diff --git a/crates/ruma-client-api/src/membership/ban_user.rs b/crates/ruma-client-api/src/membership/ban_user.rs index 7e84fe2f..f837e4fe 100644 --- a/crates/ruma-client-api/src/membership/ban_user.rs +++ b/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_identifiers::{RoomId, UserId}; + use ruma_common::{api::ruma_api, RoomId, UserId}; ruma_api! { metadata: { diff --git a/crates/ruma-client-api/src/membership/forget_room.rs b/crates/ruma-client-api/src/membership/forget_room.rs index 2f989cf6..90cfbe7d 100644 --- a/crates/ruma-client-api/src/membership/forget_room.rs +++ b/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_identifiers::RoomId; + use ruma_common::{api::ruma_api, RoomId}; ruma_api! { metadata: { diff --git a/crates/ruma-client-api/src/membership/get_member_events.rs b/crates/ruma-client-api/src/membership/get_member_events.rs index cc45bd94..897f3b82 100644 --- a/crates/ruma-client-api/src/membership/get_member_events.rs +++ b/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_identifiers::RoomId; + use ruma_common::{api::ruma_api, events::room::member::RoomMemberEvent, RoomId}; use ruma_serde::{Raw, StringEnum}; use crate::PrivOwnedStr; diff --git a/crates/ruma-client-api/src/membership/invite_user.rs b/crates/ruma-client-api/src/membership/invite_user.rs index a1ad39fc..bb311b57 100644 --- a/crates/ruma-client-api/src/membership/invite_user.rs +++ b/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_identifiers::{RoomId, UserId}; + use ruma_common::{api::ruma_api, 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_identifiers::user_id; + use ruma_common::{thirdparty::Medium, user_id}; use serde_json::{from_value as from_json_value, json}; use super::IncomingInvitationRecipient; diff --git a/crates/ruma-client-api/src/membership/join_room_by_id.rs b/crates/ruma-client-api/src/membership/join_room_by_id.rs index 15904477..52d0c49e 100644 --- a/crates/ruma-client-api/src/membership/join_room_by_id.rs +++ b/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_identifiers::RoomId; + use ruma_common::{api::ruma_api, RoomId}; use crate::membership::{IncomingThirdPartySigned, ThirdPartySigned}; diff --git a/crates/ruma-client-api/src/membership/join_room_by_id_or_alias.rs b/crates/ruma-client-api/src/membership/join_room_by_id_or_alias.rs index 2dc63eea..cfa28463 100644 --- a/crates/ruma-client-api/src/membership/join_room_by_id_or_alias.rs +++ b/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_identifiers::{RoomId, RoomOrAliasId, ServerName}; + use ruma_common::{api::ruma_api, RoomId, RoomOrAliasId, ServerName}; use crate::membership::{IncomingThirdPartySigned, ThirdPartySigned}; diff --git a/crates/ruma-client-api/src/membership/joined_members.rs b/crates/ruma-client-api/src/membership/joined_members.rs index e83e2b51..0fae4cea 100644 --- a/crates/ruma-client-api/src/membership/joined_members.rs +++ b/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_identifiers::{MxcUri, RoomId, UserId}; + use ruma_common::{api::ruma_api, MxcUri, RoomId, UserId}; use serde::{Deserialize, Serialize}; ruma_api! { diff --git a/crates/ruma-client-api/src/membership/joined_rooms.rs b/crates/ruma-client-api/src/membership/joined_rooms.rs index 63635919..ce3082d7 100644 --- a/crates/ruma-client-api/src/membership/joined_rooms.rs +++ b/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_identifiers::RoomId; + use ruma_common::{api::ruma_api, RoomId}; ruma_api! { metadata: { diff --git a/crates/ruma-client-api/src/membership/kick_user.rs b/crates/ruma-client-api/src/membership/kick_user.rs index 1c190584..7f92b04a 100644 --- a/crates/ruma-client-api/src/membership/kick_user.rs +++ b/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_identifiers::{RoomId, UserId}; + use ruma_common::{api::ruma_api, RoomId, UserId}; ruma_api! { metadata: { diff --git a/crates/ruma-client-api/src/membership/leave_room.rs b/crates/ruma-client-api/src/membership/leave_room.rs index 8d65e80e..1b61dfb5 100644 --- a/crates/ruma-client-api/src/membership/leave_room.rs +++ b/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_identifiers::RoomId; + use ruma_common::{api::ruma_api, RoomId}; ruma_api! { metadata: { diff --git a/crates/ruma-client-api/src/membership/unban_user.rs b/crates/ruma-client-api/src/membership/unban_user.rs index f98da91b..ea162c1a 100644 --- a/crates/ruma-client-api/src/membership/unban_user.rs +++ b/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_identifiers::{RoomId, UserId}; + use ruma_common::{api::ruma_api, RoomId, UserId}; ruma_api! { metadata: { diff --git a/crates/ruma-client-api/src/message/get_message_events.rs b/crates/ruma-client-api/src/message/get_message_events.rs index 766ba92d..069f4a21 100644 --- a/crates/ruma-client-api/src/message/get_message_events.rs +++ b/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_identifiers::room_id; + use ruma_common::{ + api::{MatrixVersion, OutgoingRequest, SendAccessToken}, + room_id, + }; use super::{Direction, Request}; use crate::filter::{LazyLoadOptions, RoomEventFilter}; diff --git a/crates/ruma-client-api/src/message/send_message_event.rs b/crates/ruma-client-api/src/message/send_message_event.rs index 3344f4ac..24dab7d9 100644 --- a/crates/ruma-client-api/src/message/send_message_event.rs +++ b/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; diff --git a/crates/ruma-client-api/src/presence/get_presence.rs b/crates/ruma-client-api/src/presence/get_presence.rs index 3dbc7345..6316cf30 100644 --- a/crates/ruma-client-api/src/presence/get_presence.rs +++ b/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_identifiers::UserId; + use ruma_common::{api::ruma_api, presence::PresenceState, UserId}; ruma_api! { metadata: { diff --git a/crates/ruma-client-api/src/presence/set_presence.rs b/crates/ruma-client-api/src/presence/set_presence.rs index ea529273..2f415344 100644 --- a/crates/ruma-client-api/src/presence/set_presence.rs +++ b/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_identifiers::UserId; + use ruma_common::{api::ruma_api, presence::PresenceState, UserId}; ruma_api! { metadata: { diff --git a/crates/ruma-client-api/src/profile/get_avatar_url.rs b/crates/ruma-client-api/src/profile/get_avatar_url.rs index 72c7d6f9..c7903dba 100644 --- a/crates/ruma-client-api/src/profile/get_avatar_url.rs +++ b/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_identifiers::{MxcUri, UserId}; + use ruma_common::{api::ruma_api, MxcUri, UserId}; ruma_api! { metadata: { diff --git a/crates/ruma-client-api/src/profile/get_display_name.rs b/crates/ruma-client-api/src/profile/get_display_name.rs index 349c49fd..e2848d8d 100644 --- a/crates/ruma-client-api/src/profile/get_display_name.rs +++ b/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_identifiers::UserId; + use ruma_common::{api::ruma_api, UserId}; ruma_api! { metadata: { diff --git a/crates/ruma-client-api/src/profile/get_profile.rs b/crates/ruma-client-api/src/profile/get_profile.rs index 70158a7c..d3d2b1b3 100644 --- a/crates/ruma-client-api/src/profile/get_profile.rs +++ b/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_identifiers::{MxcUri, UserId}; + use ruma_common::{api::ruma_api, MxcUri, UserId}; ruma_api! { metadata: { diff --git a/crates/ruma-client-api/src/profile/set_avatar_url.rs b/crates/ruma-client-api/src/profile/set_avatar_url.rs index 4eed14c2..a9921026 100644 --- a/crates/ruma-client-api/src/profile/set_avatar_url.rs +++ b/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_identifiers::{MxcUri, UserId}; + use ruma_common::{api::ruma_api, MxcUri, UserId}; ruma_api! { metadata: { diff --git a/crates/ruma-client-api/src/profile/set_display_name.rs b/crates/ruma-client-api/src/profile/set_display_name.rs index a6622e59..1ee538c7 100644 --- a/crates/ruma-client-api/src/profile/set_display_name.rs +++ b/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_identifiers::UserId; + use ruma_common::{api::ruma_api, UserId}; ruma_api! { metadata: { diff --git a/crates/ruma-client-api/src/push/get_notifications.rs b/crates/ruma-client-api/src/push/get_notifications.rs index ff539125..6ce35965 100644 --- a/crates/ruma-client-api/src/push/get_notifications.rs +++ b/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}; diff --git a/crates/ruma-client-api/src/read_marker/set_read_marker.rs b/crates/ruma-client-api/src/read_marker/set_read_marker.rs index 97939327..f6164208 100644 --- a/crates/ruma-client-api/src/read_marker/set_read_marker.rs +++ b/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_identifiers::{EventId, RoomId}; + use ruma_common::{api::ruma_api, EventId, RoomId}; ruma_api! { metadata: { diff --git a/crates/ruma-client-api/src/receipt/create_receipt.rs b/crates/ruma-client-api/src/receipt/create_receipt.rs index 10d42c4a..20c16cd2 100644 --- a/crates/ruma-client-api/src/receipt/create_receipt.rs +++ b/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_identifiers::{EventId, RoomId}; + use ruma_common::{api::ruma_api, receipt::ReceiptType, EventId, RoomId}; ruma_api! { metadata: { diff --git a/crates/ruma-client-api/src/redact/redact_event.rs b/crates/ruma-client-api/src/redact/redact_event.rs index ea54071c..47b2f59d 100644 --- a/crates/ruma-client-api/src/redact/redact_event.rs +++ b/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_identifiers::{EventId, RoomId, TransactionId}; + use ruma_common::{api::ruma_api, EventId, RoomId, TransactionId}; ruma_api! { metadata: { diff --git a/crates/ruma-client-api/src/room/aliases.rs b/crates/ruma-client-api/src/room/aliases.rs index f3234dc9..971e3209 100644 --- a/crates/ruma-client-api/src/room/aliases.rs +++ b/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_identifiers::{RoomAliasId, RoomId}; + use ruma_common::{api::ruma_api, RoomAliasId, RoomId}; ruma_api! { metadata: { diff --git a/crates/ruma-client-api/src/room/create_room.rs b/crates/ruma-client-api/src/room/create_room.rs index f1c37572..8897cbb3 100644 --- a/crates/ruma-client-api/src/room/create_room.rs +++ b/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}; diff --git a/crates/ruma-client-api/src/room/get_room_event.rs b/crates/ruma-client-api/src/room/get_room_event.rs index 0cf257e7..d0e1956b 100644 --- a/crates/ruma-client-api/src/room/get_room_event.rs +++ b/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_identifiers::{EventId, RoomId}; + use ruma_common::{api::ruma_api, events::AnyRoomEvent, EventId, RoomId}; use ruma_serde::Raw; ruma_api! { diff --git a/crates/ruma-client-api/src/room/report_content.rs b/crates/ruma-client-api/src/room/report_content.rs index 8e6dc85c..78e1ec31 100644 --- a/crates/ruma-client-api/src/room/report_content.rs +++ b/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_identifiers::{EventId, RoomId}; + use ruma_common::{api::ruma_api, EventId, RoomId}; ruma_api! { metadata: { diff --git a/crates/ruma-client-api/src/room/upgrade_room.rs b/crates/ruma-client-api/src/room/upgrade_room.rs index c040cea3..554675ac 100644 --- a/crates/ruma-client-api/src/room/upgrade_room.rs +++ b/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_identifiers::{RoomId, RoomVersionId}; + use ruma_common::{api::ruma_api, RoomId, RoomVersionId}; ruma_api! { metadata: { diff --git a/crates/ruma-client-api/src/search/search_events.rs b/crates/ruma-client-api/src/search/search_events.rs index ee5205e3..4690e600 100644 --- a/crates/ruma-client-api/src/search/search_events.rs +++ b/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}; diff --git a/crates/ruma-client-api/src/server/get_user_info.rs b/crates/ruma-client-api/src/server/get_user_info.rs index dcb6f329..f3fa0d25 100644 --- a/crates/ruma-client-api/src/server/get_user_info.rs +++ b/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_identifiers::UserId; + use ruma_common::{api::ruma_api, MilliSecondsSinceUnixEpoch, UserId}; use serde::{Deserialize, Serialize}; ruma_api! { diff --git a/crates/ruma-client-api/src/session/get_login_types.rs b/crates/ruma-client-api/src/session/get_login_types.rs index ff650ddd..452bd1de 100644 --- a/crates/ruma-client-api/src/session/get_login_types.rs +++ b/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_identifiers::MxcUri; + use ruma_common::{api::ruma_api, MxcUri}; use ruma_serde::{JsonObject, StringEnum}; use serde::{de::DeserializeOwned, Deserialize, Serialize}; use serde_json::Value as JsonValue; diff --git a/crates/ruma-client-api/src/session/login.rs b/crates/ruma-client-api/src/session/login.rs index 3c7e4ea9..ffa589d7 100644 --- a/crates/ruma-client-api/src/session/login.rs +++ b/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_identifiers::{DeviceId, ServerName, UserId}; + use ruma_common::{api::ruma_api, DeviceId, ServerName, UserId}; use ruma_serde::{JsonObject, Outgoing}; use serde::{ de::{self, DeserializeOwned}, diff --git a/crates/ruma-client-api/src/session/login_fallback.rs b/crates/ruma-client-api/src/session/login_fallback.rs index bbc45623..2cbc8faa 100644 --- a/crates/ruma-client-api/src/session/login_fallback.rs +++ b/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_identifiers::DeviceId; +use ruma_common::{api::ruma_api, DeviceId}; ruma_api! { metadata: { diff --git a/crates/ruma-client-api/src/space.rs b/crates/ruma-client-api/src/space.rs index 5301070d..9f8178ba 100644 --- a/crates/ruma-client-api/src/space.rs +++ b/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}; diff --git a/crates/ruma-client-api/src/space/get_hierarchy.rs b/crates/ruma-client-api/src/space/get_hierarchy.rs index b3066e8a..a37054d1 100644 --- a/crates/ruma-client-api/src/space/get_hierarchy.rs +++ b/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_identifiers::RoomId; + use ruma_common::{api::ruma_api, RoomId}; use crate::space::SpaceHierarchyRoomsChunk; diff --git a/crates/ruma-client-api/src/state/get_state_events.rs b/crates/ruma-client-api/src/state/get_state_events.rs index 9ff13052..f5dcebdf 100644 --- a/crates/ruma-client-api/src/state/get_state_events.rs +++ b/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_identifiers::RoomId; + use ruma_common::{api::ruma_api, events::AnyStateEvent, RoomId}; use ruma_serde::Raw; ruma_api! { diff --git a/crates/ruma-client-api/src/state/get_state_events_for_key.rs b/crates/ruma-client-api/src/state/get_state_events_for_key.rs index f4aa91e2..a9c51786 100644 --- a/crates/ruma-client-api/src/state/get_state_events_for_key.rs +++ b/crates/ruma-client-api/src/state/get_state_events_for_key.rs @@ -8,8 +8,8 @@ pub mod v3 { use ruma_common::{ api::ruma_api, events::{AnyStateEventContent, EventType}, + RoomId, }; - use ruma_identifiers::RoomId; use ruma_serde::{Outgoing, Raw}; ruma_api! { diff --git a/crates/ruma-client-api/src/state/send_state_event.rs b/crates/ruma-client-api/src/state/send_state_event.rs index e7e32511..5e7a1146 100644 --- a/crates/ruma-client-api/src/state/send_state_event.rs +++ b/crates/ruma-client-api/src/state/send_state_event.rs @@ -8,8 +8,8 @@ pub mod v3 { use ruma_common::{ api::ruma_api, events::{AnyStateEventContent, StateEventContent}, + EventId, RoomId, }; - use ruma_identifiers::{EventId, RoomId}; use ruma_serde::{Outgoing, Raw}; use serde_json::value::to_raw_value as to_raw_json_value; diff --git a/crates/ruma-client-api/src/sync/sync_events.rs b/crates/ruma-client-api/src/sync/sync_events.rs index af9a65f7..2a7718c8 100644 --- a/crates/ruma-client-api/src/sync/sync_events.rs +++ b/crates/ruma-client-api/src/sync/sync_events.rs @@ -16,8 +16,8 @@ pub mod v3 { AnyToDeviceEvent, }, presence::PresenceState, + DeviceKeyAlgorithm, RoomId, UserId, }; - use ruma_identifiers::{DeviceKeyAlgorithm, RoomId, UserId}; use ruma_serde::{Outgoing, Raw}; use serde::{Deserialize, Serialize}; diff --git a/crates/ruma-client-api/src/tag/create_tag.rs b/crates/ruma-client-api/src/tag/create_tag.rs index 7d21ee4c..f8d0bba3 100644 --- a/crates/ruma-client-api/src/tag/create_tag.rs +++ b/crates/ruma-client-api/src/tag/create_tag.rs @@ -5,8 +5,7 @@ pub mod v3 { //! //! [spec]: https://spec.matrix.org/v1.2/client-server-api/#put_matrixclientv3useruseridroomsroomidtagstag - use ruma_common::{api::ruma_api, events::tag::TagInfo}; - use ruma_identifiers::{RoomId, UserId}; + use ruma_common::{api::ruma_api, events::tag::TagInfo, RoomId, UserId}; ruma_api! { metadata: { diff --git a/crates/ruma-client-api/src/tag/delete_tag.rs b/crates/ruma-client-api/src/tag/delete_tag.rs index a8ab1a0b..91b5184d 100644 --- a/crates/ruma-client-api/src/tag/delete_tag.rs +++ b/crates/ruma-client-api/src/tag/delete_tag.rs @@ -5,8 +5,7 @@ pub mod v3 { //! //! [spec]: https://spec.matrix.org/v1.2/client-server-api/#put_matrixclientv3useruseridroomsroomidtagstag - use ruma_common::api::ruma_api; - use ruma_identifiers::{RoomId, UserId}; + use ruma_common::{api::ruma_api, RoomId, UserId}; ruma_api! { metadata: { diff --git a/crates/ruma-client-api/src/tag/get_tags.rs b/crates/ruma-client-api/src/tag/get_tags.rs index 79db743d..a1366686 100644 --- a/crates/ruma-client-api/src/tag/get_tags.rs +++ b/crates/ruma-client-api/src/tag/get_tags.rs @@ -5,8 +5,7 @@ pub mod v3 { //! //! [spec]: https://spec.matrix.org/v1.2/client-server-api/#get_matrixclientv3useruseridroomsroomidtags - use ruma_common::{api::ruma_api, events::tag::Tags}; - use ruma_identifiers::{RoomId, UserId}; + use ruma_common::{api::ruma_api, events::tag::Tags, RoomId, UserId}; ruma_api! { metadata: { diff --git a/crates/ruma-client-api/src/thirdparty/get_location_for_room_alias.rs b/crates/ruma-client-api/src/thirdparty/get_location_for_room_alias.rs index 0579adc4..883c2421 100644 --- a/crates/ruma-client-api/src/thirdparty/get_location_for_room_alias.rs +++ b/crates/ruma-client-api/src/thirdparty/get_location_for_room_alias.rs @@ -5,8 +5,7 @@ pub mod v3 { //! //! [spec]: https://spec.matrix.org/v1.2/client-server-api/#get_matrixclientv3thirdpartylocation - use ruma_common::{api::ruma_api, thirdparty::Location}; - use ruma_identifiers::RoomAliasId; + use ruma_common::{api::ruma_api, thirdparty::Location, RoomAliasId}; ruma_api! { metadata: { diff --git a/crates/ruma-client-api/src/thirdparty/get_user_for_user_id.rs b/crates/ruma-client-api/src/thirdparty/get_user_for_user_id.rs index adca1482..9fa19b2a 100644 --- a/crates/ruma-client-api/src/thirdparty/get_user_for_user_id.rs +++ b/crates/ruma-client-api/src/thirdparty/get_user_for_user_id.rs @@ -5,8 +5,7 @@ pub mod v3 { //! //! [spec]: https://spec.matrix.org/v1.2/client-server-api/#get_matrixclientv3thirdpartyuser - use ruma_common::{api::ruma_api, thirdparty::User}; - use ruma_identifiers::UserId; + use ruma_common::{api::ruma_api, thirdparty::User, UserId}; ruma_api! { metadata: { diff --git a/crates/ruma-client-api/src/to_device/send_event_to_device.rs b/crates/ruma-client-api/src/to_device/send_event_to_device.rs index 297422d9..58fd6cc8 100644 --- a/crates/ruma-client-api/src/to_device/send_event_to_device.rs +++ b/crates/ruma-client-api/src/to_device/send_event_to_device.rs @@ -9,8 +9,8 @@ pub mod v3 { use ruma_common::{ api::ruma_api, events::AnyToDeviceEventContent, to_device::DeviceIdOrAllDevices, + TransactionId, UserId, }; - use ruma_identifiers::{TransactionId, UserId}; use ruma_serde::Raw; ruma_api! { diff --git a/crates/ruma-client-api/src/typing/create_typing_event.rs b/crates/ruma-client-api/src/typing/create_typing_event.rs index fcaa9935..c7a677bf 100644 --- a/crates/ruma-client-api/src/typing/create_typing_event.rs +++ b/crates/ruma-client-api/src/typing/create_typing_event.rs @@ -7,8 +7,7 @@ pub mod v3 { use std::time::Duration; - use ruma_common::api::ruma_api; - use ruma_identifiers::{RoomId, UserId}; + use ruma_common::{api::ruma_api, RoomId, UserId}; use serde::{de::Error, Deserialize, Deserializer, Serialize}; ruma_api! { diff --git a/crates/ruma-client-api/src/uiaa.rs b/crates/ruma-client-api/src/uiaa.rs index 93d28109..f389d0b8 100644 --- a/crates/ruma-client-api/src/uiaa.rs +++ b/crates/ruma-client-api/src/uiaa.rs @@ -11,8 +11,8 @@ use ruma_common::{ EndpointError, OutgoingResponse, }, thirdparty::Medium, + ClientSecret, SessionId, }; -use ruma_identifiers::{ClientSecret, SessionId}; use ruma_serde::{from_raw_json_value, JsonObject, Outgoing, StringEnum}; use serde::{ de::{self, DeserializeOwned}, diff --git a/crates/ruma-client-api/src/user_directory/search_users.rs b/crates/ruma-client-api/src/user_directory/search_users.rs index 6f92d132..7fbbff1f 100644 --- a/crates/ruma-client-api/src/user_directory/search_users.rs +++ b/crates/ruma-client-api/src/user_directory/search_users.rs @@ -6,8 +6,7 @@ pub mod v3 { //! [spec]: https://spec.matrix.org/v1.2/client-server-api/#post_matrixclientv3user_directorysearch use js_int::{uint, UInt}; - use ruma_common::api::ruma_api; - use ruma_identifiers::{MxcUri, UserId}; + use ruma_common::{api::ruma_api, MxcUri, UserId}; use serde::{Deserialize, Serialize}; ruma_api! { diff --git a/crates/ruma-client/Cargo.toml b/crates/ruma-client/Cargo.toml index 68ddad48..04c284fe 100644 --- a/crates/ruma-client/Cargo.toml +++ b/crates/ruma-client/Cargo.toml @@ -43,7 +43,6 @@ isahc-crate = { package = "isahc", version = "1.3.1", optional = true } reqwest = { version = "0.11.4", optional = true, default-features = false } ruma-client-api = { version = "0.13.0", path = "../ruma-client-api", optional = true, features = ["client"] } ruma-common = { version = "0.8.0", path = "../ruma-common", features = ["api"] } -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" diff --git a/crates/ruma-client/src/client.rs b/crates/ruma-client/src/client.rs index 7e965c9e..f0f6b33a 100644 --- a/crates/ruma-client/src/client.rs +++ b/crates/ruma-client/src/client.rs @@ -15,8 +15,8 @@ use ruma_client_api::{ use ruma_common::{ api::{MatrixVersion, OutgoingRequest, SendAccessToken}, presence::PresenceState, + DeviceId, UserId, }; -use ruma_identifiers::{DeviceId, UserId}; use crate::{ add_user_id_to_query, send_customized_request, Error, HttpClient, ResponseError, ResponseResult, diff --git a/crates/ruma-client/src/http_client.rs b/crates/ruma-client/src/http_client.rs index 14f1cc34..0198776d 100644 --- a/crates/ruma-client/src/http_client.rs +++ b/crates/ruma-client/src/http_client.rs @@ -5,8 +5,10 @@ use std::{future::Future, pin::Pin}; use async_trait::async_trait; use bytes::BufMut; -use ruma_common::api::{MatrixVersion, OutgoingRequest, SendAccessToken}; -use ruma_identifiers::UserId; +use ruma_common::{ + api::{MatrixVersion, OutgoingRequest, SendAccessToken}, + UserId, +}; use crate::{add_user_id_to_query, ResponseError, ResponseResult}; diff --git a/crates/ruma-client/src/lib.rs b/crates/ruma-client/src/lib.rs index 1af20943..7ae93a52 100644 --- a/crates/ruma-client/src/lib.rs +++ b/crates/ruma-client/src/lib.rs @@ -68,8 +68,7 @@ //! use std::convert::TryFrom; //! //! use ruma_client_api::alias::get_alias; -//! use ruma_common::api::MatrixVersion; -//! use ruma_identifiers::{room_alias_id, room_id}; +//! use ruma_common::{api::MatrixVersion, room_alias_id, room_id}; //! //! let response = client //! .send_request(get_alias::v3::Request::new(room_alias_id!("#example_room:example.com"))) @@ -104,8 +103,10 @@ use std::{any::type_name, future::Future}; -use ruma_common::api::{MatrixVersion, OutgoingRequest, SendAccessToken}; -use ruma_identifiers::UserId; +use ruma_common::{ + api::{MatrixVersion, OutgoingRequest, SendAccessToken}, + UserId, +}; use tracing::{info_span, Instrument}; // "Undo" rename from `Cargo.toml` that only serves to make crate names available as a Cargo diff --git a/crates/ruma-common/Cargo.toml b/crates/ruma-common/Cargo.toml index 9b9de679..7f1d0379 100644 --- a/crates/ruma-common/Cargo.toml +++ b/crates/ruma-common/Cargo.toml @@ -20,10 +20,11 @@ default = ["client", "server"] client = [] server = [] -api = ["bytes", "http", "percent-encoding", "ruma-macros", "thiserror"] -compat = ["ruma-macros/compat"] -events = ["indoc", "ruma-macros", "ruma-identifiers/serde", "thiserror"] +api = ["bytes", "http", "thiserror"] +compat = ["ruma-macros/compat", "ruma-identifiers-validation/compat"] +events = ["indoc", "thiserror"] markdown = ["pulldown-cmark"] +rand = ["rand_crate", "uuid"] unstable-exhaustive-types = [] unstable-pdu = [] unstable-pre-spec = [] @@ -37,19 +38,23 @@ unstable-msc3551 = ["unstable-msc1767"] [dependencies] bytes = { version = "1.0.1", optional = true } criterion = { version = "0.3.3", optional = true } +either = { version = "1.6.1", optional = true } http = { version = "0.2.2", optional = true } indexmap = { version = "1.6.2", features = ["serde-1"] } indoc = { version = "1.0", optional = true } js_int = { version = "0.2.0", features = ["serde"] } -percent-encoding = { version = "2.1.0", optional = true } +percent-encoding = "2.1.0" pulldown-cmark = { version = "0.8", default-features = false, optional = true } -ruma-identifiers = { version = "0.22.0", path = "../ruma-identifiers" } -ruma-macros = { version = "=0.1.0", path = "../ruma-macros", optional = true } +rand_crate = { package = "rand", version = "0.8.3", optional = true } +ruma-identifiers-validation = { version = "0.7.0", path = "../ruma-identifiers-validation", default-features = false } +ruma-macros = { version = "=0.1.0", path = "../ruma-macros" } ruma-serde = { version = "0.6.0", path = "../ruma-serde" } serde = { version = "1.0.118", features = ["derive"] } -serde_json = { version = "1.0.60", features = ["raw_value"] } +serde_json = { version = "1.0.64", features = ["raw_value"] } thiserror = { version = "1.0.26", optional = true } tracing = "0.1.25" +url = "2.2.2" +uuid = { version = "0.8.2", optional = true, features = ["v4"] } wildmatch = "2.0.0" [dev-dependencies] @@ -58,9 +63,8 @@ bytes = "1.0.1" http = "0.2.2" maplit = "1.0.2" matches = "0.1.8" -ruma-identifiers = { version = "0.22.0", path = "../ruma-identifiers", features = ["rand", "serde"] } ruma-macros = { version = "=0.1.0", path = "../ruma-macros" } -trybuild = "1.0.38" +trybuild = "1.0.42" [[bench]] name = "event_deserialize" diff --git a/crates/ruma-common/src/api.rs b/crates/ruma-common/src/api.rs index 1f8fd1c6..e1a994c5 100644 --- a/crates/ruma-common/src/api.rs +++ b/crates/ruma-common/src/api.rs @@ -15,7 +15,8 @@ use std::{convert::TryInto as _, error::Error as StdError, fmt}; use bytes::BufMut; -use ruma_identifiers::UserId; + +use crate::UserId; /// Generates [`IncomingRequest`] and [`OutgoingRequest`] from a concise definition. /// diff --git a/crates/ruma-common/src/api/error.rs b/crates/ruma-common/src/api/error.rs index aa010bed..11e260be 100644 --- a/crates/ruma-common/src/api/error.rs +++ b/crates/ruma-common/src/api/error.rs @@ -202,7 +202,7 @@ pub enum DeserializationError { /// Got an invalid identifier. #[error("{0}")] - Ident(#[from] ruma_identifiers::Error), + Ident(#[from] crate::Error), /// Header value deserialization failed. #[error("{0}")] diff --git a/crates/ruma-common/src/directory.rs b/crates/ruma-common/src/directory.rs index 326096d1..23366a68 100644 --- a/crates/ruma-common/src/directory.rs +++ b/crates/ruma-common/src/directory.rs @@ -3,7 +3,6 @@ use std::fmt; use js_int::UInt; -use ruma_identifiers::{MxcUri, RoomAliasId, RoomId, RoomName}; use ruma_serde::{Outgoing, StringEnum}; use serde::{ de::{Error, MapAccess, Visitor}, @@ -12,7 +11,7 @@ use serde::{ }; use serde_json::Value as JsonValue; -use crate::PrivOwnedStr; +use crate::{MxcUri, PrivOwnedStr, RoomAliasId, RoomId, RoomName}; /// A chunk of a room list response, describing one room. /// diff --git a/crates/ruma-common/src/encryption.rs b/crates/ruma-common/src/encryption.rs index 037d2ae0..74b125af 100644 --- a/crates/ruma-common/src/encryption.rs +++ b/crates/ruma-common/src/encryption.rs @@ -4,10 +4,11 @@ use std::collections::BTreeMap; -use ruma_identifiers::{DeviceId, DeviceKeyId, EventEncryptionAlgorithm, UserId}; use ruma_serde::Base64; use serde::{Deserialize, Serialize}; +use crate::{DeviceId, DeviceKeyId, EventEncryptionAlgorithm, UserId}; + /// Identity keys for a device. #[derive(Clone, Debug, Deserialize, Serialize)] #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)] diff --git a/crates/ruma-common/src/events.rs b/crates/ruma-common/src/events.rs index 091ab78e..cbd945ba 100644 --- a/crates/ruma-common/src/events.rs +++ b/crates/ruma-common/src/events.rs @@ -52,7 +52,7 @@ //! //! ```rust //! use ruma_common::events::{macros::EventContent, SyncMessageLikeEvent}; -//! use ruma_identifiers::EventId; +//! use ruma_common::EventId; //! use serde::{Deserialize, Serialize}; //! //! #[derive(Clone, Debug, Deserialize, Serialize)] @@ -126,12 +126,12 @@ //! type alias), allowing content to be converted to and from JSON independently of the surrounding //! event structure, if needed. -use ruma_identifiers::{EventEncryptionAlgorithm, RoomVersionId}; use ruma_serde::Raw; use serde::{de::IgnoredAny, Deserialize, Serialize, Serializer}; use serde_json::value::RawValue as RawJsonValue; use self::room::redaction::SyncRoomRedactionEvent; +use crate::{EventEncryptionAlgorithm, RoomVersionId}; // Needs to be public for trybuild tests #[doc(hidden)] diff --git a/crates/ruma-common/src/events/_custom.rs b/crates/ruma-common/src/events/_custom.rs index 4ee3ef5b..aa10db46 100644 --- a/crates/ruma-common/src/events/_custom.rs +++ b/crates/ruma-common/src/events/_custom.rs @@ -1,4 +1,3 @@ -use ruma_identifiers::RoomVersionId; use serde::Serialize; use serde_json::value::RawValue as RawJsonValue; @@ -8,6 +7,7 @@ use super::{ RedactedStateEventContent, RoomAccountDataEventContent, StateEventContent, ToDeviceEventContent, }; +use crate::RoomVersionId; /// A custom event's type. Used for event enum `_Custom` variants. // FIXME: Serialize shouldn't be required here, but it's currently a supertrait of EventContent diff --git a/crates/ruma-common/src/events/direct.rs b/crates/ruma-common/src/events/direct.rs index 86aa78b4..82318432 100644 --- a/crates/ruma-common/src/events/direct.rs +++ b/crates/ruma-common/src/events/direct.rs @@ -7,10 +7,11 @@ use std::{ ops::{Deref, DerefMut}, }; -use ruma_identifiers::{RoomId, UserId}; use ruma_macros::EventContent; use serde::{Deserialize, Serialize}; +use crate::{RoomId, UserId}; + /// The content of an `m.direct` event. /// /// A mapping of `UserId`s to a list of `RoomId`s which are considered *direct* for that particular @@ -36,11 +37,11 @@ impl DerefMut for DirectEventContent { } } -#[cfg(test)] +#[cfg(all(test, feature = "rand"))] mod tests { use std::collections::BTreeMap; - use ruma_identifiers::{server_name, RoomId, UserId}; + use crate::{server_name, RoomId, UserId}; use serde_json::{from_value as from_json_value, json, to_value as to_json_value}; use super::{DirectEvent, DirectEventContent}; diff --git a/crates/ruma-common/src/events/enums.rs b/crates/ruma-common/src/events/enums.rs index 0facc236..cc69fa0c 100644 --- a/crates/ruma-common/src/events/enums.rs +++ b/crates/ruma-common/src/events/enums.rs @@ -1,5 +1,3 @@ -use ruma_common::MilliSecondsSinceUnixEpoch; -use ruma_identifiers::{EventId, RoomId, RoomVersionId, UserId}; use ruma_macros::{event_enum, EventEnumFromEvent}; use ruma_serde::from_raw_json_value; use serde::{de, Deserialize}; @@ -10,6 +8,7 @@ use super::{ room::{encrypted, redaction::SyncRoomRedactionEvent}, Redact, UnsignedDeHelper, }; +use crate::{EventId, MilliSecondsSinceUnixEpoch, RoomId, RoomVersionId, UserId}; event_enum! { /// Any global account data event. diff --git a/crates/ruma-common/src/events/event_kinds.rs b/crates/ruma-common/src/events/event_kinds.rs index b10c2874..6200d48d 100644 --- a/crates/ruma-common/src/events/event_kinds.rs +++ b/crates/ruma-common/src/events/event_kinds.rs @@ -1,7 +1,5 @@ #![allow(clippy::exhaustive_structs)] -use ruma_common::MilliSecondsSinceUnixEpoch; -use ruma_identifiers::{EventId, RoomId, UserId}; use ruma_macros::Event; use serde::{Deserialize, Serialize}; @@ -10,6 +8,7 @@ use super::{ RedactedMessageLikeEventContent, RedactedStateEventContent, RedactedUnsigned, RoomAccountDataEventContent, StateEventContent, ToDeviceEventContent, Unsigned, }; +use crate::{EventId, MilliSecondsSinceUnixEpoch, RoomId, UserId}; /// A global account data event. #[derive(Clone, Debug, Event)] diff --git a/crates/ruma-common/src/events/file.rs b/crates/ruma-common/src/events/file.rs index 2b439559..789223e5 100644 --- a/crates/ruma-common/src/events/file.rs +++ b/crates/ruma-common/src/events/file.rs @@ -5,7 +5,6 @@ use std::collections::BTreeMap; use js_int::UInt; -use ruma_identifiers::MxcUri; use ruma_macros::EventContent; use ruma_serde::Base64; use serde::{Deserialize, Serialize}; @@ -14,6 +13,7 @@ use super::{ message::MessageContent, room::{message::Relation, JsonWebKey}, }; +use crate::MxcUri; /// The encryption info of a file sent to a room with end-to-end encryption enabled. /// diff --git a/crates/ruma-common/src/events/forwarded_room_key.rs b/crates/ruma-common/src/events/forwarded_room_key.rs index 0a2aa89e..fc3e454c 100644 --- a/crates/ruma-common/src/events/forwarded_room_key.rs +++ b/crates/ruma-common/src/events/forwarded_room_key.rs @@ -2,10 +2,11 @@ //! //! [`m.forwarded_room_key`]: https://spec.matrix.org/v1.2/client-server-api/#mforwarded_room_key -use ruma_identifiers::{EventEncryptionAlgorithm, RoomId}; use ruma_macros::EventContent; use serde::{Deserialize, Serialize}; +use crate::{EventEncryptionAlgorithm, RoomId}; + /// The content of an `m.forwarded_room_key` event. /// /// To create an instance of this type, first create a `ToDeviceForwardedRoomKeyEventContentInit` diff --git a/crates/ruma-common/src/events/fully_read.rs b/crates/ruma-common/src/events/fully_read.rs index 498eefb2..62b97769 100644 --- a/crates/ruma-common/src/events/fully_read.rs +++ b/crates/ruma-common/src/events/fully_read.rs @@ -2,10 +2,11 @@ //! //! [`m.fully_read`]: https://spec.matrix.org/v1.2/client-server-api/#mfully_read -use ruma_identifiers::EventId; use ruma_macros::EventContent; use serde::{Deserialize, Serialize}; +use crate::EventId; + /// The content of an `m.fully_read` event. /// /// The current location of the user's read marker in a room. diff --git a/crates/ruma-common/src/events/ignored_user_list.rs b/crates/ruma-common/src/events/ignored_user_list.rs index 5263b9bd..d8ed6472 100644 --- a/crates/ruma-common/src/events/ignored_user_list.rs +++ b/crates/ruma-common/src/events/ignored_user_list.rs @@ -2,10 +2,11 @@ //! //! [`m.ignored_user_list`]: https://spec.matrix.org/v1.2/client-server-api/#mignored_user_list -use ruma_identifiers::UserId; use ruma_macros::EventContent; use serde::{Deserialize, Serialize}; +use crate::UserId; + /// The content of an `m.ignored_user_list` event. /// /// A list of users to ignore. @@ -27,8 +28,8 @@ impl IgnoredUserListEventContent { #[cfg(test)] mod tests { + use crate::user_id; use matches::assert_matches; - use ruma_identifiers::user_id; use serde_json::{from_value as from_json_value, json, to_value as to_json_value}; use super::{IgnoredUserListEvent, IgnoredUserListEventContent}; diff --git a/crates/ruma-common/src/events/key/verification.rs b/crates/ruma-common/src/events/key/verification.rs index cbfc366b..65aa11f9 100644 --- a/crates/ruma-common/src/events/key/verification.rs +++ b/crates/ruma-common/src/events/key/verification.rs @@ -7,11 +7,10 @@ //! //! [MSC2241]: https://github.com/matrix-org/matrix-spec-proposals/pull/2241 -use ruma_identifiers::EventId; use ruma_serde::StringEnum; use serde::{Deserialize, Serialize}; -use crate::PrivOwnedStr; +use crate::{EventId, PrivOwnedStr}; pub mod accept; pub mod cancel; diff --git a/crates/ruma-common/src/events/key/verification/accept.rs b/crates/ruma-common/src/events/key/verification/accept.rs index cc6e6f6d..6457f17e 100644 --- a/crates/ruma-common/src/events/key/verification/accept.rs +++ b/crates/ruma-common/src/events/key/verification/accept.rs @@ -4,7 +4,6 @@ use std::collections::BTreeMap; -use ruma_identifiers::TransactionId; use ruma_macros::EventContent; use ruma_serde::Base64; use serde::{Deserialize, Serialize}; @@ -14,6 +13,7 @@ use super::{ HashAlgorithm, KeyAgreementProtocol, MessageAuthenticationCode, Relation, ShortAuthenticationString, }; +use crate::TransactionId; /// The content of a to-device `m.key.verification.accept` event. /// @@ -165,8 +165,8 @@ impl From for SasV1Content { mod tests { use std::collections::BTreeMap; + use crate::{event_id, user_id}; use matches::assert_matches; - use ruma_identifiers::{event_id, user_id}; use ruma_serde::Base64; use serde_json::{ from_value as from_json_value, json, to_value as to_json_value, Value as JsonValue, diff --git a/crates/ruma-common/src/events/key/verification/cancel.rs b/crates/ruma-common/src/events/key/verification/cancel.rs index 8271cd07..e5b0b08c 100644 --- a/crates/ruma-common/src/events/key/verification/cancel.rs +++ b/crates/ruma-common/src/events/key/verification/cancel.rs @@ -2,13 +2,12 @@ //! //! [`m.key.verification.cancel`]: https://spec.matrix.org/v1.2/client-server-api/#mkeyverificationcancel -use ruma_identifiers::TransactionId; use ruma_macros::EventContent; use ruma_serde::StringEnum; use serde::{Deserialize, Serialize}; use super::Relation; -use crate::PrivOwnedStr; +use crate::{PrivOwnedStr, TransactionId}; /// The content of a to-device `m.key.verification.cancel` event. /// diff --git a/crates/ruma-common/src/events/key/verification/done.rs b/crates/ruma-common/src/events/key/verification/done.rs index ab354a89..ad808065 100644 --- a/crates/ruma-common/src/events/key/verification/done.rs +++ b/crates/ruma-common/src/events/key/verification/done.rs @@ -2,11 +2,11 @@ //! //! [`m.key.verification.done`]: https://spec.matrix.org/v1.2/client-server-api/#mkeyverificationdone -use ruma_identifiers::TransactionId; use ruma_macros::EventContent; use serde::{Deserialize, Serialize}; use super::Relation; +use crate::TransactionId; /// The content of a to-device `m.m.key.verification.done` event. /// @@ -49,8 +49,8 @@ impl KeyVerificationDoneEventContent { #[cfg(test)] mod tests { + use crate::event_id; use matches::assert_matches; - use ruma_identifiers::event_id; use serde_json::{from_value as from_json_value, json, to_value as to_json_value}; use super::KeyVerificationDoneEventContent; diff --git a/crates/ruma-common/src/events/key/verification/key.rs b/crates/ruma-common/src/events/key/verification/key.rs index b8b35844..27399983 100644 --- a/crates/ruma-common/src/events/key/verification/key.rs +++ b/crates/ruma-common/src/events/key/verification/key.rs @@ -2,12 +2,12 @@ //! //! [`m.key.verification.key`]: https://spec.matrix.org/v1.2/client-server-api/#mkeyverificationkey -use ruma_identifiers::TransactionId; use ruma_macros::EventContent; use ruma_serde::Base64; use serde::{Deserialize, Serialize}; use super::Relation; +use crate::TransactionId; /// The content of a to-device `m.key.verification.key` event. /// diff --git a/crates/ruma-common/src/events/key/verification/mac.rs b/crates/ruma-common/src/events/key/verification/mac.rs index 7afff7c3..593eaf51 100644 --- a/crates/ruma-common/src/events/key/verification/mac.rs +++ b/crates/ruma-common/src/events/key/verification/mac.rs @@ -4,12 +4,12 @@ use std::collections::BTreeMap; -use ruma_identifiers::TransactionId; use ruma_macros::EventContent; use ruma_serde::Base64; use serde::{Deserialize, Serialize}; use super::Relation; +use crate::TransactionId; /// The content of a to-device `m.key.verification.` event. /// diff --git a/crates/ruma-common/src/events/key/verification/ready.rs b/crates/ruma-common/src/events/key/verification/ready.rs index 888a84f3..9ab18d78 100644 --- a/crates/ruma-common/src/events/key/verification/ready.rs +++ b/crates/ruma-common/src/events/key/verification/ready.rs @@ -2,11 +2,11 @@ //! //! [`m.key.verification.ready`]: https://spec.matrix.org/v1.2/client-server-api/#mkeyverificationready -use ruma_identifiers::{DeviceId, TransactionId}; use ruma_macros::EventContent; use serde::{Deserialize, Serialize}; use super::{Relation, VerificationMethod}; +use crate::{DeviceId, TransactionId}; /// The content of a to-device `m.m.key.verification.ready` event. /// @@ -74,8 +74,8 @@ impl KeyVerificationReadyEventContent { #[cfg(test)] mod tests { + use crate::{event_id, DeviceId}; use matches::assert_matches; - use ruma_identifiers::{event_id, DeviceId}; use serde_json::{from_value as from_json_value, json, to_value as to_json_value}; use super::{KeyVerificationReadyEventContent, ToDeviceKeyVerificationReadyEventContent}; diff --git a/crates/ruma-common/src/events/key/verification/request.rs b/crates/ruma-common/src/events/key/verification/request.rs index 30c2d99a..5dc61504 100644 --- a/crates/ruma-common/src/events/key/verification/request.rs +++ b/crates/ruma-common/src/events/key/verification/request.rs @@ -2,12 +2,11 @@ //! //! [`m.key.verification.request`]: https://spec.matrix.org/v1.2/client-server-api/#mkeyverificationrequest -use ruma_common::MilliSecondsSinceUnixEpoch; -use ruma_identifiers::{DeviceId, TransactionId}; use ruma_macros::EventContent; use serde::{Deserialize, Serialize}; use super::VerificationMethod; +use crate::{DeviceId, MilliSecondsSinceUnixEpoch, TransactionId}; /// The content of an `m.key.verification.request` event. #[derive(Clone, Debug, Deserialize, Serialize, EventContent)] diff --git a/crates/ruma-common/src/events/key/verification/start.rs b/crates/ruma-common/src/events/key/verification/start.rs index 4d280024..709826ae 100644 --- a/crates/ruma-common/src/events/key/verification/start.rs +++ b/crates/ruma-common/src/events/key/verification/start.rs @@ -4,7 +4,6 @@ use std::collections::BTreeMap; -use ruma_identifiers::{DeviceId, TransactionId}; use ruma_macros::EventContent; use ruma_serde::Base64; use serde::{Deserialize, Serialize}; @@ -14,6 +13,7 @@ use super::{ HashAlgorithm, KeyAgreementProtocol, MessageAuthenticationCode, Relation, ShortAuthenticationString, }; +use crate::{DeviceId, TransactionId}; /// The content of a to-device `m.key.verification.start` event. /// @@ -200,8 +200,8 @@ impl From for SasV1Content { mod tests { use std::collections::BTreeMap; + use crate::{event_id, user_id}; use matches::assert_matches; - use ruma_identifiers::{event_id, user_id}; use ruma_serde::Base64; use serde_json::{ from_value as from_json_value, json, to_value as to_json_value, Value as JsonValue, diff --git a/crates/ruma-common/src/events/pdu.rs b/crates/ruma-common/src/events/pdu.rs index 00765900..e30c205a 100644 --- a/crates/ruma-common/src/events/pdu.rs +++ b/crates/ruma-common/src/events/pdu.rs @@ -8,8 +8,6 @@ use std::collections::BTreeMap; use js_int::UInt; -use ruma_common::MilliSecondsSinceUnixEpoch; -use ruma_identifiers::{EventId, RoomId, ServerName, ServerSigningKeyId, UserId}; use serde::{ de::{Error as _, IgnoredAny}, Deserialize, Deserializer, Serialize, @@ -17,6 +15,7 @@ use serde::{ use serde_json::{from_str as from_json_str, value::RawValue as RawJsonValue}; use super::EventType; +use crate::{EventId, MilliSecondsSinceUnixEpoch, RoomId, ServerName, ServerSigningKeyId, UserId}; /// Enum for PDU schemas #[derive(Clone, Debug, Serialize)] diff --git a/crates/ruma-common/src/events/policy/rule/room.rs b/crates/ruma-common/src/events/policy/rule/room.rs index 55c0b2e1..528d6f53 100644 --- a/crates/ruma-common/src/events/policy/rule/room.rs +++ b/crates/ruma-common/src/events/policy/rule/room.rs @@ -20,15 +20,17 @@ mod tests { use std::convert::TryInto; use js_int::int; - use ruma_common::MilliSecondsSinceUnixEpoch; - use ruma_identifiers::{event_id, room_id, user_id}; use ruma_serde::Raw; use serde_json::{from_value as from_json_value, json, to_value as to_json_value}; use super::{PolicyRuleRoomEvent, PolicyRuleRoomEventContent}; - use crate::events::{ - policy::rule::{PolicyRuleEventContent, Recommendation}, - Unsigned, + use crate::{ + event_id, + events::{ + policy::rule::{PolicyRuleEventContent, Recommendation}, + Unsigned, + }, + room_id, user_id, MilliSecondsSinceUnixEpoch, }; #[test] diff --git a/crates/ruma-common/src/events/presence.rs b/crates/ruma-common/src/events/presence.rs index 1de464e1..d6248a29 100644 --- a/crates/ruma-common/src/events/presence.rs +++ b/crates/ruma-common/src/events/presence.rs @@ -3,12 +3,11 @@ //! The only content valid for this event is `PresenceEventContent`. use js_int::UInt; -use ruma_common::presence::PresenceState; -use ruma_identifiers::{MxcUri, UserId}; use ruma_macros::{Event, EventContent}; use serde::{Deserialize, Serialize}; use super::{EventKind, StaticEventContent}; +use crate::{presence::PresenceState, MxcUri, UserId}; /// Presence event. #[derive(Clone, Debug, Event)] @@ -80,10 +79,9 @@ impl StaticEventContent for PresenceEventContent { #[cfg(test)] mod tests { + use crate::{mxc_uri, presence::PresenceState, user_id}; use js_int::uint; use matches::assert_matches; - use ruma_common::presence::PresenceState; - use ruma_identifiers::{mxc_uri, user_id}; use serde_json::{from_value as from_json_value, json, to_value as to_json_value}; use super::{PresenceEvent, PresenceEventContent}; diff --git a/crates/ruma-common/src/events/push_rules.rs b/crates/ruma-common/src/events/push_rules.rs index d89f7d61..eaace8e9 100644 --- a/crates/ruma-common/src/events/push_rules.rs +++ b/crates/ruma-common/src/events/push_rules.rs @@ -2,10 +2,11 @@ //! //! [`m.push_rules`]: https://spec.matrix.org/v1.2/client-server-api/#mpush_rules -use ruma_common::push::Ruleset; use ruma_macros::EventContent; use serde::{Deserialize, Serialize}; +use crate::push::Ruleset; + /// The content of an `m.push_rules` event. /// /// Describes all push rules for a user. diff --git a/crates/ruma-common/src/events/reaction.rs b/crates/ruma-common/src/events/reaction.rs index 3f68f7f2..7627f2ce 100644 --- a/crates/ruma-common/src/events/reaction.rs +++ b/crates/ruma-common/src/events/reaction.rs @@ -1,9 +1,10 @@ //! Types for the `m.reaction` event. -use ruma_identifiers::EventId; use ruma_macros::EventContent; use serde::{Deserialize, Serialize}; +use crate::EventId; + /// The payload for a `m.reaction` event. /// /// A reaction to another event. @@ -53,8 +54,8 @@ impl Relation { #[cfg(test)] mod tests { + use crate::event_id; use matches::assert_matches; - use ruma_identifiers::event_id; use serde_json::{from_value as from_json_value, json}; use super::{ReactionEventContent, Relation}; diff --git a/crates/ruma-common/src/events/receipt.rs b/crates/ruma-common/src/events/receipt.rs index f6a922a0..1047f38f 100644 --- a/crates/ruma-common/src/events/receipt.rs +++ b/crates/ruma-common/src/events/receipt.rs @@ -7,11 +7,11 @@ use std::{ ops::{Deref, DerefMut}, }; -use ruma_common::{receipt::ReceiptType, MilliSecondsSinceUnixEpoch}; -use ruma_identifiers::{EventId, UserId}; use ruma_macros::EventContent; use serde::{Deserialize, Serialize}; +use crate::{receipt::ReceiptType, EventId, MilliSecondsSinceUnixEpoch, UserId}; + /// The content of an `m.receipt` event. /// /// A mapping of event ID to a collection of receipts for this event ID. The event ID is the ID of diff --git a/crates/ruma-common/src/events/relation.rs b/crates/ruma-common/src/events/relation.rs index 4f76193e..0c7ab32b 100644 --- a/crates/ruma-common/src/events/relation.rs +++ b/crates/ruma-common/src/events/relation.rs @@ -3,9 +3,10 @@ use std::fmt::Debug; use js_int::UInt; -use ruma_common::MilliSecondsSinceUnixEpoch; use serde::{Deserialize, Serialize}; +use crate::MilliSecondsSinceUnixEpoch; + /// Summary of all reactions with the given key to an event. #[derive(Clone, Debug, Default, Deserialize, PartialEq, Eq, Serialize)] #[cfg(feature = "unstable-msc2677")] diff --git a/crates/ruma-common/src/events/room.rs b/crates/ruma-common/src/events/room.rs index dcb71551..a17be147 100644 --- a/crates/ruma-common/src/events/room.rs +++ b/crates/ruma-common/src/events/room.rs @@ -5,10 +5,11 @@ use std::collections::BTreeMap; use js_int::UInt; -use ruma_identifiers::MxcUri; use ruma_serde::{base64::UrlSafe, Base64}; use serde::{Deserialize, Serialize}; +use crate::MxcUri; + pub mod aliases; pub mod avatar; pub mod canonical_alias; diff --git a/crates/ruma-common/src/events/room/aliases.rs b/crates/ruma-common/src/events/room/aliases.rs index d249c840..dada94bc 100644 --- a/crates/ruma-common/src/events/room/aliases.rs +++ b/crates/ruma-common/src/events/room/aliases.rs @@ -1,13 +1,15 @@ //! Types for the `m.room.aliases` event. -use ruma_identifiers::{RoomAliasId, RoomVersionId}; use ruma_macros::EventContent; use serde::{Deserialize, Serialize}; use serde_json::value::RawValue as RawJsonValue; -use crate::events::{ - EventContent, HasDeserializeFields, RedactContent, RedactedEventContent, - RedactedStateEventContent, +use crate::{ + events::{ + EventContent, HasDeserializeFields, RedactContent, RedactedEventContent, + RedactedStateEventContent, + }, + RoomAliasId, RoomVersionId, }; /// The content of an `m.room.aliases` event. diff --git a/crates/ruma-common/src/events/room/avatar.rs b/crates/ruma-common/src/events/room/avatar.rs index e72ab61e..9e58bbd9 100644 --- a/crates/ruma-common/src/events/room/avatar.rs +++ b/crates/ruma-common/src/events/room/avatar.rs @@ -3,11 +3,11 @@ //! [`m.room.avatar`]: https://spec.matrix.org/v1.2/client-server-api/#mroomavatar use js_int::UInt; -use ruma_identifiers::MxcUri; use ruma_macros::EventContent; use serde::{Deserialize, Serialize}; use super::ThumbnailInfo; +use crate::MxcUri; /// The content of an `m.room.avatar` event. /// diff --git a/crates/ruma-common/src/events/room/canonical_alias.rs b/crates/ruma-common/src/events/room/canonical_alias.rs index 8da0a7ef..b60ae7cc 100644 --- a/crates/ruma-common/src/events/room/canonical_alias.rs +++ b/crates/ruma-common/src/events/room/canonical_alias.rs @@ -2,10 +2,11 @@ //! //! [`m.room.canonical_alias`]: https://spec.matrix.org/v1.2/client-server-api/#mroomcanonical_alias -use ruma_identifiers::RoomAliasId; use ruma_macros::EventContent; use serde::{Deserialize, Serialize}; +use crate::RoomAliasId; + /// The content of an `m.room.canonical_alias` event. /// /// Informs the room as to which alias is the canonical one. @@ -38,9 +39,8 @@ impl RoomCanonicalAliasEventContent { #[cfg(test)] mod tests { + use crate::{event_id, room_alias_id, room_id, user_id, MilliSecondsSinceUnixEpoch}; use js_int::uint; - use ruma_common::MilliSecondsSinceUnixEpoch; - use ruma_identifiers::{event_id, room_alias_id, room_id, user_id}; use serde_json::{from_value as from_json_value, json, to_value as to_json_value}; use super::RoomCanonicalAliasEventContent; diff --git a/crates/ruma-common/src/events/room/create.rs b/crates/ruma-common/src/events/room/create.rs index 1d757505..cd5e37b1 100644 --- a/crates/ruma-common/src/events/room/create.rs +++ b/crates/ruma-common/src/events/room/create.rs @@ -2,11 +2,11 @@ //! //! [`m.room.create`]: https://spec.matrix.org/v1.2/client-server-api/#mroomcreate -use ruma_common::room::RoomType; -use ruma_identifiers::{EventId, RoomId, RoomVersionId, UserId}; use ruma_macros::EventContent; use serde::{Deserialize, Serialize}; +use crate::{room::RoomType, EventId, RoomId, RoomVersionId, UserId}; + /// The content of an `m.room.create` event. /// /// This is the first event in a room and cannot be changed. @@ -85,8 +85,8 @@ fn default_room_version_id() -> RoomVersionId { #[cfg(test)] mod tests { + use crate::{user_id, RoomVersionId}; use matches::assert_matches; - use ruma_identifiers::{user_id, RoomVersionId}; use serde_json::{from_value as from_json_value, json, to_value as to_json_value}; use super::{RoomCreateEventContent, RoomType}; diff --git a/crates/ruma-common/src/events/room/encrypted.rs b/crates/ruma-common/src/events/room/encrypted.rs index f43f628f..6ad83192 100644 --- a/crates/ruma-common/src/events/room/encrypted.rs +++ b/crates/ruma-common/src/events/room/encrypted.rs @@ -5,11 +5,11 @@ use std::collections::BTreeMap; use js_int::UInt; -use ruma_identifiers::{DeviceId, EventId}; use ruma_macros::EventContent; use serde::{Deserialize, Serialize}; use super::message::{self, InReplyTo}; +use crate::{DeviceId, EventId}; mod relation_serde; @@ -257,8 +257,8 @@ impl From for MegolmV1AesSha2Content { #[cfg(test)] mod tests { + use crate::event_id; use matches::assert_matches; - use ruma_identifiers::event_id; use ruma_serde::Raw; use serde_json::{from_value as from_json_value, json, to_value as to_json_value}; diff --git a/crates/ruma-common/src/events/room/join_rules.rs b/crates/ruma-common/src/events/room/join_rules.rs index 57f16594..3685ec3f 100644 --- a/crates/ruma-common/src/events/room/join_rules.rs +++ b/crates/ruma-common/src/events/room/join_rules.rs @@ -4,7 +4,6 @@ use std::{borrow::Cow, collections::BTreeMap}; -use ruma_identifiers::RoomId; use ruma_macros::EventContent; use ruma_serde::from_raw_json_value; use serde::{ @@ -13,7 +12,7 @@ use serde::{ }; use serde_json::{value::RawValue as RawJsonValue, Value as JsonValue}; -use crate::PrivOwnedStr; +use crate::{PrivOwnedStr, RoomId}; /// The content of an `m.room.join_rules` event. /// @@ -219,8 +218,8 @@ impl<'de> Deserialize<'de> for AllowRule { #[cfg(test)] mod tests { + use crate::room_id; use matches::assert_matches; - use ruma_identifiers::room_id; use super::{AllowRule, JoinRule, RoomJoinRulesEventContent, SyncRoomJoinRulesEvent}; diff --git a/crates/ruma-common/src/events/room/member.rs b/crates/ruma-common/src/events/room/member.rs index 4611f97e..033bcf9e 100644 --- a/crates/ruma-common/src/events/room/member.rs +++ b/crates/ruma-common/src/events/room/member.rs @@ -4,7 +4,6 @@ use std::collections::BTreeMap; -use ruma_identifiers::{MxcUri, RoomVersionId, ServerName, ServerSigningKeyId, UserId}; use ruma_macros::EventContent; use ruma_serde::StringEnum; use serde::{Deserialize, Serialize}; @@ -15,7 +14,7 @@ use crate::{ EventContent, HasDeserializeFields, RedactContent, RedactedEventContent, RedactedStateEventContent, StrippedStateEvent, SyncStateEvent, }, - PrivOwnedStr, + MxcUri, PrivOwnedStr, RoomVersionId, ServerName, ServerSigningKeyId, UserId, }; /// The content of an `m.room.member` event. @@ -416,11 +415,10 @@ impl StrippedStateEvent { #[cfg(test)] mod tests { + use crate::{server_name, server_signing_key_id, MilliSecondsSinceUnixEpoch}; use js_int::uint; use maplit::btreemap; use matches::assert_matches; - use ruma_common::MilliSecondsSinceUnixEpoch; - use ruma_identifiers::{server_name, server_signing_key_id}; use serde_json::{from_value as from_json_value, json}; use super::{MembershipState, RoomMemberEventContent, SignedContent, ThirdPartyInvite}; diff --git a/crates/ruma-common/src/events/room/message.rs b/crates/ruma-common/src/events/room/message.rs index ccec605a..fd3d3fa5 100644 --- a/crates/ruma-common/src/events/room/message.rs +++ b/crates/ruma-common/src/events/room/message.rs @@ -5,14 +5,15 @@ use std::{borrow::Cow, fmt}; use js_int::UInt; -use ruma_identifiers::{DeviceId, EventId, MxcUri, UserId}; use ruma_macros::EventContent; use ruma_serde::{JsonObject, StringEnum}; use serde::{de::DeserializeOwned, Deserialize, Serialize}; use serde_json::Value as JsonValue; use super::{EncryptedFile, ImageInfo, ThumbnailInfo}; -use crate::{events::key::verification::VerificationMethod, PrivOwnedStr}; +use crate::{ + events::key::verification::VerificationMethod, DeviceId, EventId, MxcUri, PrivOwnedStr, UserId, +}; mod content_serde; pub mod feedback; @@ -1007,8 +1008,8 @@ pub struct CustomEventContent { #[cfg(test)] mod tests { + use crate::event_id; use matches::assert_matches; - use ruma_identifiers::event_id; use serde_json::{from_value as from_json_value, json}; use super::{InReplyTo, MessageType, Relation, RoomMessageEventContent}; diff --git a/crates/ruma-common/src/events/room/message/feedback.rs b/crates/ruma-common/src/events/room/message/feedback.rs index ca96382c..5552aa1c 100644 --- a/crates/ruma-common/src/events/room/message/feedback.rs +++ b/crates/ruma-common/src/events/room/message/feedback.rs @@ -2,12 +2,11 @@ //! //! [`m.room.message.feedback`]: https://spec.matrix.org/v1.2/client-server-api/#mroommessagefeedback -use ruma_identifiers::EventId; use ruma_macros::EventContent; use ruma_serde::StringEnum; use serde::{Deserialize, Serialize}; -use crate::PrivOwnedStr; +use crate::{EventId, PrivOwnedStr}; /// The content of an `m.room.message.feedback` event. /// diff --git a/crates/ruma-common/src/events/room/message/relation_serde.rs b/crates/ruma-common/src/events/room/message/relation_serde.rs index 040d699a..1ad8a5b6 100644 --- a/crates/ruma-common/src/events/room/message/relation_serde.rs +++ b/crates/ruma-common/src/events/room/message/relation_serde.rs @@ -1,5 +1,3 @@ -#[cfg(feature = "unstable-msc2676")] -use ruma_identifiers::EventId; use serde::{Deserialize, Deserializer, Serialize, Serializer}; #[cfg(feature = "unstable-msc2676")] @@ -7,6 +5,8 @@ use super::Replacement; #[cfg(feature = "unstable-msc2676")] use super::RoomMessageEventContent; use super::{InReplyTo, Relation}; +#[cfg(feature = "unstable-msc2676")] +use crate::EventId; impl<'de> Deserialize<'de> for Relation { fn deserialize(deserializer: D) -> Result diff --git a/crates/ruma-common/src/events/room/message/reply.rs b/crates/ruma-common/src/events/room/message/reply.rs index b8b61d22..2519845a 100644 --- a/crates/ruma-common/src/events/room/message/reply.rs +++ b/crates/ruma-common/src/events/room/message/reply.rs @@ -1,9 +1,9 @@ use indoc::formatdoc; -use ruma_identifiers::{EventId, UserId}; use super::{ FormattedBody, MessageType, RoomMessageEvent, RoomMessageEventContent, SyncRoomMessageEvent, }; +use crate::{EventId, UserId}; /// An event that can be replied to. /// @@ -299,7 +299,7 @@ fn formatted_or_plain_body<'a>(formatted: &'a Option, body: &'a s #[cfg(test)] mod tests { - use ruma_identifiers::{event_id, room_id, user_id}; + use crate::{event_id, room_id, user_id}; use super::{RoomMessageEvent, RoomMessageEventContent}; @@ -310,7 +310,7 @@ mod tests { content: RoomMessageEventContent::text_plain("multi\nline"), event_id: event_id!("$1598361704261elfgc:localhost").to_owned(), sender: user_id!("@alice:example.com").to_owned(), - origin_server_ts: ruma_common::MilliSecondsSinceUnixEpoch::now(), + origin_server_ts: crate::MilliSecondsSinceUnixEpoch::now(), room_id: room_id!("!n8f893n9:example.com").to_owned(), unsigned: crate::events::Unsigned::new(), }), diff --git a/crates/ruma-common/src/events/room/name.rs b/crates/ruma-common/src/events/room/name.rs index c2f18536..aac3aefc 100644 --- a/crates/ruma-common/src/events/room/name.rs +++ b/crates/ruma-common/src/events/room/name.rs @@ -2,10 +2,11 @@ //! //! [`m.room.name`]: https://spec.matrix.org/v1.2/client-server-api/#mroomname -use ruma_identifiers::RoomName; use ruma_macros::EventContent; use serde::{Deserialize, Serialize}; +use crate::RoomName; + /// The content of an `m.room.name` event. /// /// The room name is a human-friendly string designed to be displayed to the end-user. @@ -29,10 +30,9 @@ impl RoomNameEventContent { mod tests { use std::convert::TryInto; + use crate::{event_id, room_id, user_id, MilliSecondsSinceUnixEpoch}; use js_int::{int, uint}; use matches::assert_matches; - use ruma_common::MilliSecondsSinceUnixEpoch; - use ruma_identifiers::{event_id, room_id, user_id}; use ruma_serde::Raw; use serde_json::{from_value as from_json_value, json, to_value as to_json_value}; diff --git a/crates/ruma-common/src/events/room/pinned_events.rs b/crates/ruma-common/src/events/room/pinned_events.rs index ff45483a..b0931e85 100644 --- a/crates/ruma-common/src/events/room/pinned_events.rs +++ b/crates/ruma-common/src/events/room/pinned_events.rs @@ -2,10 +2,11 @@ //! //! [`m.room.pinned_events`]: https://spec.matrix.org/v1.2/client-server-api/#mroompinned_events -use ruma_identifiers::EventId; use ruma_macros::EventContent; use serde::{Deserialize, Serialize}; +use crate::EventId; + /// The content of an `m.room.pinned_events` event. /// /// Used to "pin" particular events in a room for other participants to review later. @@ -24,12 +25,11 @@ impl RoomPinnedEventsEventContent { } } -#[cfg(test)] +#[cfg(all(test, feature = "rand"))] mod tests { use std::convert::TryInto; - use ruma_common::MilliSecondsSinceUnixEpoch; - use ruma_identifiers::{server_name, EventId, RoomId, UserId}; + use crate::{server_name, EventId, MilliSecondsSinceUnixEpoch, RoomId, UserId}; use super::RoomPinnedEventsEventContent; use crate::events::{StateEvent, Unsigned}; diff --git a/crates/ruma-common/src/events/room/power_levels.rs b/crates/ruma-common/src/events/room/power_levels.rs index f4639191..e4b4e063 100644 --- a/crates/ruma-common/src/events/room/power_levels.rs +++ b/crates/ruma-common/src/events/room/power_levels.rs @@ -5,12 +5,14 @@ use std::collections::BTreeMap; use js_int::{int, Int}; -use ruma_common::power_levels::{default_power_level, NotificationPowerLevels}; -use ruma_identifiers::UserId; use ruma_macros::EventContent; use serde::{Deserialize, Serialize}; -use crate::events::EventType; +use crate::{ + events::EventType, + power_levels::{default_power_level, NotificationPowerLevels}, + UserId, +}; /// The content of an `m.room.power_levels` event. /// @@ -173,11 +175,10 @@ fn is_default_power_level(l: &Int) -> bool { mod tests { use std::collections::BTreeMap; + use crate::{event_id, room_id, user_id, MilliSecondsSinceUnixEpoch}; use assign::assign; use js_int::{int, uint}; use maplit::btreemap; - use ruma_common::MilliSecondsSinceUnixEpoch; - use ruma_identifiers::{event_id, room_id, user_id}; use serde_json::{json, to_value as to_json_value}; use super::{default_power_level, NotificationPowerLevels, RoomPowerLevelsEventContent}; diff --git a/crates/ruma-common/src/events/room/redaction.rs b/crates/ruma-common/src/events/room/redaction.rs index bd5ef8a3..f8f8e18d 100644 --- a/crates/ruma-common/src/events/room/redaction.rs +++ b/crates/ruma-common/src/events/room/redaction.rs @@ -2,12 +2,13 @@ //! //! [`m.room.redaction`]: https://spec.matrix.org/v1.2/client-server-api/#mroomredaction -use ruma_common::MilliSecondsSinceUnixEpoch; -use ruma_identifiers::{EventId, RoomId, UserId}; use ruma_macros::{Event, EventContent}; use serde::{Deserialize, Serialize}; -use crate::events::{Redact, RedactContent, RedactedUnsigned, Unsigned}; +use crate::{ + events::{Redact, RedactContent, RedactedUnsigned, Unsigned}, + EventId, MilliSecondsSinceUnixEpoch, RoomId, UserId, +}; /// Redaction event. #[derive(Clone, Debug, Event)] @@ -41,7 +42,7 @@ impl Redact for RoomRedactionEvent { fn redact( self, redaction: SyncRoomRedactionEvent, - version: &ruma_identifiers::RoomVersionId, + version: &crate::RoomVersionId, ) -> Self::Redacted { RedactedRoomRedactionEvent { content: self.content.redact(version), @@ -111,7 +112,7 @@ impl Redact for SyncRoomRedactionEvent { fn redact( self, redaction: SyncRoomRedactionEvent, - version: &ruma_identifiers::RoomVersionId, + version: &crate::RoomVersionId, ) -> Self::Redacted { RedactedSyncRoomRedactionEvent { content: self.content.redact(version), diff --git a/crates/ruma-common/src/events/room/server_acl.rs b/crates/ruma-common/src/events/room/server_acl.rs index 3415ce91..169e09f4 100644 --- a/crates/ruma-common/src/events/room/server_acl.rs +++ b/crates/ruma-common/src/events/room/server_acl.rs @@ -2,11 +2,12 @@ //! //! [`m.room.server_acl`]: https://spec.matrix.org/v1.2/client-server-api/#mroomserver_acl -use ruma_identifiers::ServerName; use ruma_macros::EventContent; use serde::{Deserialize, Serialize}; use wildmatch::WildMatch; +use crate::ServerName; + /// The content of an `m.room.server_acl` event. /// /// An event to indicate which servers are permitted to participate in the room. @@ -63,7 +64,7 @@ impl RoomServerAclEventContent { #[cfg(test)] mod tests { - use ruma_identifiers::server_name; + use crate::server_name; use serde_json::{from_value as from_json_value, json}; use super::RoomServerAclEventContent; diff --git a/crates/ruma-common/src/events/room/tombstone.rs b/crates/ruma-common/src/events/room/tombstone.rs index c0fb3083..730f7538 100644 --- a/crates/ruma-common/src/events/room/tombstone.rs +++ b/crates/ruma-common/src/events/room/tombstone.rs @@ -2,10 +2,11 @@ //! //! [`m.room.tombstone`]: https://spec.matrix.org/v1.2/client-server-api/#mroomtombstone -use ruma_identifiers::RoomId; use ruma_macros::EventContent; use serde::{Deserialize, Serialize}; +use crate::RoomId; + /// The content of an `m.room.tombstone` event. /// /// A state event signifying that a room has been upgraded to a different room version, and that diff --git a/crates/ruma-common/src/events/room_key.rs b/crates/ruma-common/src/events/room_key.rs index a960dc6a..b0f4e63b 100644 --- a/crates/ruma-common/src/events/room_key.rs +++ b/crates/ruma-common/src/events/room_key.rs @@ -2,10 +2,11 @@ //! //! [`m.room_key`]: https://spec.matrix.org/v1.2/client-server-api/#mroom_key -use ruma_identifiers::{EventEncryptionAlgorithm, RoomId}; use ruma_macros::EventContent; use serde::{Deserialize, Serialize}; +use crate::{EventEncryptionAlgorithm, RoomId}; + /// The content of an `m.room_key` event. /// /// Typically encrypted as an `m.room.encrypted` event, then sent as a to-device event. @@ -43,7 +44,7 @@ impl ToDeviceRoomKeyEventContent { #[cfg(test)] mod tests { - use ruma_identifiers::{room_id, user_id, EventEncryptionAlgorithm}; + use crate::{room_id, user_id, EventEncryptionAlgorithm}; use serde_json::{json, to_value as to_json_value}; use super::ToDeviceRoomKeyEventContent; diff --git a/crates/ruma-common/src/events/room_key_request.rs b/crates/ruma-common/src/events/room_key_request.rs index ce5e7150..aaef5dc7 100644 --- a/crates/ruma-common/src/events/room_key_request.rs +++ b/crates/ruma-common/src/events/room_key_request.rs @@ -2,12 +2,11 @@ //! //! [`m.room_key_request`]: https://spec.matrix.org/v1.2/client-server-api/#mroom_key_request -use ruma_identifiers::{DeviceId, EventEncryptionAlgorithm, RoomId, TransactionId}; use ruma_macros::EventContent; use ruma_serde::StringEnum; use serde::{Deserialize, Serialize}; -use crate::PrivOwnedStr; +use crate::{DeviceId, EventEncryptionAlgorithm, PrivOwnedStr, RoomId, TransactionId}; /// The content of an `m.room_key_request` event. #[derive(Clone, Debug, Deserialize, Serialize, EventContent)] diff --git a/crates/ruma-common/src/events/secret/request.rs b/crates/ruma-common/src/events/secret/request.rs index 7f5efbd0..9adc398f 100644 --- a/crates/ruma-common/src/events/secret/request.rs +++ b/crates/ruma-common/src/events/secret/request.rs @@ -4,12 +4,11 @@ use std::convert::TryFrom; -use ruma_identifiers::{DeviceId, TransactionId}; use ruma_macros::EventContent; use ruma_serde::StringEnum; use serde::{ser::SerializeStruct, Deserialize, Serialize}; -use crate::PrivOwnedStr; +use crate::{DeviceId, PrivOwnedStr, TransactionId}; /// The content of an `m.secret.request` event. /// diff --git a/crates/ruma-common/src/events/secret/send.rs b/crates/ruma-common/src/events/secret/send.rs index 8fb3ec9d..ef66cd61 100644 --- a/crates/ruma-common/src/events/secret/send.rs +++ b/crates/ruma-common/src/events/secret/send.rs @@ -2,10 +2,11 @@ //! //! [`m.secret.send`]: https://spec.matrix.org/v1.2/client-server-api/#msecretsend -use ruma_identifiers::TransactionId; use ruma_macros::EventContent; use serde::{Deserialize, Serialize}; +use crate::TransactionId; + /// The content of an `m.secret.send` event. /// /// An event sent by a client to share a secret with another device, in response to an diff --git a/crates/ruma-common/src/events/space/child.rs b/crates/ruma-common/src/events/space/child.rs index e4db50bf..25ae2256 100644 --- a/crates/ruma-common/src/events/space/child.rs +++ b/crates/ruma-common/src/events/space/child.rs @@ -2,11 +2,11 @@ //! //! [`m.space.child`]: https://spec.matrix.org/v1.2/client-server-api/#mspacechild -use ruma_common::MilliSecondsSinceUnixEpoch; -use ruma_identifiers::{ServerName, UserId}; use ruma_macros::{Event, EventContent}; use serde::{Deserialize, Serialize}; +use crate::{MilliSecondsSinceUnixEpoch, ServerName, UserId}; + /// The content of an `m.space.child` event. /// /// The admins of a space can advertise rooms and subspaces for their space by setting @@ -71,10 +71,9 @@ pub struct HierarchySpaceChildStateEvent { #[cfg(test)] mod tests { + use crate::{server_name, user_id, MilliSecondsSinceUnixEpoch}; use js_int::uint; use matches::assert_matches; - use ruma_common::MilliSecondsSinceUnixEpoch; - use ruma_identifiers::{server_name, user_id}; use serde_json::{from_value as from_json_value, json, to_value as to_json_value}; use super::{HierarchySpaceChildStateEvent, SpaceChildEventContent}; diff --git a/crates/ruma-common/src/events/space/parent.rs b/crates/ruma-common/src/events/space/parent.rs index 4cc2ce8b..35ac1ce6 100644 --- a/crates/ruma-common/src/events/space/parent.rs +++ b/crates/ruma-common/src/events/space/parent.rs @@ -2,10 +2,11 @@ //! //! [`m.space.parent`]: https://spec.matrix.org/v1.2/client-server-api/#mspaceparent -use ruma_identifiers::ServerName; use ruma_macros::EventContent; use serde::{Deserialize, Serialize}; +use crate::ServerName; + /// The content of an `m.space.parent` event. /// /// Rooms can claim parents via the `m.space.parent` state event. @@ -40,7 +41,7 @@ impl SpaceParentEventContent { #[cfg(test)] mod tests { - use ruma_identifiers::server_name; + use crate::server_name; use serde_json::{json, to_value as to_json_value}; use super::SpaceParentEventContent; diff --git a/crates/ruma-common/src/events/sticker.rs b/crates/ruma-common/src/events/sticker.rs index c16506cf..2ff18406 100644 --- a/crates/ruma-common/src/events/sticker.rs +++ b/crates/ruma-common/src/events/sticker.rs @@ -2,11 +2,10 @@ //! //! [`m.sticker`]: https://spec.matrix.org/v1.2/client-server-api/#msticker -use ruma_identifiers::MxcUri; use ruma_macros::EventContent; use serde::{Deserialize, Serialize}; -use crate::events::room::ImageInfo; +use crate::{events::room::ImageInfo, MxcUri}; /// The content of an `m.sticker` event. /// diff --git a/crates/ruma-common/src/events/typing.rs b/crates/ruma-common/src/events/typing.rs index c31781db..d6cf3b03 100644 --- a/crates/ruma-common/src/events/typing.rs +++ b/crates/ruma-common/src/events/typing.rs @@ -2,10 +2,11 @@ //! //! [`m.typing`]: https://spec.matrix.org/v1.2/client-server-api/#mtyping -use ruma_identifiers::UserId; use ruma_macros::EventContent; use serde::{Deserialize, Serialize}; +use crate::UserId; + /// The content of an `m.typing` event. /// /// Informs the client who is currently typing in a given room. diff --git a/crates/ruma-common/src/events/unsigned.rs b/crates/ruma-common/src/events/unsigned.rs index 72ebd3d2..c1837bbc 100644 --- a/crates/ruma-common/src/events/unsigned.rs +++ b/crates/ruma-common/src/events/unsigned.rs @@ -1,10 +1,10 @@ use js_int::Int; -use ruma_identifiers::TransactionId; use serde::{Deserialize, Serialize}; #[cfg(feature = "unstable-msc2675")] use super::relation::Relations; use super::room::redaction::SyncRoomRedactionEvent; +use crate::TransactionId; /// Extra information about an event that is not incorporated into the event's hash. #[derive(Clone, Debug, Default, Deserialize, Serialize)] diff --git a/crates/ruma-identifiers/src/lib.rs b/crates/ruma-common/src/identifiers.rs similarity index 78% rename from crates/ruma-identifiers/src/lib.rs rename to crates/ruma-common/src/identifiers.rs index 37e14221..9ed035e1 100644 --- a/crates/ruma-identifiers/src/lib.rs +++ b/crates/ruma-common/src/identifiers.rs @@ -1,30 +1,15 @@ -#![doc(html_favicon_url = "https://www.ruma.io/favicon.ico")] -#![doc(html_logo_url = "https://www.ruma.io/images/logo.png")] //! Types for [Matrix](https://matrix.org/) identifiers for devices, events, keys, rooms, servers, //! users and URIs. -#![warn(missing_docs)] -// FIXME: Remove once lint doesn't trigger on std::convert::TryFrom in macros.rs anymore +// FIXME: Remove once lint doesn't trigger on std::convert::TryFrom in identifiers/macros.rs anymore #![allow(unused_qualifications)] -#![cfg_attr(docsrs, feature(doc_auto_cfg))] -// Renamed in `Cargo.toml` so we can features with the same name as the package. -// Rename them back here because the `Cargo.toml` names are ugly. -#[cfg(feature = "serde")] -extern crate serde1 as serde; - -#[cfg(feature = "rand")] -extern crate rand_crate as rand; - -#[cfg(feature = "serde")] use std::convert::TryFrom; -use std::fmt; -#[cfg(feature = "serde")] use serde::de::{self, Deserializer, Unexpected}; #[doc(inline)] -pub use crate::{ +pub use self::{ client_secret::ClientSecret, crypto_algorithms::{DeviceKeyAlgorithm, EventEncryptionAlgorithm, SigningKeyAlgorithm}, device_id::DeviceId, @@ -84,10 +69,9 @@ fn generate_localpart(length: usize) -> Box { .into_boxed_str() } -/// Deserializes any type of id using the provided TryFrom implementation. +/// Deserializes any type of id using the provided `TryFrom` implementation. /// -/// This is a helper function to reduce the boilerplate of the Deserialize implementations. -#[cfg(feature = "serde")] +/// This is a helper function to reduce the boilerplate of the `Deserialize` implementations. fn deserialize_id<'de, D, T>(deserializer: D, expected_str: &str) -> Result where D: Deserializer<'de>, @@ -187,16 +171,3 @@ macro_rules! user_id { $crate::_macros::user_id!($crate, $s) }; } - -// Wrapper around `Box` that cannot be used in a meaningful way outside of -// this crate. Used for string enums because their `_Custom` variant can't be -// truly private (only `#[doc(hidden)]`). -#[doc(hidden)] -#[derive(Clone, PartialEq, Eq, PartialOrd, Ord)] -pub struct PrivOwnedStr(Box); - -impl fmt::Debug for PrivOwnedStr { - fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { - self.0.fmt(f) - } -} diff --git a/crates/ruma-identifiers/src/client_secret.rs b/crates/ruma-common/src/identifiers/client_secret.rs similarity index 100% rename from crates/ruma-identifiers/src/client_secret.rs rename to crates/ruma-common/src/identifiers/client_secret.rs diff --git a/crates/ruma-identifiers/src/crypto_algorithms.rs b/crates/ruma-common/src/identifiers/crypto_algorithms.rs similarity index 80% rename from crates/ruma-identifiers/src/crypto_algorithms.rs rename to crates/ruma-common/src/identifiers/crypto_algorithms.rs index 16fa0d06..9cf29c68 100644 --- a/crates/ruma-identifiers/src/crypto_algorithms.rs +++ b/crates/ruma-common/src/identifiers/crypto_algorithms.rs @@ -1,8 +1,6 @@ //! Key algorithms used in Matrix spec. -use ruma_macros::{AsRefStr, DisplayAsRefStr, FromString}; -#[cfg(feature = "serde")] -use ruma_serde::{DeserializeFromCowStr, SerializeAsRefStr}; +use ruma_macros::StringEnum; use crate::PrivOwnedStr; @@ -10,10 +8,9 @@ use crate::PrivOwnedStr; /// /// This type can hold an arbitrary string. To check for algorithms that are not available as a /// documented variant here, use its string representation, obtained through `.as_str()`. -#[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord, AsRefStr, DisplayAsRefStr, FromString)] +#[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord, StringEnum)] #[non_exhaustive] #[ruma_enum(rename_all = "snake_case")] -#[cfg_attr(feature = "serde", derive(DeserializeFromCowStr, SerializeAsRefStr))] pub enum DeviceKeyAlgorithm { /// The Ed25519 signature algorithm. Ed25519, @@ -32,10 +29,9 @@ pub enum DeviceKeyAlgorithm { /// /// This type can hold an arbitrary string. To check for algorithms that are not available as a /// documented variant here, use its string representation, obtained through `.as_str()`. -#[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord, AsRefStr, DisplayAsRefStr, FromString)] +#[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord, StringEnum)] #[non_exhaustive] #[ruma_enum(rename_all = "snake_case")] -#[cfg_attr(feature = "serde", derive(DeserializeFromCowStr, SerializeAsRefStr))] pub enum SigningKeyAlgorithm { /// The Ed25519 signature algorithm. Ed25519, @@ -48,9 +44,8 @@ pub enum SigningKeyAlgorithm { /// /// This type can hold an arbitrary string. To check for algorithms that are not available as a /// documented variant here, use its string representation, obtained through `.as_str()`. -#[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord, AsRefStr, DisplayAsRefStr, FromString)] +#[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord, StringEnum)] #[non_exhaustive] -#[cfg_attr(feature = "serde", derive(DeserializeFromCowStr, SerializeAsRefStr))] pub enum EventEncryptionAlgorithm { /// Olm version 1 using Curve25519, AES-256, and SHA-256. #[ruma_enum(rename = "m.olm.v1.curve25519-aes-sha2")] @@ -84,7 +79,6 @@ mod tests { } #[test] - #[cfg(feature = "serde")] fn event_encryption_algorithm_serde() { use ruma_serde::test::serde_json_eq; use serde_json::json; diff --git a/crates/ruma-identifiers/src/device_id.rs b/crates/ruma-common/src/identifiers/device_id.rs similarity index 95% rename from crates/ruma-identifiers/src/device_id.rs rename to crates/ruma-common/src/identifiers/device_id.rs index ad14d4b7..c93b5666 100644 --- a/crates/ruma-identifiers/src/device_id.rs +++ b/crates/ruma-common/src/identifiers/device_id.rs @@ -1,5 +1,5 @@ #[cfg(feature = "rand")] -use crate::generate_localpart; +use super::generate_localpart; /// A Matrix key ID. /// @@ -9,7 +9,7 @@ use crate::generate_localpart; /// # Example /// /// ``` -/// use ruma_identifiers::{device_id, DeviceId}; +/// use ruma_common::{device_id, DeviceId}; /// /// let random_id = DeviceId::new(); /// assert_eq!(random_id.as_str().len(), 8); diff --git a/crates/ruma-identifiers/src/device_key_id.rs b/crates/ruma-common/src/identifiers/device_key_id.rs similarity index 94% rename from crates/ruma-identifiers/src/device_key_id.rs rename to crates/ruma-common/src/identifiers/device_key_id.rs index bba24353..bab0d35e 100644 --- a/crates/ruma-identifiers/src/device_key_id.rs +++ b/crates/ruma-common/src/identifiers/device_key_id.rs @@ -1,6 +1,6 @@ //! Identifiers for device keys for end-to-end encryption. -use crate::{crypto_algorithms::DeviceKeyAlgorithm, DeviceId}; +use super::{crypto_algorithms::DeviceKeyAlgorithm, DeviceId}; /// A key algorithm and a device id, combined with a ':'. #[repr(transparent)] @@ -43,7 +43,7 @@ mod tests { use std::convert::TryFrom; use super::DeviceKeyId; - use crate::{crypto_algorithms::DeviceKeyAlgorithm, Error}; + use crate::identifiers::{crypto_algorithms::DeviceKeyAlgorithm, Error}; #[test] fn convert_device_key_id() { @@ -54,7 +54,6 @@ mod tests { ); } - #[cfg(feature = "serde")] #[test] fn serialize_device_key_id() { let device_key_id = <&DeviceKeyId>::try_from("ed25519:JLAFKJWSCS").unwrap(); @@ -63,7 +62,6 @@ mod tests { assert_eq!(serialized, serde_json::json!("ed25519:JLAFKJWSCS")); } - #[cfg(feature = "serde")] #[test] fn deserialize_device_key_id() { let deserialized: Box = diff --git a/crates/ruma-identifiers/src/event_id.rs b/crates/ruma-common/src/identifiers/event_id.rs similarity index 96% rename from crates/ruma-identifiers/src/event_id.rs rename to crates/ruma-common/src/identifiers/event_id.rs index 046c9d6f..a4b2842e 100644 --- a/crates/ruma-identifiers/src/event_id.rs +++ b/crates/ruma-common/src/identifiers/event_id.rs @@ -1,6 +1,6 @@ //! Matrix event identifiers. -use crate::ServerName; +use super::ServerName; /// A Matrix [event ID]. /// @@ -18,7 +18,7 @@ use crate::ServerName; /// /// ``` /// # use std::convert::TryFrom; -/// # use ruma_identifiers::EventId; +/// # use ruma_common::EventId; /// // Original format /// assert_eq!(<&EventId>::try_from("$h29iv0s8:example.com").unwrap(), "$h29iv0s8:example.com"); /// // Room version 3 format @@ -48,7 +48,7 @@ impl EventId { /// 1 and 2. #[cfg(feature = "rand")] pub fn new(server_name: &ServerName) -> Box { - Self::from_owned(format!("${}:{}", crate::generate_localpart(18), server_name).into()) + Self::from_owned(format!("${}:{}", super::generate_localpart(18), server_name).into()) } /// Returns the event's unique ID. @@ -118,7 +118,6 @@ mod tests { assert_eq!(id_str.len(), 31); } - #[cfg(feature = "serde")] #[test] fn serialize_valid_original_event_id() { assert_eq!( @@ -131,7 +130,6 @@ mod tests { ); } - #[cfg(feature = "serde")] #[test] fn serialize_valid_base64_event_id() { assert_eq!( @@ -144,7 +142,6 @@ mod tests { ); } - #[cfg(feature = "serde")] #[test] fn serialize_valid_url_safe_base64_event_id() { assert_eq!( @@ -157,7 +154,6 @@ mod tests { ); } - #[cfg(feature = "serde")] #[test] fn deserialize_valid_original_event_id() { assert_eq!( @@ -167,7 +163,6 @@ mod tests { ); } - #[cfg(feature = "serde")] #[test] fn deserialize_valid_base64_event_id() { assert_eq!( @@ -180,7 +175,6 @@ mod tests { ); } - #[cfg(feature = "serde")] #[test] fn deserialize_valid_url_safe_base64_event_id() { assert_eq!( diff --git a/crates/ruma-identifiers/src/key_id.rs b/crates/ruma-common/src/identifiers/key_id.rs similarity index 98% rename from crates/ruma-identifiers/src/key_id.rs rename to crates/ruma-common/src/identifiers/key_id.rs index ae35263c..93b0cd7d 100644 --- a/crates/ruma-identifiers/src/key_id.rs +++ b/crates/ruma-common/src/identifiers/key_id.rs @@ -9,7 +9,7 @@ use std::{ sync::Arc, }; -use crate::{crypto_algorithms::SigningKeyAlgorithm, DeviceId, KeyName}; +use super::{crypto_algorithms::SigningKeyAlgorithm, DeviceId, KeyName}; /// A key algorithm and key name delimited by a colon. #[repr(transparent)] @@ -192,7 +192,7 @@ impl Hash for KeyId { self.as_str().hash(state); } } -#[cfg(feature = "serde")] + impl serde::Serialize for KeyId { fn serialize(&self, serializer: S) -> Result where @@ -208,7 +208,6 @@ impl From>> for String { } } -#[cfg(feature = "serde")] impl<'de, A, K: ?Sized> serde::Deserialize<'de> for Box> { fn deserialize(deserializer: D) -> Result where diff --git a/crates/ruma-identifiers/src/key_name.rs b/crates/ruma-common/src/identifiers/key_name.rs similarity index 100% rename from crates/ruma-identifiers/src/key_name.rs rename to crates/ruma-common/src/identifiers/key_name.rs diff --git a/crates/ruma-identifiers/src/macros.rs b/crates/ruma-common/src/identifiers/macros.rs similarity index 95% rename from crates/ruma-identifiers/src/macros.rs rename to crates/ruma-common/src/identifiers/macros.rs index 8dda2e1a..dfe22fe8 100644 --- a/crates/ruma-identifiers/src/macros.rs +++ b/crates/ruma-common/src/identifiers/macros.rs @@ -144,7 +144,6 @@ macro_rules! opaque_identifier_common_impls { } } - #[cfg(feature = "serde")] impl serde::Serialize for $id { fn serialize(&self, serializer: S) -> Result where @@ -199,7 +198,6 @@ macro_rules! opaque_identifier { } } - #[cfg(feature = "serde")] impl<'de> serde::Deserialize<'de> for Box<$id> { fn deserialize(deserializer: D) -> Result where @@ -224,7 +222,7 @@ macro_rules! opaque_identifier_validated { ")] pub fn parse( s: impl AsRef + Into>, - ) -> Result, crate::Error> { + ) -> Result, crate:: Error> { $validate_id(s.as_ref())?; Ok($id::from_owned(s.into())) } @@ -234,7 +232,7 @@ macro_rules! opaque_identifier_validated { #[doc = concat!("Try parsing a `&str` into an `Rc<", stringify!($id), ">`.")] pub fn parse_rc( s: impl AsRef + Into>, - ) -> Result, crate::Error> { + ) -> Result, crate:: Error> { $validate_id(s.as_ref())?; Ok($id::from_rc(s.into())) } @@ -244,7 +242,7 @@ macro_rules! opaque_identifier_validated { #[doc = concat!("Try parsing a `&str` into an `Arc<", stringify!($id), ">`.")] pub fn parse_arc( s: impl AsRef + Into>, - ) -> Result, crate::Error> { + ) -> Result, crate:: Error> { $validate_id(s.as_ref())?; Ok($id::from_arc(s.into())) } @@ -259,7 +257,6 @@ macro_rules! opaque_identifier_validated { } } - #[cfg(feature = "serde")] impl<'de> serde::Deserialize<'de> for Box<$id> { fn deserialize(deserializer: D) -> Result where @@ -277,7 +274,7 @@ macro_rules! opaque_identifier_validated { } impl<'a> std::convert::TryFrom<&'a str> for &'a $id { - type Error = crate::Error; + type Error = crate:: Error; fn try_from(s: &'a str) -> Result { $validate_id(s)?; @@ -286,7 +283,7 @@ macro_rules! opaque_identifier_validated { } impl std::str::FromStr for Box<$id> { - type Err = crate::Error; + type Err = crate:: Error; fn from_str(s: &str) -> Result { $id::parse(s) @@ -294,7 +291,7 @@ macro_rules! opaque_identifier_validated { } impl std::convert::TryFrom<&str> for Box<$id> { - type Error = crate::Error; + type Error = crate:: Error; fn try_from(s: &str) -> Result { $id::parse(s) @@ -302,7 +299,7 @@ macro_rules! opaque_identifier_validated { } impl std::convert::TryFrom for Box<$id> { - type Error = crate::Error; + type Error = crate:: Error; fn try_from(s: String) -> Result { $id::parse(s) diff --git a/crates/ruma-identifiers/src/matrix_uri.rs b/crates/ruma-common/src/identifiers/matrix_uri.rs similarity index 99% rename from crates/ruma-identifiers/src/matrix_uri.rs rename to crates/ruma-common/src/identifiers/matrix_uri.rs index 20d6055d..8b215028 100644 --- a/crates/ruma-identifiers/src/matrix_uri.rs +++ b/crates/ruma-common/src/identifiers/matrix_uri.rs @@ -9,7 +9,8 @@ use ruma_identifiers_validation::{ }; use url::Url; -use crate::{EventId, PrivOwnedStr, RoomAliasId, RoomId, RoomOrAliasId, ServerName, UserId}; +use super::{EventId, RoomAliasId, RoomId, RoomOrAliasId, ServerName, UserId}; +use crate::PrivOwnedStr; const MATRIX_TO_BASE_URL: &str = "https://matrix.to/#/"; const MATRIX_SCHEME: &str = "matrix"; diff --git a/crates/ruma-identifiers/src/mxc_uri.rs b/crates/ruma-common/src/identifiers/mxc_uri.rs similarity index 97% rename from crates/ruma-identifiers/src/mxc_uri.rs rename to crates/ruma-common/src/identifiers/mxc_uri.rs index ab51c921..1cd6ea2d 100644 --- a/crates/ruma-identifiers/src/mxc_uri.rs +++ b/crates/ruma-common/src/identifiers/mxc_uri.rs @@ -6,7 +6,7 @@ use std::num::NonZeroU8; use ruma_identifiers_validation::{error::MxcUriError, mxc_uri::validate}; -use crate::ServerName; +use super::ServerName; type Result = std::result::Result; @@ -92,7 +92,6 @@ mod tests { assert!(!Box::::from("127.0.0.1/asd32asdfasdsd").is_valid()); } - #[cfg(feature = "serde")] #[test] fn serialize_mxc_uri() { assert_eq!( @@ -102,7 +101,6 @@ mod tests { ); } - #[cfg(feature = "serde")] #[test] fn deserialize_mxc_uri() { let mxc = serde_json::from_str::>(r#""mxc://server/1234id""#) diff --git a/crates/ruma-identifiers/src/room_alias_id.rs b/crates/ruma-common/src/identifiers/room_alias_id.rs similarity index 96% rename from crates/ruma-identifiers/src/room_alias_id.rs rename to crates/ruma-common/src/identifiers/room_alias_id.rs index b55dc2db..655dc103 100644 --- a/crates/ruma-identifiers/src/room_alias_id.rs +++ b/crates/ruma-common/src/identifiers/room_alias_id.rs @@ -1,6 +1,6 @@ //! Matrix room alias identifiers. -use crate::{matrix_uri::UriAction, server_name::ServerName, EventId, MatrixToUri, MatrixUri}; +use super::{matrix_uri::UriAction, server_name::ServerName, EventId, MatrixToUri, MatrixUri}; /// A Matrix [room alias ID]. /// @@ -9,7 +9,7 @@ use crate::{matrix_uri::UriAction, server_name::ServerName, EventId, MatrixToUri /// /// ``` /// # use std::convert::TryFrom; -/// # use ruma_identifiers::RoomAliasId; +/// # use ruma_common::RoomAliasId; /// assert_eq!(<&RoomAliasId>::try_from("#ruma:example.com").unwrap(), "#ruma:example.com"); /// ``` /// @@ -81,7 +81,6 @@ mod tests { ); } - #[cfg(feature = "serde")] #[test] fn serialize_valid_room_alias_id() { assert_eq!( @@ -94,7 +93,6 @@ mod tests { ); } - #[cfg(feature = "serde")] #[test] fn deserialize_valid_room_alias_id() { assert_eq!( diff --git a/crates/ruma-identifiers/src/room_id.rs b/crates/ruma-common/src/identifiers/room_id.rs similarity index 94% rename from crates/ruma-identifiers/src/room_id.rs rename to crates/ruma-common/src/identifiers/room_id.rs index 58152630..cd934dae 100644 --- a/crates/ruma-identifiers/src/room_id.rs +++ b/crates/ruma-common/src/identifiers/room_id.rs @@ -1,6 +1,6 @@ //! Matrix room identifiers. -use crate::{matrix_uri::UriAction, EventId, MatrixToUri, MatrixUri, ServerName}; +use super::{matrix_uri::UriAction, EventId, MatrixToUri, MatrixUri, ServerName}; /// A Matrix [room ID]. /// @@ -9,7 +9,7 @@ use crate::{matrix_uri::UriAction, EventId, MatrixToUri, MatrixUri, ServerName}; /// /// ``` /// # use std::convert::TryFrom; -/// # use ruma_identifiers::RoomId; +/// # use ruma_common::RoomId; /// assert_eq!(<&RoomId>::try_from("!n8f893n9:example.com").unwrap(), "!n8f893n9:example.com"); /// ``` /// @@ -27,7 +27,7 @@ impl RoomId { /// Fails if the given homeserver cannot be parsed as a valid host. #[cfg(feature = "rand")] pub fn new(server_name: &ServerName) -> Box { - Self::from_owned(format!("!{}:{}", crate::generate_localpart(18), server_name).into()) + Self::from_owned(format!("!{}:{}", super::generate_localpart(18), server_name).into()) } /// Returns the rooms's unique ID. @@ -45,7 +45,7 @@ impl RoomId { /// # Example /// /// ``` - /// use ruma_identifiers::{room_id, server_name}; + /// use ruma_common::{room_id, server_name}; /// /// assert_eq!( /// room_id!("!somewhere:example.org") @@ -70,7 +70,7 @@ impl RoomId { /// # Example /// /// ``` - /// use ruma_identifiers::{room_id, server_name}; + /// use ruma_common::{room_id, server_name}; /// /// assert_eq!( /// room_id!("!somewhere:example.org") @@ -142,7 +142,6 @@ mod tests { assert_eq!(id_str.len(), 31); } - #[cfg(feature = "serde")] #[test] fn serialize_valid_room_id() { assert_eq!( @@ -154,7 +153,6 @@ mod tests { ); } - #[cfg(feature = "serde")] #[test] fn deserialize_valid_room_id() { assert_eq!( diff --git a/crates/ruma-identifiers/src/room_name.rs b/crates/ruma-common/src/identifiers/room_name.rs similarity index 100% rename from crates/ruma-identifiers/src/room_name.rs rename to crates/ruma-common/src/identifiers/room_name.rs diff --git a/crates/ruma-identifiers/src/room_or_room_alias_id.rs b/crates/ruma-common/src/identifiers/room_or_room_alias_id.rs similarity index 97% rename from crates/ruma-identifiers/src/room_or_room_alias_id.rs rename to crates/ruma-common/src/identifiers/room_or_room_alias_id.rs index a408a5ec..355461c2 100644 --- a/crates/ruma-identifiers/src/room_or_room_alias_id.rs +++ b/crates/ruma-common/src/identifiers/room_or_room_alias_id.rs @@ -2,7 +2,7 @@ use std::{convert::TryFrom, hint::unreachable_unchecked}; -use crate::{server_name::ServerName, RoomAliasId, RoomId}; +use super::{server_name::ServerName, RoomAliasId, RoomId}; /// A Matrix [room ID] or a Matrix [room alias ID]. /// @@ -12,7 +12,7 @@ use crate::{server_name::ServerName, RoomAliasId, RoomId}; /// /// ``` /// # use std::convert::TryFrom; -/// # use ruma_identifiers::RoomOrAliasId; +/// # use ruma_common::RoomOrAliasId; /// assert_eq!(<&RoomOrAliasId>::try_from("#ruma:example.com").unwrap(), "#ruma:example.com"); /// /// assert_eq!( @@ -187,7 +187,6 @@ mod tests { ); } - #[cfg(feature = "serde")] #[test] fn serialize_valid_room_id_or_alias_id_with_a_room_alias_id() { assert_eq!( @@ -200,7 +199,6 @@ mod tests { ); } - #[cfg(feature = "serde")] #[test] fn serialize_valid_room_id_or_alias_id_with_a_room_id() { assert_eq!( @@ -213,7 +211,6 @@ mod tests { ); } - #[cfg(feature = "serde")] #[test] fn deserialize_valid_room_id_or_alias_id_with_a_room_alias_id() { assert_eq!( @@ -223,7 +220,6 @@ mod tests { ); } - #[cfg(feature = "serde")] #[test] fn deserialize_valid_room_id_or_alias_id_with_a_room_id() { assert_eq!( diff --git a/crates/ruma-identifiers/src/room_version_id.rs b/crates/ruma-common/src/identifiers/room_version_id.rs similarity index 95% rename from crates/ruma-identifiers/src/room_version_id.rs rename to crates/ruma-common/src/identifiers/room_version_id.rs index e5f7b603..084fb46d 100644 --- a/crates/ruma-identifiers/src/room_version_id.rs +++ b/crates/ruma-common/src/identifiers/room_version_id.rs @@ -3,7 +3,6 @@ use std::{cmp::Ordering, convert::TryFrom, str::FromStr}; use ruma_macros::DisplayAsRefStr; -#[cfg(feature = "serde")] use serde::{Deserialize, Deserializer, Serialize, Serializer}; /// A Matrix [room version] ID. @@ -13,7 +12,7 @@ use serde::{Deserialize, Deserializer, Serialize, Serializer}; /// /// ``` /// # use std::convert::TryFrom; -/// # use ruma_identifiers::RoomVersionId; +/// # use ruma_common::RoomVersionId; /// assert_eq!(RoomVersionId::try_from("1").unwrap().as_ref(), "1"); /// ``` /// @@ -127,7 +126,6 @@ impl Ord for RoomVersionId { } } -#[cfg(feature = "serde")] impl Serialize for RoomVersionId { fn serialize(&self, serializer: S) -> Result where @@ -137,13 +135,12 @@ impl Serialize for RoomVersionId { } } -#[cfg(feature = "serde")] impl<'de> Deserialize<'de> for RoomVersionId { fn deserialize(deserializer: D) -> Result where D: Deserializer<'de>, { - crate::deserialize_id(deserializer, "a Matrix room version ID as a string") + super::deserialize_id(deserializer, "a Matrix room version ID as a string") } } @@ -174,7 +171,7 @@ where impl FromStr for RoomVersionId { type Err = crate::Error; - fn from_str(s: &str) -> Result { + fn from_str(s: &str) -> Result { try_from(s) } } @@ -182,7 +179,7 @@ impl FromStr for RoomVersionId { impl TryFrom<&str> for RoomVersionId { type Error = crate::Error; - fn try_from(s: &str) -> Result { + fn try_from(s: &str) -> Result { try_from(s) } } @@ -190,7 +187,7 @@ impl TryFrom<&str> for RoomVersionId { impl TryFrom for RoomVersionId { type Error = crate::Error; - fn try_from(s: String) -> Result { + fn try_from(s: String) -> Result { try_from(s) } } @@ -321,7 +318,6 @@ mod tests { ); } - #[cfg(feature = "serde")] #[test] fn serialize_official_room_id() { assert_eq!( @@ -333,7 +329,6 @@ mod tests { ); } - #[cfg(feature = "serde")] #[test] fn deserialize_official_room_id() { let deserialized = serde_json::from_str::(r#""1""#) @@ -347,7 +342,6 @@ mod tests { ); } - #[cfg(feature = "serde")] #[test] fn serialize_custom_room_id() { assert_eq!( @@ -359,7 +353,6 @@ mod tests { ); } - #[cfg(feature = "serde")] #[test] fn deserialize_custom_room_id() { let deserialized = serde_json::from_str::(r#""io.ruma.1""#) diff --git a/crates/ruma-identifiers/src/server_name.rs b/crates/ruma-common/src/identifiers/server_name.rs similarity index 100% rename from crates/ruma-identifiers/src/server_name.rs rename to crates/ruma-common/src/identifiers/server_name.rs diff --git a/crates/ruma-identifiers/src/session_id.rs b/crates/ruma-common/src/identifiers/session_id.rs similarity index 100% rename from crates/ruma-identifiers/src/session_id.rs rename to crates/ruma-common/src/identifiers/session_id.rs diff --git a/crates/ruma-identifiers/src/signatures.rs b/crates/ruma-common/src/identifiers/signatures.rs similarity index 84% rename from crates/ruma-identifiers/src/signatures.rs rename to crates/ruma-common/src/identifiers/signatures.rs index c60e56e3..fb343dbc 100644 --- a/crates/ruma-identifiers/src/signatures.rs +++ b/crates/ruma-common/src/identifiers/signatures.rs @@ -1,6 +1,8 @@ use std::{borrow::Borrow, collections::BTreeMap}; -use crate::{DeviceId, KeyName, ServerName, SigningKeyId, UserId}; +use serde::{Deserialize, Serialize}; + +use super::{DeviceId, KeyName, ServerName, SigningKeyId, UserId}; /// Map of key identifier to signature values. pub type EntitySignatures = BTreeMap>, String>; @@ -8,7 +10,7 @@ pub type EntitySignatures = BTreeMap>, String>; /// Map of all signatures, grouped by entity /// /// ``` -/// # use ruma_identifiers::{server_name, KeyId, Signatures, SigningKeyAlgorithm}; +/// # use ruma_common::{server_name, {KeyId, Signatures, SigningKeyAlgorithm}}; /// let key_identifier = KeyId::from_parts(SigningKeyAlgorithm::Ed25519, "1"); /// let mut signatures = Signatures::new(); /// let server_name = server_name!("example.org"); @@ -16,12 +18,8 @@ pub type EntitySignatures = BTreeMap>, String>; /// "YbJva03ihSj5mPk+CHMJKUKlCXCPFXjXOK6VqBnN9nA2evksQcTGn6hwQfrgRHIDDXO2le49x7jnWJHMJrJoBQ"; /// signatures.insert(server_name, key_identifier, signature.into()); /// ``` -#[derive(Clone, Debug, Default)] -#[cfg_attr( - feature = "serde", - derive(serde::Serialize, serde::Deserialize), - serde(transparent, crate = "serde") -)] +#[derive(Clone, Debug, Default, Serialize, Deserialize)] +#[serde(transparent)] pub struct Signatures(BTreeMap>); impl Signatures { diff --git a/crates/ruma-identifiers/src/transaction_id.rs b/crates/ruma-common/src/identifiers/transaction_id.rs similarity index 100% rename from crates/ruma-identifiers/src/transaction_id.rs rename to crates/ruma-common/src/identifiers/transaction_id.rs diff --git a/crates/ruma-identifiers/src/user_id.rs b/crates/ruma-common/src/identifiers/user_id.rs similarity index 96% rename from crates/ruma-identifiers/src/user_id.rs rename to crates/ruma-common/src/identifiers/user_id.rs index 2f3efa49..8662e421 100644 --- a/crates/ruma-identifiers/src/user_id.rs +++ b/crates/ruma-common/src/identifiers/user_id.rs @@ -2,7 +2,7 @@ use std::{rc::Rc, sync::Arc}; -use crate::{matrix_uri::UriAction, MatrixToUri, MatrixUri, ServerName}; +use super::{matrix_uri::UriAction, MatrixToUri, MatrixUri, ServerName}; /// A Matrix [user ID]. /// @@ -11,7 +11,7 @@ use crate::{matrix_uri::UriAction, MatrixToUri, MatrixUri, ServerName}; /// /// ``` /// # use std::convert::TryFrom; -/// # use ruma_identifiers::UserId; +/// # use ruma_common::UserId; /// assert_eq!(<&UserId>::try_from("@carl:example.com").unwrap(), "@carl:example.com"); /// ``` /// @@ -28,7 +28,7 @@ impl UserId { #[cfg(feature = "rand")] pub fn new(server_name: &ServerName) -> Box { Self::from_owned( - format!("@{}:{}", crate::generate_localpart(12).to_lowercase(), server_name).into(), + format!("@{}:{}", super::generate_localpart(12).to_lowercase(), server_name).into(), ) } @@ -42,7 +42,7 @@ impl UserId { pub fn parse_with_server_name( id: impl AsRef + Into>, server_name: &ServerName, - ) -> Result, crate::Error> { + ) -> Result, super::Error> { let id_str = id.as_ref(); if id_str.starts_with('@') { @@ -59,7 +59,7 @@ impl UserId { pub fn parse_with_server_name_rc( id: impl AsRef + Into>, server_name: &ServerName, - ) -> Result, crate::Error> { + ) -> Result, super::Error> { let id_str = id.as_ref(); if id_str.starts_with('@') { @@ -76,7 +76,7 @@ impl UserId { pub fn parse_with_server_name_arc( id: impl AsRef + Into>, server_name: &ServerName, - ) -> Result, crate::Error> { + ) -> Result, super::Error> { let id_str = id.as_ref(); if id_str.starts_with('@') { @@ -110,7 +110,7 @@ impl UserId { /// # Example /// /// ``` - /// use ruma_identifiers::user_id; + /// use ruma_common::user_id; /// /// let message = format!( /// r#"Thanks for the update {display_name}."#, @@ -130,7 +130,7 @@ impl UserId { /// # Example /// /// ``` - /// use ruma_identifiers::user_id; + /// use ruma_common::user_id; /// /// let message = format!( /// r#"Thanks for the update {display_name}."#, @@ -187,6 +187,7 @@ mod tests { assert!(!user_id.is_historical()); } + #[cfg(not(feature = "compat"))] #[test] fn invalid_user_id() { let localpart = "τ"; @@ -257,7 +258,6 @@ mod tests { assert_eq!(id_str.len(), 25); } - #[cfg(feature = "serde")] #[test] fn serialize_valid_user_id() { assert_eq!( @@ -269,7 +269,6 @@ mod tests { ); } - #[cfg(feature = "serde")] #[test] fn deserialize_valid_user_id() { assert_eq!( diff --git a/crates/ruma-common/src/lib.rs b/crates/ruma-common/src/lib.rs index 1f4ad543..7f6225c3 100644 --- a/crates/ruma-common/src/lib.rs +++ b/crates/ruma-common/src/lib.rs @@ -11,6 +11,11 @@ compile_error!( "ruma_common's `client` and `server` Cargo features only exist as a workaround are not meant to be disabled" ); +// Renamed in `Cargo.toml` so we can features with the same name as the package. +// Rename them back here because the `Cargo.toml` names are ugly. +#[cfg(feature = "rand")] +extern crate rand_crate as rand; + // Hack to allow both ruma-common itself and external crates (or tests) to use procedural macros // that expect `ruma_common` to exist in the prelude. extern crate self as ruma_common; @@ -22,6 +27,7 @@ pub mod directory; pub mod encryption; #[cfg(feature = "events")] pub mod events; +mod identifiers; pub mod power_levels; pub mod presence; pub mod push; @@ -33,6 +39,7 @@ pub mod to_device; use std::fmt; +pub use identifiers::*; pub use time::{MilliSecondsSinceUnixEpoch, SecondsSinceUnixEpoch}; // Wrapper around `Box` that cannot be used in a meaningful way outside of @@ -53,7 +60,6 @@ impl fmt::Debug for PrivOwnedStr { /// It is not considered part of this module's public API. #[doc(hidden)] pub mod exports { - pub use ruma_identifiers; pub use ruma_serde; pub use serde; pub use serde_json; diff --git a/crates/ruma-common/src/push.rs b/crates/ruma-common/src/push.rs index 5769d3f6..2d899ef4 100644 --- a/crates/ruma-common/src/push.rs +++ b/crates/ruma-common/src/push.rs @@ -463,7 +463,6 @@ mod tests { use js_int::uint; use matches::assert_matches; - use ruma_identifiers::{room_id, user_id}; use ruma_serde::Raw; use serde_json::{ from_value as from_json_value, json, to_value as to_json_value, @@ -475,7 +474,7 @@ mod tests { condition::{PushCondition, PushConditionRoomCtx, RoomMemberCountIs}, AnyPushRule, ConditionalPushRule, PatternedPushRule, Ruleset, SimplePushRule, }; - use crate::power_levels::NotificationPowerLevels; + use crate::{power_levels::NotificationPowerLevels, room_id, user_id}; fn example_ruleset() -> Ruleset { let mut set = Ruleset::new(); diff --git a/crates/ruma-common/src/push/condition.rs b/crates/ruma-common/src/push/condition.rs index af844a6b..860c508b 100644 --- a/crates/ruma-common/src/push/condition.rs +++ b/crates/ruma-common/src/push/condition.rs @@ -1,14 +1,13 @@ use std::{collections::BTreeMap, convert::TryFrom, ops::RangeBounds, str::FromStr}; use js_int::{Int, UInt}; -use ruma_identifiers::{RoomId, UserId}; use ruma_serde::Raw; use serde::{Deserialize, Serialize}; use serde_json::{to_value as to_json_value, value::Value as JsonValue}; use tracing::warn; use wildmatch::WildMatch; -use crate::power_levels::NotificationPowerLevels; +use crate::{power_levels::NotificationPowerLevels, RoomId, UserId}; mod room_member_count_is; @@ -305,10 +304,10 @@ impl FlattenedJson { mod tests { use std::collections::BTreeMap; + use crate::{room_id, user_id}; use js_int::uint; use maplit::btreemap; use matches::assert_matches; - use ruma_identifiers::{room_id, user_id}; use ruma_serde::Raw; use serde_json::{ from_value as from_json_value, json, to_value as to_json_value, Value as JsonValue, diff --git a/crates/ruma-common/src/push/predefined.rs b/crates/ruma-common/src/push/predefined.rs index 4a511f95..8ff73b97 100644 --- a/crates/ruma-common/src/push/predefined.rs +++ b/crates/ruma-common/src/push/predefined.rs @@ -2,12 +2,12 @@ ///! ///! [predefined push rules]: https://spec.matrix.org/v1.2/client-server-api/#predefined-rules use indexmap::indexset; -use ruma_identifiers::UserId; use super::{ Action::*, ConditionalPushRule, PatternedPushRule, PushCondition::*, RoomMemberCountIs, Ruleset, Tweak, }; +use crate::UserId; impl Ruleset { /// The list of all [predefined push rules]. diff --git a/crates/ruma-common/src/thirdparty.rs b/crates/ruma-common/src/thirdparty.rs index 27d7af30..bdc37d63 100644 --- a/crates/ruma-common/src/thirdparty.rs +++ b/crates/ruma-common/src/thirdparty.rs @@ -4,11 +4,10 @@ use std::collections::BTreeMap; -use ruma_identifiers::{RoomAliasId, UserId}; use ruma_serde::StringEnum; use serde::{Deserialize, Serialize}; -use crate::{MilliSecondsSinceUnixEpoch, PrivOwnedStr}; +use crate::{MilliSecondsSinceUnixEpoch, PrivOwnedStr, RoomAliasId, UserId}; /// Metadata about a third party protocol. /// diff --git a/crates/ruma-common/src/to_device.rs b/crates/ruma-common/src/to_device.rs index 0ba388e0..2b125e3a 100644 --- a/crates/ruma-common/src/to_device.rs +++ b/crates/ruma-common/src/to_device.rs @@ -7,12 +7,13 @@ use std::{ fmt::{Display, Formatter, Result as FmtResult}, }; -use ruma_identifiers::DeviceId; use serde::{ de::{self, Unexpected}, Deserialize, Deserializer, Serialize, Serializer, }; +use crate::DeviceId; + /// Represents one or all of a user's devices. #[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord)] #[allow(clippy::exhaustive_enums)] diff --git a/crates/ruma-common/tests/api/conversions.rs b/crates/ruma-common/tests/api/conversions.rs index 4623b4fd..704003d7 100644 --- a/crates/ruma-common/tests/api/conversions.rs +++ b/crates/ruma-common/tests/api/conversions.rs @@ -1,10 +1,12 @@ #![allow(clippy::exhaustive_structs)] -use ruma_common::api::{ - ruma_api, IncomingRequest as _, MatrixVersion, OutgoingRequest as _, - OutgoingRequestAppserviceExt, SendAccessToken, +use ruma_common::{ + api::{ + ruma_api, IncomingRequest as _, MatrixVersion, OutgoingRequest as _, + OutgoingRequestAppserviceExt, SendAccessToken, + }, + user_id, UserId, }; -use ruma_identifiers::{user_id, UserId}; ruma_api! { metadata: { diff --git a/crates/ruma-common/tests/api/manual_endpoint_impl.rs b/crates/ruma-common/tests/api/manual_endpoint_impl.rs index 4edbf3bd..ff55a7d1 100644 --- a/crates/ruma-common/tests/api/manual_endpoint_impl.rs +++ b/crates/ruma-common/tests/api/manual_endpoint_impl.rs @@ -4,12 +4,16 @@ use bytes::BufMut; use http::{header::CONTENT_TYPE, method::Method}; -use ruma_common::api::{ - error::{FromHttpRequestError, FromHttpResponseError, IntoHttpError, MatrixError, ServerError}, - AuthScheme, EndpointError, IncomingRequest, IncomingResponse, MatrixVersion, Metadata, - OutgoingRequest, OutgoingResponse, SendAccessToken, +use ruma_common::{ + api::{ + error::{ + FromHttpRequestError, FromHttpResponseError, IntoHttpError, MatrixError, ServerError, + }, + AuthScheme, EndpointError, IncomingRequest, IncomingResponse, MatrixVersion, Metadata, + OutgoingRequest, OutgoingResponse, SendAccessToken, + }, + RoomAliasId, RoomId, }; -use ruma_identifiers::{RoomAliasId, RoomId}; use ruma_serde::Outgoing; use serde::{Deserialize, Serialize}; diff --git a/crates/ruma-common/tests/api/ruma_api_lifetime.rs b/crates/ruma-common/tests/api/ruma_api_lifetime.rs index 00d09db6..49f05a8c 100644 --- a/crates/ruma-common/tests/api/ruma_api_lifetime.rs +++ b/crates/ruma-common/tests/api/ruma_api_lifetime.rs @@ -7,8 +7,7 @@ pub struct OtherThing<'t> { } mod empty_response { - use ruma_common::api::ruma_api; - use ruma_identifiers::{RoomAliasId, RoomId}; + use ruma_common::{api::ruma_api, RoomAliasId, RoomId}; ruma_api! { metadata: { @@ -34,8 +33,7 @@ mod empty_response { } mod nested_types { - use ruma_common::api::ruma_api; - use ruma_identifiers::RoomAliasId; + use ruma_common::{api::ruma_api, RoomAliasId}; ruma_api! { metadata: { @@ -52,7 +50,7 @@ mod nested_types { pub room_alias: &'a [Option<&'a RoomAliasId>], /// The room ID to set. - pub room_id: &'b [Option>], + pub room_id: &'b [Option>], } response: {} diff --git a/crates/ruma-common/tests/api/ruma_api_macros.rs b/crates/ruma-common/tests/api/ruma_api_macros.rs index 24647260..52b796b7 100644 --- a/crates/ruma-common/tests/api/ruma_api_macros.rs +++ b/crates/ruma-common/tests/api/ruma_api_macros.rs @@ -4,8 +4,8 @@ pub mod some_endpoint { use ruma_common::{ api::ruma_api, events::{tag::TagEvent, AnyRoomEvent}, + UserId, }; - use ruma_identifiers::UserId; use ruma_serde::Raw; ruma_api! { diff --git a/crates/ruma-common/tests/api/ui/03-move-value.rs b/crates/ruma-common/tests/api/ui/03-move-value.rs index 821e1587..614e8ba6 100644 --- a/crates/ruma-common/tests/api/ui/03-move-value.rs +++ b/crates/ruma-common/tests/api/ui/03-move-value.rs @@ -2,8 +2,7 @@ // consume the request/response. mod newtype_body { - use ruma_common::api::ruma_api; - use ruma_identifiers::UserId; + use ruma_common::{api::ruma_api, UserId}; #[derive(Clone, Debug, serde::Deserialize, serde::Serialize)] pub struct Foo; @@ -43,8 +42,7 @@ mod newtype_body { } mod raw_body { - use ruma_common::api::ruma_api; - use ruma_identifiers::UserId; + use ruma_common::{api::ruma_api, UserId}; ruma_api! { metadata: { @@ -81,8 +79,7 @@ mod raw_body { } mod plain { - use ruma_common::api::ruma_api; - use ruma_identifiers::UserId; + use ruma_common::{api::ruma_api, UserId}; #[derive(Clone, Debug, serde::Deserialize, serde::Serialize)] pub struct Foo; diff --git a/crates/ruma-common/tests/events/enums.rs b/crates/ruma-common/tests/events/enums.rs index 9783083e..12430473 100644 --- a/crates/ruma-common/tests/events/enums.rs +++ b/crates/ruma-common/tests/events/enums.rs @@ -1,6 +1,6 @@ use js_int::uint; use matches::assert_matches; -use ruma_identifiers::{event_id, room_alias_id, room_id, user_id}; +use ruma_common::{event_id, room_alias_id, room_id, user_id}; use ruma_serde::test::serde_json_eq; use serde_json::{from_value as from_json_value, json, Value as JsonValue}; diff --git a/crates/ruma-common/tests/events/ephemeral_event.rs b/crates/ruma-common/tests/events/ephemeral_event.rs index ccce6e4e..93a5b1ed 100644 --- a/crates/ruma-common/tests/events/ephemeral_event.rs +++ b/crates/ruma-common/tests/events/ephemeral_event.rs @@ -1,8 +1,7 @@ use js_int::uint; use maplit::btreemap; use matches::assert_matches; -use ruma_common::{receipt::ReceiptType, MilliSecondsSinceUnixEpoch}; -use ruma_identifiers::{event_id, room_id, user_id}; +use ruma_common::{event_id, receipt::ReceiptType, room_id, user_id, MilliSecondsSinceUnixEpoch}; use serde_json::{from_value as from_json_value, json, to_value as to_json_value}; use ruma_common::events::{ diff --git a/crates/ruma-common/tests/events/event_enums.rs b/crates/ruma-common/tests/events/event_enums.rs index 026153dc..8134d8d4 100644 --- a/crates/ruma-common/tests/events/event_enums.rs +++ b/crates/ruma-common/tests/events/event_enums.rs @@ -1,7 +1,6 @@ use js_int::{uint, UInt}; use matches::assert_matches; -use ruma_common::MilliSecondsSinceUnixEpoch; -use ruma_identifiers::{event_id, room_id, user_id}; +use ruma_common::{event_id, room_id, user_id, MilliSecondsSinceUnixEpoch}; use serde_json::{from_value as from_json_value, json}; use ruma_common::events::{ diff --git a/crates/ruma-common/tests/events/file.rs b/crates/ruma-common/tests/events/file.rs index c75d2707..1d480ca6 100644 --- a/crates/ruma-common/tests/events/file.rs +++ b/crates/ruma-common/tests/events/file.rs @@ -4,6 +4,7 @@ use assign::assign; use js_int::uint; use matches::assert_matches; use ruma_common::{ + event_id, events::{ file::{EncryptedContentInit, FileContent, FileContentInfo, FileEventContent}, message::MessageContent, @@ -13,9 +14,8 @@ use ruma_common::{ }, AnyMessageLikeEvent, MessageLikeEvent, Unsigned, }, - MilliSecondsSinceUnixEpoch, + mxc_uri, room_id, user_id, MilliSecondsSinceUnixEpoch, }; -use ruma_identifiers::{event_id, mxc_uri, room_id, user_id}; use ruma_serde::Base64; use serde_json::{from_value as from_json_value, json, to_value as to_json_value}; diff --git a/crates/ruma-common/tests/events/initial_state.rs b/crates/ruma-common/tests/events/initial_state.rs index 32797fb3..4c24a46b 100644 --- a/crates/ruma-common/tests/events/initial_state.rs +++ b/crates/ruma-common/tests/events/initial_state.rs @@ -1,8 +1,10 @@ use std::convert::TryFrom; use matches::assert_matches; -use ruma_common::events::{AnyInitialStateEvent, InitialStateEvent}; -use ruma_identifiers::RoomName; +use ruma_common::{ + events::{AnyInitialStateEvent, InitialStateEvent}, + RoomName, +}; use serde_json::json; #[test] diff --git a/crates/ruma-common/tests/events/message.rs b/crates/ruma-common/tests/events/message.rs index 2ab8576e..e6c95f31 100644 --- a/crates/ruma-common/tests/events/message.rs +++ b/crates/ruma-common/tests/events/message.rs @@ -4,6 +4,7 @@ use assign::assign; use js_int::uint; use matches::assert_matches; use ruma_common::{ + event_id, events::{ emote::EmoteEventContent, message::MessageEventContent, @@ -11,9 +12,8 @@ use ruma_common::{ room::message::{InReplyTo, Relation}, AnyMessageLikeEvent, MessageLikeEvent, Unsigned, }, - MilliSecondsSinceUnixEpoch, + room_id, user_id, MilliSecondsSinceUnixEpoch, }; -use ruma_identifiers::{event_id, room_id, user_id}; use serde_json::{from_value as from_json_value, json, to_value as to_json_value}; #[test] diff --git a/crates/ruma-common/tests/events/message_event.rs b/crates/ruma-common/tests/events/message_event.rs index 42648521..cf25df1a 100644 --- a/crates/ruma-common/tests/events/message_event.rs +++ b/crates/ruma-common/tests/events/message_event.rs @@ -2,6 +2,7 @@ use assign::assign; use js_int::{uint, UInt}; use matches::assert_matches; use ruma_common::{ + event_id, events::{ call::{answer::CallAnswerEventContent, SessionDescription, SessionDescriptionType}, room::{ImageInfo, ThumbnailInfo}, @@ -9,9 +10,8 @@ use ruma_common::{ AnyMessageLikeEvent, AnyMessageLikeEventContent, AnySyncMessageLikeEvent, MessageLikeEvent, RawExt, Unsigned, }, - MilliSecondsSinceUnixEpoch, + mxc_uri, room_id, user_id, MilliSecondsSinceUnixEpoch, }; -use ruma_identifiers::{event_id, mxc_uri, room_id, user_id}; use ruma_serde::Raw; use serde_json::{from_value as from_json_value, json, to_value as to_json_value}; diff --git a/crates/ruma-common/tests/events/pdu.rs b/crates/ruma-common/tests/events/pdu.rs index 8b5e5eac..7e2e9849 100644 --- a/crates/ruma-common/tests/events/pdu.rs +++ b/crates/ruma-common/tests/events/pdu.rs @@ -3,13 +3,13 @@ use std::{collections::BTreeMap, convert::TryInto}; use ruma_common::{ + event_id, events::{ pdu::{EventHash, Pdu, RoomV1Pdu, RoomV3Pdu}, EventType, }, - MilliSecondsSinceUnixEpoch, + room_id, server_name, server_signing_key_id, user_id, MilliSecondsSinceUnixEpoch, }; -use ruma_identifiers::{event_id, room_id, server_name, server_signing_key_id, user_id}; use serde_json::{ from_value as from_json_value, json, to_value as to_json_value, value::to_raw_value as to_raw_json_value, diff --git a/crates/ruma-common/tests/events/redacted.rs b/crates/ruma-common/tests/events/redacted.rs index 7b68bf1b..6fd8df22 100644 --- a/crates/ruma-common/tests/events/redacted.rs +++ b/crates/ruma-common/tests/events/redacted.rs @@ -1,6 +1,7 @@ use js_int::uint; use matches::assert_matches; use ruma_common::{ + event_id, events::{ room::{ aliases::RedactedRoomAliasesEventContent, @@ -13,9 +14,8 @@ use ruma_common::{ RedactContent, RedactedMessageLikeEvent, RedactedSyncMessageLikeEvent, RedactedSyncStateEvent, RedactedUnsigned, Unsigned, }, - MilliSecondsSinceUnixEpoch, + room_id, user_id, MilliSecondsSinceUnixEpoch, RoomVersionId, }; -use ruma_identifiers::{event_id, room_id, user_id, RoomVersionId}; use serde_json::{ from_value as from_json_value, json, to_value as to_json_value, value::to_raw_value as to_raw_json_value, diff --git a/crates/ruma-common/tests/events/redaction.rs b/crates/ruma-common/tests/events/redaction.rs index 2e61fe26..19614645 100644 --- a/crates/ruma-common/tests/events/redaction.rs +++ b/crates/ruma-common/tests/events/redaction.rs @@ -1,13 +1,13 @@ use js_int::uint; use matches::assert_matches; use ruma_common::{ + event_id, events::{ room::redaction::{RoomRedactionEvent, RoomRedactionEventContent}, AnyMessageLikeEvent, Unsigned, }, - MilliSecondsSinceUnixEpoch, + room_id, user_id, MilliSecondsSinceUnixEpoch, }; -use ruma_identifiers::{event_id, room_id, user_id}; use serde_json::{ from_value as from_json_value, json, to_value as to_json_value, Value as JsonValue, }; diff --git a/crates/ruma-common/tests/events/room_message.rs b/crates/ruma-common/tests/events/room_message.rs index 230cfabe..822d7824 100644 --- a/crates/ruma-common/tests/events/room_message.rs +++ b/crates/ruma-common/tests/events/room_message.rs @@ -4,6 +4,7 @@ use assign::assign; use js_int::uint; use matches::assert_matches; use ruma_common::{ + event_id, events::{ key::verification::VerificationMethod, room::message::{ @@ -12,9 +13,8 @@ use ruma_common::{ }, Unsigned, }, - MilliSecondsSinceUnixEpoch, + mxc_uri, room_id, user_id, DeviceId, MilliSecondsSinceUnixEpoch, }; -use ruma_identifiers::{event_id, mxc_uri, room_id, user_id, DeviceId}; use serde_json::{from_value as from_json_value, json, to_value as to_json_value}; macro_rules! json_object { diff --git a/crates/ruma-common/tests/events/state_event.rs b/crates/ruma-common/tests/events/state_event.rs index b67c0e68..2055ce55 100644 --- a/crates/ruma-common/tests/events/state_event.rs +++ b/crates/ruma-common/tests/events/state_event.rs @@ -1,6 +1,7 @@ use js_int::{uint, UInt}; use matches::assert_matches; use ruma_common::{ + event_id, events::{ room::{ aliases::RoomAliasesEventContent, @@ -10,9 +11,8 @@ use ruma_common::{ AnyRoomEvent, AnyStateEvent, AnyStateEventContent, AnySyncStateEvent, RawExt, StateEvent, SyncStateEvent, Unsigned, }, - MilliSecondsSinceUnixEpoch, + mxc_uri, room_alias_id, room_id, user_id, MilliSecondsSinceUnixEpoch, }; -use ruma_identifiers::{event_id, mxc_uri, room_alias_id, room_id, user_id}; use ruma_serde::Raw; use serde_json::{ from_value as from_json_value, json, to_value as to_json_value, Value as JsonValue, diff --git a/crates/ruma-common/tests/events/stripped.rs b/crates/ruma-common/tests/events/stripped.rs index 17a1067e..0fd7cca7 100644 --- a/crates/ruma-common/tests/events/stripped.rs +++ b/crates/ruma-common/tests/events/stripped.rs @@ -1,11 +1,13 @@ use std::convert::TryFrom; use js_int::uint; -use ruma_common::events::{ - room::{join_rules::JoinRule, topic::RoomTopicEventContent}, - AnyStrippedStateEvent, StrippedStateEvent, +use ruma_common::{ + events::{ + room::{join_rules::JoinRule, topic::RoomTopicEventContent}, + AnyStrippedStateEvent, StrippedStateEvent, + }, + mxc_uri, user_id, RoomName, }; -use ruma_identifiers::{mxc_uri, user_id, RoomName}; use serde_json::{from_value as from_json_value, json, to_value as to_json_value}; #[test] diff --git a/crates/ruma-common/tests/events/to_device.rs b/crates/ruma-common/tests/events/to_device.rs index c2b2d9bd..341fcdfb 100644 --- a/crates/ruma-common/tests/events/to_device.rs +++ b/crates/ruma-common/tests/events/to_device.rs @@ -1,5 +1,7 @@ -use ruma_common::events::{room_key::ToDeviceRoomKeyEventContent, ToDeviceEvent}; -use ruma_identifiers::{room_id, user_id, EventEncryptionAlgorithm}; +use ruma_common::{ + events::{room_key::ToDeviceRoomKeyEventContent, ToDeviceEvent}, + room_id, user_id, EventEncryptionAlgorithm, +}; use serde_json::{json, to_value as to_json_value}; #[test] diff --git a/crates/ruma-common/tests/events/ui/04-event-sanity-check.rs b/crates/ruma-common/tests/events/ui/04-event-sanity-check.rs index 4872602c..5f29d690 100644 --- a/crates/ruma-common/tests/events/ui/04-event-sanity-check.rs +++ b/crates/ruma-common/tests/events/ui/04-event-sanity-check.rs @@ -3,10 +3,11 @@ #[allow(unused_extern_crates)] extern crate serde; -use ruma_common::MilliSecondsSinceUnixEpoch; -use ruma_common::events::{StateEventContent, Unsigned}; +use ruma_common::{ + events::{StateEventContent, Unsigned}, + EventId, MilliSecondsSinceUnixEpoch, RoomId, UserId, +}; use ruma_macros::Event; -use ruma_identifiers::{EventId, RoomId, UserId}; /// State event. #[derive(Clone, Debug, Event)] diff --git a/crates/ruma-common/tests/identifiers/id_macros.rs b/crates/ruma-common/tests/identifiers/id_macros.rs new file mode 100644 index 00000000..a75378a7 --- /dev/null +++ b/crates/ruma-common/tests/identifiers/id_macros.rs @@ -0,0 +1,6 @@ +#[test] +fn ui() { + let t = trybuild::TestCases::new(); + t.pass("tests/identifiers/ui/01-valid-id-macros.rs"); + t.compile_fail("tests/identifiers/ui/02-invalid-id-macros.rs"); +} diff --git a/crates/ruma-common/tests/identifiers/mod.rs b/crates/ruma-common/tests/identifiers/mod.rs new file mode 100644 index 00000000..6dcd3e59 --- /dev/null +++ b/crates/ruma-common/tests/identifiers/mod.rs @@ -0,0 +1 @@ +mod id_macros; diff --git a/crates/ruma-common/tests/identifiers/ui/01-valid-id-macros.rs b/crates/ruma-common/tests/identifiers/ui/01-valid-id-macros.rs new file mode 100644 index 00000000..d6edf7ac --- /dev/null +++ b/crates/ruma-common/tests/identifiers/ui/01-valid-id-macros.rs @@ -0,0 +1,13 @@ +fn main() { + let _ = ruma_common::device_key_id!("ed25519:JLAFKJWSCS"); + let _ = ruma_common::event_id!("$39hvsi03hlne:example.com"); + let _ = ruma_common::event_id!("$acR1l0raoZnm60CBwAVgqbZqoO/mYU81xysh1u7XcJk"); + let _ = ruma_common::mxc_uri!("mxc://myserver.fish/sdfdsfsdfsdfgsdfsd"); + let _ = ruma_common::room_alias_id!("#alias:server.tld"); + let _ = ruma_common::room_id!("!1234567890:matrix.org"); + let _ = ruma_common::room_version_id!("1"); + let _ = ruma_common::room_version_id!("1-custom"); + let _ = ruma_common::server_signing_key_id!("ed25519:Abc_1"); + let _ = ruma_common::server_name!("myserver.fish"); + let _ = ruma_common::user_id!("@user:ruma.io"); +} diff --git a/crates/ruma-common/tests/identifiers/ui/02-invalid-id-macros.rs b/crates/ruma-common/tests/identifiers/ui/02-invalid-id-macros.rs new file mode 100644 index 00000000..4aa5b486 --- /dev/null +++ b/crates/ruma-common/tests/identifiers/ui/02-invalid-id-macros.rs @@ -0,0 +1,10 @@ +fn main() { + let _ = ruma_common::event_id!("39hvsi03hlne:example.com"); + let _ = ruma_common::event_id!("acR1l0raoZnm60CBwAVgqbZqoO/mYU81xysh1u7XcJk"); + let _ = ruma_common::mxc_uri!(""); + let _ = ruma_common::room_alias_id!("alias:server.tld"); + let _ = ruma_common::room_id!("1234567890:matrix.org"); + let _ = ruma_common::room_version_id!(""); + let _ = ruma_common::server_name!(""); + let _ = ruma_common::user_id!("user:ruma.io"); +} diff --git a/crates/ruma-common/tests/identifiers/ui/02-invalid-id-macros.stderr b/crates/ruma-common/tests/identifiers/ui/02-invalid-id-macros.stderr new file mode 100644 index 00000000..1bcbcae9 --- /dev/null +++ b/crates/ruma-common/tests/identifiers/ui/02-invalid-id-macros.stderr @@ -0,0 +1,71 @@ +error: proc macro panicked + --> $DIR/02-invalid-id-macros.rs:2:13 + | +2 | let _ = ruma_common::event_id!("39hvsi03hlne:example.com"); + | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + | + = help: message: Invalid event id + = note: this error originates in the macro `ruma_common::event_id` (in Nightly builds, run with -Z macro-backtrace for more info) + +error: proc macro panicked + --> $DIR/02-invalid-id-macros.rs:3:13 + | +3 | let _ = ruma_common::event_id!("acR1l0raoZnm60CBwAVgqbZqoO/mYU81xysh1u7XcJk"); + | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + | + = help: message: Invalid event id + = note: this error originates in the macro `ruma_common::event_id` (in Nightly builds, run with -Z macro-backtrace for more info) + +error: proc macro panicked + --> $DIR/02-invalid-id-macros.rs:4:13 + | +4 | let _ = ruma_common::mxc_uri!(""); + | ^^^^^^^^^^^^^^^^^^^^^^^^^ + | + = help: message: Invalid mxc:// + = note: this error originates in the macro `ruma_common::mxc_uri` (in Nightly builds, run with -Z macro-backtrace for more info) + +error: proc macro panicked + --> $DIR/02-invalid-id-macros.rs:5:13 + | +5 | let _ = ruma_common::room_alias_id!("alias:server.tld"); + | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + | + = help: message: Invalid room_alias_id + = note: this error originates in the macro `ruma_common::room_alias_id` (in Nightly builds, run with -Z macro-backtrace for more info) + +error: proc macro panicked + --> $DIR/02-invalid-id-macros.rs:6:13 + | +6 | let _ = ruma_common::room_id!("1234567890:matrix.org"); + | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + | + = help: message: Invalid room_id + = note: this error originates in the macro `ruma_common::room_id` (in Nightly builds, run with -Z macro-backtrace for more info) + +error: proc macro panicked + --> $DIR/02-invalid-id-macros.rs:7:13 + | +7 | let _ = ruma_common::room_version_id!(""); + | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + | + = help: message: Invalid room_version_id + = note: this error originates in the macro `ruma_common::room_version_id` (in Nightly builds, run with -Z macro-backtrace for more info) + +error: proc macro panicked + --> $DIR/02-invalid-id-macros.rs:8:13 + | +8 | let _ = ruma_common::server_name!(""); + | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + | + = help: message: Invalid server_name + = note: this error originates in the macro `ruma_common::server_name` (in Nightly builds, run with -Z macro-backtrace for more info) + +error: proc macro panicked + --> $DIR/02-invalid-id-macros.rs:9:13 + | +9 | let _ = ruma_common::user_id!("user:ruma.io"); + | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + | + = help: message: Invalid user_id + = note: this error originates in the macro `ruma_common::user_id` (in Nightly builds, run with -Z macro-backtrace for more info) diff --git a/crates/ruma-common/tests/tests.rs b/crates/ruma-common/tests/tests.rs index d29ebbf0..f34993e2 100644 --- a/crates/ruma-common/tests/tests.rs +++ b/crates/ruma-common/tests/tests.rs @@ -1,2 +1,3 @@ mod api; mod events; +mod identifiers; diff --git a/crates/ruma-federation-api/Cargo.toml b/crates/ruma-federation-api/Cargo.toml index d6aa7b3f..ed02eb25 100644 --- a/crates/ruma-federation-api/Cargo.toml +++ b/crates/ruma-federation-api/Cargo.toml @@ -25,7 +25,6 @@ server = [] [dependencies] js_int = { version = "0.2.0", features = ["serde"] } 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" diff --git a/crates/ruma-federation-api/src/authorization/get_event_authorization.rs b/crates/ruma-federation-api/src/authorization/get_event_authorization.rs index 04a2200b..ccd0a733 100644 --- a/crates/ruma-federation-api/src/authorization/get_event_authorization.rs +++ b/crates/ruma-federation-api/src/authorization/get_event_authorization.rs @@ -7,8 +7,7 @@ pub mod v1 { //! //! [spec]: https://spec.matrix.org/v1.2/server-server-api/#get_matrixfederationv1event_authroomideventid - use ruma_common::api::ruma_api; - use ruma_identifiers::{EventId, RoomId}; + use ruma_common::{api::ruma_api, EventId, RoomId}; use serde_json::value::RawValue as RawJsonValue; ruma_api! { diff --git a/crates/ruma-federation-api/src/backfill/get_backfill.rs b/crates/ruma-federation-api/src/backfill/get_backfill.rs index 85e69ac5..2bb5197e 100644 --- a/crates/ruma-federation-api/src/backfill/get_backfill.rs +++ b/crates/ruma-federation-api/src/backfill/get_backfill.rs @@ -8,8 +8,7 @@ pub mod v1 { //! [spec]: https://spec.matrix.org/v1.2/server-server-api/#get_matrixfederationv1backfillroomid use js_int::UInt; - use ruma_common::{api::ruma_api, MilliSecondsSinceUnixEpoch}; - use ruma_identifiers::{EventId, RoomId, ServerName}; + use ruma_common::{api::ruma_api, EventId, MilliSecondsSinceUnixEpoch, RoomId, ServerName}; use serde_json::value::RawValue as RawJsonValue; ruma_api! { diff --git a/crates/ruma-federation-api/src/device/get_devices.rs b/crates/ruma-federation-api/src/device/get_devices.rs index 558c76d2..bacedafb 100644 --- a/crates/ruma-federation-api/src/device/get_devices.rs +++ b/crates/ruma-federation-api/src/device/get_devices.rs @@ -11,8 +11,8 @@ pub mod v1 { use ruma_common::{ api::ruma_api, encryption::{CrossSigningKey, DeviceKeys}, + DeviceId, UserId, }; - use ruma_identifiers::{DeviceId, UserId}; use ruma_serde::Raw; use serde::{Deserialize, Serialize}; diff --git a/crates/ruma-federation-api/src/discovery.rs b/crates/ruma-federation-api/src/discovery.rs index 87127632..6919d518 100644 --- a/crates/ruma-federation-api/src/discovery.rs +++ b/crates/ruma-federation-api/src/discovery.rs @@ -2,8 +2,7 @@ use std::collections::BTreeMap; -use ruma_common::MilliSecondsSinceUnixEpoch; -use ruma_identifiers::{ServerName, ServerSigningKeyId}; +use ruma_common::{MilliSecondsSinceUnixEpoch, ServerName, ServerSigningKeyId}; use ruma_serde::Base64; use serde::{Deserialize, Serialize}; diff --git a/crates/ruma-federation-api/src/discovery/discover_homeserver.rs b/crates/ruma-federation-api/src/discovery/discover_homeserver.rs index 877af61f..849c6387 100644 --- a/crates/ruma-federation-api/src/discovery/discover_homeserver.rs +++ b/crates/ruma-federation-api/src/discovery/discover_homeserver.rs @@ -2,8 +2,7 @@ //! //! [spec]: https://spec.matrix.org/v1.2/server-server-api/#getwell-knownmatrixserver -use ruma_common::api::ruma_api; -use ruma_identifiers::ServerName; +use ruma_common::{api::ruma_api, ServerName}; ruma_api! { metadata: { diff --git a/crates/ruma-federation-api/src/discovery/get_remote_server_keys.rs b/crates/ruma-federation-api/src/discovery/get_remote_server_keys.rs index 40181fed..ae92535a 100644 --- a/crates/ruma-federation-api/src/discovery/get_remote_server_keys.rs +++ b/crates/ruma-federation-api/src/discovery/get_remote_server_keys.rs @@ -8,8 +8,7 @@ pub mod v2 { //! //! [spec]: https://spec.matrix.org/v1.2/server-server-api/#get_matrixkeyv2queryservernamekeyid - use ruma_common::{api::ruma_api, MilliSecondsSinceUnixEpoch}; - use ruma_identifiers::ServerName; + use ruma_common::{api::ruma_api, MilliSecondsSinceUnixEpoch, ServerName}; use ruma_serde::Raw; use crate::discovery::ServerSigningKeys; diff --git a/crates/ruma-federation-api/src/discovery/get_remote_server_keys_batch.rs b/crates/ruma-federation-api/src/discovery/get_remote_server_keys_batch.rs index 29539fdd..29850413 100644 --- a/crates/ruma-federation-api/src/discovery/get_remote_server_keys_batch.rs +++ b/crates/ruma-federation-api/src/discovery/get_remote_server_keys_batch.rs @@ -10,8 +10,7 @@ pub mod v2 { use std::collections::BTreeMap; - use ruma_common::{api::ruma_api, MilliSecondsSinceUnixEpoch}; - use ruma_identifiers::{ServerName, ServerSigningKeyId}; + use ruma_common::{api::ruma_api, MilliSecondsSinceUnixEpoch, ServerName, ServerSigningKeyId}; use ruma_serde::Raw; use serde::{Deserialize, Serialize}; diff --git a/crates/ruma-federation-api/src/event/get_event.rs b/crates/ruma-federation-api/src/event/get_event.rs index f84f67b1..d15fd8ad 100644 --- a/crates/ruma-federation-api/src/event/get_event.rs +++ b/crates/ruma-federation-api/src/event/get_event.rs @@ -7,8 +7,7 @@ pub mod v1 { //! //! [spec]: https://spec.matrix.org/v1.2/server-server-api/#get_matrixfederationv1eventeventid - use ruma_common::{api::ruma_api, MilliSecondsSinceUnixEpoch}; - use ruma_identifiers::{EventId, ServerName}; + use ruma_common::{api::ruma_api, EventId, MilliSecondsSinceUnixEpoch, ServerName}; use serde_json::value::RawValue as RawJsonValue; ruma_api! { diff --git a/crates/ruma-federation-api/src/event/get_missing_events.rs b/crates/ruma-federation-api/src/event/get_missing_events.rs index 7fed92a8..8f92285d 100644 --- a/crates/ruma-federation-api/src/event/get_missing_events.rs +++ b/crates/ruma-federation-api/src/event/get_missing_events.rs @@ -8,8 +8,7 @@ pub mod v1 { //! [spec]: https://spec.matrix.org/v1.2/server-server-api/#post_matrixfederationv1get_missing_eventsroomid use js_int::{uint, UInt}; - use ruma_common::api::ruma_api; - use ruma_identifiers::{EventId, RoomId}; + use ruma_common::{api::ruma_api, EventId, RoomId}; use serde_json::value::RawValue as RawJsonValue; ruma_api! { diff --git a/crates/ruma-federation-api/src/event/get_room_state.rs b/crates/ruma-federation-api/src/event/get_room_state.rs index d7101597..90cf661c 100644 --- a/crates/ruma-federation-api/src/event/get_room_state.rs +++ b/crates/ruma-federation-api/src/event/get_room_state.rs @@ -7,8 +7,7 @@ pub mod v1 { //! //! [spec]: https://spec.matrix.org/v1.2/server-server-api/#get_matrixfederationv1stateroomid - use ruma_common::api::ruma_api; - use ruma_identifiers::{EventId, RoomId}; + use ruma_common::{api::ruma_api, EventId, RoomId}; use serde_json::value::RawValue as RawJsonValue; ruma_api! { diff --git a/crates/ruma-federation-api/src/event/get_room_state_ids.rs b/crates/ruma-federation-api/src/event/get_room_state_ids.rs index d3b3076c..0fb70d73 100644 --- a/crates/ruma-federation-api/src/event/get_room_state_ids.rs +++ b/crates/ruma-federation-api/src/event/get_room_state_ids.rs @@ -7,8 +7,7 @@ pub mod v1 { //! //! [spec]: https://spec.matrix.org/v1.2/server-server-api/#get_matrixfederationv1state_idsroomid - use ruma_common::api::ruma_api; - use ruma_identifiers::{EventId, RoomId}; + use ruma_common::{api::ruma_api, EventId, RoomId}; ruma_api! { metadata: { diff --git a/crates/ruma-federation-api/src/keys/claim_keys.rs b/crates/ruma-federation-api/src/keys/claim_keys.rs index 6cca6f32..1a883291 100644 --- a/crates/ruma-federation-api/src/keys/claim_keys.rs +++ b/crates/ruma-federation-api/src/keys/claim_keys.rs @@ -9,8 +9,9 @@ pub mod v1 { use std::collections::BTreeMap; - use ruma_common::{api::ruma_api, encryption::OneTimeKey}; - use ruma_identifiers::{DeviceId, DeviceKeyAlgorithm, DeviceKeyId, UserId}; + use ruma_common::{ + api::ruma_api, encryption::OneTimeKey, DeviceId, DeviceKeyAlgorithm, DeviceKeyId, UserId, + }; use ruma_serde::{Base64, Raw}; use serde::{Deserialize, Serialize}; diff --git a/crates/ruma-federation-api/src/keys/get_keys.rs b/crates/ruma-federation-api/src/keys/get_keys.rs index 03c5984e..4195b47d 100644 --- a/crates/ruma-federation-api/src/keys/get_keys.rs +++ b/crates/ruma-federation-api/src/keys/get_keys.rs @@ -12,8 +12,8 @@ pub mod v1 { use ruma_common::{ api::ruma_api, encryption::{CrossSigningKey, DeviceKeys}, + DeviceId, UserId, }; - use ruma_identifiers::{DeviceId, UserId}; use ruma_serde::Raw; ruma_api! { diff --git a/crates/ruma-federation-api/src/knock/create_knock_event_template.rs b/crates/ruma-federation-api/src/knock/create_knock_event_template.rs index 38efef60..f7d9e06f 100644 --- a/crates/ruma-federation-api/src/knock/create_knock_event_template.rs +++ b/crates/ruma-federation-api/src/knock/create_knock_event_template.rs @@ -7,8 +7,7 @@ pub mod v1 { //! //! [spec]: https://spec.matrix.org/v1.2/server-server-api/#get_matrixfederationv1make_knockroomiduserid - use ruma_common::api::ruma_api; - use ruma_identifiers::{RoomId, RoomVersionId, UserId}; + use ruma_common::{api::ruma_api, RoomId, RoomVersionId, UserId}; use serde_json::value::RawValue as RawJsonValue; ruma_api! { diff --git a/crates/ruma-federation-api/src/knock/send_knock.rs b/crates/ruma-federation-api/src/knock/send_knock.rs index 2561e3f5..1edbcf2e 100644 --- a/crates/ruma-federation-api/src/knock/send_knock.rs +++ b/crates/ruma-federation-api/src/knock/send_knock.rs @@ -7,8 +7,7 @@ pub mod v1 { //! //! [spec]: https://spec.matrix.org/v1.2/server-server-api/#put_matrixfederationv1send_knockroomideventid - use ruma_common::{api::ruma_api, events::AnyStrippedStateEvent}; - use ruma_identifiers::{EventId, RoomId}; + use ruma_common::{api::ruma_api, events::AnyStrippedStateEvent, EventId, RoomId}; use ruma_serde::Raw; use serde_json::value::RawValue as RawJsonValue; diff --git a/crates/ruma-federation-api/src/membership/create_invite/v1.rs b/crates/ruma-federation-api/src/membership/create_invite/v1.rs index b13e48be..0ed159b7 100644 --- a/crates/ruma-federation-api/src/membership/create_invite/v1.rs +++ b/crates/ruma-federation-api/src/membership/create_invite/v1.rs @@ -5,9 +5,8 @@ use ruma_common::{ api::ruma_api, events::{room::member::RoomMemberEventContent, AnyStrippedStateEvent, EventType}, - MilliSecondsSinceUnixEpoch, + EventId, MilliSecondsSinceUnixEpoch, RoomId, ServerName, UserId, }; -use ruma_identifiers::{EventId, RoomId, ServerName, UserId}; use ruma_serde::Raw; use serde::{Deserialize, Serialize}; use serde_json::value::RawValue as RawJsonValue; diff --git a/crates/ruma-federation-api/src/membership/create_invite/v2.rs b/crates/ruma-federation-api/src/membership/create_invite/v2.rs index 85e8efe1..dbfd1ab5 100644 --- a/crates/ruma-federation-api/src/membership/create_invite/v2.rs +++ b/crates/ruma-federation-api/src/membership/create_invite/v2.rs @@ -2,8 +2,7 @@ //! //! [spec]: https://spec.matrix.org/v1.2/server-server-api/#put_matrixfederationv2inviteroomideventid -use ruma_common::{api::ruma_api, events::AnyStrippedStateEvent}; -use ruma_identifiers::{EventId, RoomId, RoomVersionId}; +use ruma_common::{api::ruma_api, events::AnyStrippedStateEvent, EventId, RoomId, RoomVersionId}; use ruma_serde::Raw; use serde_json::value::RawValue as RawJsonValue; diff --git a/crates/ruma-federation-api/src/membership/create_join_event/v1.rs b/crates/ruma-federation-api/src/membership/create_join_event/v1.rs index b3315b1c..d1f07007 100644 --- a/crates/ruma-federation-api/src/membership/create_join_event/v1.rs +++ b/crates/ruma-federation-api/src/membership/create_join_event/v1.rs @@ -2,8 +2,7 @@ //! //! [spec]: https://spec.matrix.org/v1.2/server-server-api/#put_matrixfederationv1send_joinroomideventid -use ruma_common::api::ruma_api; -use ruma_identifiers::{EventId, RoomId}; +use ruma_common::{api::ruma_api, EventId, RoomId}; use serde_json::value::RawValue as RawJsonValue; use super::RoomState; diff --git a/crates/ruma-federation-api/src/membership/create_join_event/v2.rs b/crates/ruma-federation-api/src/membership/create_join_event/v2.rs index 45999bd5..6ea3ca3c 100644 --- a/crates/ruma-federation-api/src/membership/create_join_event/v2.rs +++ b/crates/ruma-federation-api/src/membership/create_join_event/v2.rs @@ -2,8 +2,7 @@ //! //! [spec]: https://spec.matrix.org/v1.2/server-server-api/#put_matrixfederationv2send_joinroomideventid -use ruma_common::api::ruma_api; -use ruma_identifiers::{EventId, RoomId}; +use ruma_common::{api::ruma_api, EventId, RoomId}; use serde_json::value::RawValue as RawJsonValue; use super::RoomState; diff --git a/crates/ruma-federation-api/src/membership/create_leave_event/v1.rs b/crates/ruma-federation-api/src/membership/create_leave_event/v1.rs index ab9b0e85..980e5751 100644 --- a/crates/ruma-federation-api/src/membership/create_leave_event/v1.rs +++ b/crates/ruma-federation-api/src/membership/create_leave_event/v1.rs @@ -6,9 +6,8 @@ use js_int::UInt; use ruma_common::{ api::ruma_api, events::{room::member::RoomMemberEventContent, EventType}, - MilliSecondsSinceUnixEpoch, + EventId, MilliSecondsSinceUnixEpoch, RoomId, ServerName, UserId, }; -use ruma_identifiers::{EventId, RoomId, ServerName, UserId}; use ruma_serde::Raw; use serde::{Deserialize, Serialize}; diff --git a/crates/ruma-federation-api/src/membership/create_leave_event/v2.rs b/crates/ruma-federation-api/src/membership/create_leave_event/v2.rs index 46c2d7db..52268138 100644 --- a/crates/ruma-federation-api/src/membership/create_leave_event/v2.rs +++ b/crates/ruma-federation-api/src/membership/create_leave_event/v2.rs @@ -2,8 +2,7 @@ //! //! [spec]: https://spec.matrix.org/v1.2/server-server-api/#put_matrixfederationv2send_leaveroomideventid -use ruma_common::api::ruma_api; -use ruma_identifiers::{EventId, RoomId}; +use ruma_common::{api::ruma_api, EventId, RoomId}; use serde_json::value::RawValue as RawJsonValue; ruma_api! { diff --git a/crates/ruma-federation-api/src/membership/prepare_join_event.rs b/crates/ruma-federation-api/src/membership/prepare_join_event.rs index fa029b71..580f6dba 100644 --- a/crates/ruma-federation-api/src/membership/prepare_join_event.rs +++ b/crates/ruma-federation-api/src/membership/prepare_join_event.rs @@ -7,8 +7,7 @@ pub mod v1 { //! //! [spec]: https://spec.matrix.org/v1.2/server-server-api/#get_matrixfederationv1make_joinroomiduserid - use ruma_common::api::ruma_api; - use ruma_identifiers::{RoomId, RoomVersionId, UserId}; + use ruma_common::{api::ruma_api, RoomId, RoomVersionId, UserId}; use serde_json::value::RawValue as RawJsonValue; ruma_api! { diff --git a/crates/ruma-federation-api/src/membership/prepare_leave_event.rs b/crates/ruma-federation-api/src/membership/prepare_leave_event.rs index 9c349d36..b3b3d893 100644 --- a/crates/ruma-federation-api/src/membership/prepare_leave_event.rs +++ b/crates/ruma-federation-api/src/membership/prepare_leave_event.rs @@ -8,8 +8,7 @@ pub mod v1 { //! //! [spec]: https://spec.matrix.org/v1.2/server-server-api/#get_matrixfederationv1make_leaveroomiduserid - use ruma_common::api::ruma_api; - use ruma_identifiers::{RoomId, RoomVersionId, UserId}; + use ruma_common::{api::ruma_api, RoomId, RoomVersionId, UserId}; use serde_json::value::RawValue as RawJsonValue; ruma_api! { diff --git a/crates/ruma-federation-api/src/openid/get_openid_userinfo.rs b/crates/ruma-federation-api/src/openid/get_openid_userinfo.rs index 315f228e..ce31de9a 100644 --- a/crates/ruma-federation-api/src/openid/get_openid_userinfo.rs +++ b/crates/ruma-federation-api/src/openid/get_openid_userinfo.rs @@ -7,8 +7,7 @@ pub mod v1 { //! //! [spec]: https://spec.matrix.org/v1.2/server-server-api/#get_matrixfederationv1openiduserinfo - use ruma_common::api::ruma_api; - use ruma_identifiers::UserId; + use ruma_common::{api::ruma_api, UserId}; ruma_api! { metadata: { diff --git a/crates/ruma-federation-api/src/query/get_profile_information.rs b/crates/ruma-federation-api/src/query/get_profile_information.rs index 271e792a..22595093 100644 --- a/crates/ruma-federation-api/src/query/get_profile_information.rs +++ b/crates/ruma-federation-api/src/query/get_profile_information.rs @@ -7,8 +7,7 @@ pub mod v1 { //! //! [spec]: https://spec.matrix.org/v1.2/server-server-api/#get_matrixfederationv1queryprofile - use ruma_common::api::ruma_api; - use ruma_identifiers::{MxcUri, UserId}; + use ruma_common::{api::ruma_api, MxcUri, UserId}; use ruma_serde::StringEnum; use crate::PrivOwnedStr; diff --git a/crates/ruma-federation-api/src/query/get_room_information.rs b/crates/ruma-federation-api/src/query/get_room_information.rs index a4689241..ad5a7aa1 100644 --- a/crates/ruma-federation-api/src/query/get_room_information.rs +++ b/crates/ruma-federation-api/src/query/get_room_information.rs @@ -7,8 +7,7 @@ pub mod v1 { //! //! [spec]: https://spec.matrix.org/v1.2/server-server-api/#get_matrixfederationv1querydirectory - use ruma_common::api::ruma_api; - use ruma_identifiers::{RoomAliasId, RoomId, ServerName}; + use ruma_common::{api::ruma_api, RoomAliasId, RoomId, ServerName}; ruma_api! { metadata: { diff --git a/crates/ruma-federation-api/src/serde/pdu_process_response.rs b/crates/ruma-federation-api/src/serde/pdu_process_response.rs index bd635f14..28a1509e 100644 --- a/crates/ruma-federation-api/src/serde/pdu_process_response.rs +++ b/crates/ruma-federation-api/src/serde/pdu_process_response.rs @@ -1,6 +1,6 @@ use std::{collections::BTreeMap, fmt}; -use ruma_identifiers::EventId; +use ruma_common::EventId; use serde::{ de::{Deserializer, MapAccess, Visitor}, ser::{SerializeMap, Serializer}, @@ -73,7 +73,7 @@ where mod tests { use std::collections::BTreeMap; - use ruma_identifiers::{event_id, EventId}; + use ruma_common::{event_id, EventId}; use serde_json::{json, value::Serializer as JsonSerializer}; use super::{deserialize, serialize}; diff --git a/crates/ruma-federation-api/src/space.rs b/crates/ruma-federation-api/src/space.rs index eeb44587..f1e30771 100644 --- a/crates/ruma-federation-api/src/space.rs +++ b/crates/ruma-federation-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}; diff --git a/crates/ruma-federation-api/src/space/get_hierarchy.rs b/crates/ruma-federation-api/src/space/get_hierarchy.rs index 4c028243..0812beec 100644 --- a/crates/ruma-federation-api/src/space/get_hierarchy.rs +++ b/crates/ruma-federation-api/src/space/get_hierarchy.rs @@ -7,8 +7,7 @@ pub mod v1 { //! //! [spec]: https://spec.matrix.org/v1.2/server-server-api/#get_matrixfederationv1hierarchyroomid - use ruma_common::api::ruma_api; - use ruma_identifiers::RoomId; + use ruma_common::{api::ruma_api, RoomId}; use crate::space::{SpaceHierarchyChildSummary, SpaceHierarchyParentSummary}; diff --git a/crates/ruma-federation-api/src/thirdparty/bind_callback.rs b/crates/ruma-federation-api/src/thirdparty/bind_callback.rs index fd967d9b..f914142b 100644 --- a/crates/ruma-federation-api/src/thirdparty/bind_callback.rs +++ b/crates/ruma-federation-api/src/thirdparty/bind_callback.rs @@ -11,8 +11,9 @@ pub mod v1 { use std::collections::BTreeMap; - use ruma_common::{api::ruma_api, thirdparty::Medium}; - use ruma_identifiers::{RoomId, ServerName, ServerSigningKeyId, UserId}; + use ruma_common::{ + api::ruma_api, thirdparty::Medium, RoomId, ServerName, ServerSigningKeyId, UserId, + }; use serde::{Deserialize, Serialize}; ruma_api! { diff --git a/crates/ruma-federation-api/src/thirdparty/exchange_invite.rs b/crates/ruma-federation-api/src/thirdparty/exchange_invite.rs index 428ed92f..db9740cf 100644 --- a/crates/ruma-federation-api/src/thirdparty/exchange_invite.rs +++ b/crates/ruma-federation-api/src/thirdparty/exchange_invite.rs @@ -14,8 +14,8 @@ pub mod v1 { use ruma_common::{ api::ruma_api, events::{room::member::ThirdPartyInvite, EventType}, + RoomId, UserId, }; - use ruma_identifiers::{RoomId, UserId}; ruma_api! { metadata: { diff --git a/crates/ruma-federation-api/src/transactions/edu.rs b/crates/ruma-federation-api/src/transactions/edu.rs index 5809fdf3..37ecbff9 100644 --- a/crates/ruma-federation-api/src/transactions/edu.rs +++ b/crates/ruma-federation-api/src/transactions/edu.rs @@ -8,8 +8,8 @@ use ruma_common::{ events::{receipt::Receipt, AnyToDeviceEventContent, EventType}, presence::PresenceState, to_device::DeviceIdOrAllDevices, + DeviceId, EventId, RoomId, TransactionId, UserId, }; -use ruma_identifiers::{DeviceId, EventId, RoomId, TransactionId, UserId}; use ruma_serde::{from_raw_json_value, Raw}; use serde::{de, Deserialize, Serialize}; use serde_json::{value::RawValue as RawJsonValue, Value as JsonValue}; @@ -316,7 +316,7 @@ impl SigningKeyUpdateContent { mod test { use js_int::uint; use matches::assert_matches; - use ruma_identifiers::{room_id, user_id}; + use ruma_common::{room_id, user_id}; use serde_json::json; use super::*; diff --git a/crates/ruma-federation-api/src/transactions/send_transaction_message.rs b/crates/ruma-federation-api/src/transactions/send_transaction_message.rs index 5321dc61..e65d61ab 100644 --- a/crates/ruma-federation-api/src/transactions/send_transaction_message.rs +++ b/crates/ruma-federation-api/src/transactions/send_transaction_message.rs @@ -9,8 +9,9 @@ pub mod v1 { use std::collections::BTreeMap; - use ruma_common::{api::ruma_api, MilliSecondsSinceUnixEpoch}; - use ruma_identifiers::{EventId, ServerName, TransactionId}; + use ruma_common::{ + api::ruma_api, EventId, MilliSecondsSinceUnixEpoch, ServerName, TransactionId, + }; use ruma_serde::Raw; use serde_json::value::RawValue as RawJsonValue; diff --git a/crates/ruma-identifiers-validation/Cargo.toml b/crates/ruma-identifiers-validation/Cargo.toml index d12d6148..07d5a241 100644 --- a/crates/ruma-identifiers-validation/Cargo.toml +++ b/crates/ruma-identifiers-validation/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ruma-identifiers-validation" -description = "Validation logic for ruma-identifiers and ruma-macros" +description = "Validation logic for ruma-common and ruma-macros" homepage = "https://www.ruma.io/" repository = "https://github.com/ruma/ruma" license = "MIT" diff --git a/crates/ruma-identifiers/CHANGELOG.md b/crates/ruma-identifiers/CHANGELOG.md deleted file mode 100644 index 1268ffe0..00000000 --- a/crates/ruma-identifiers/CHANGELOG.md +++ /dev/null @@ -1,289 +0,0 @@ -# [unreleased] - -# 0.22.0 - -Breaking changes: - -* Rename `matrix_to_(event_)url` methods to `matrix_to_(event_)uri` - -Improvements: - -* Add `MatrixUri` to build `matrix:` URIs -* Add `ClientSecret::new()` with the `rand` feature to generate a random client secret - -# 0.21.0 - -Breaking changes: - -* Make almost all identifier types dynamically-sized types that wrap `str` - * This makes types like `&RoomId` and `&UserId` lighter - * If you want to own an identifier, use `Box`, `Arc` or similar - * The exception to this are the enums like `RoomVersionId` and `EventEncryptionAlgorithm` - (these *might* be converted into the same kind of type at some point in the future) - * The corresponding macros (and also `server_name!`) now return `'static` references instead of - owned values now – use `.to_owned()` to get an owned copy -* Rename `RoomVersionId::Version{X}` variants to `RoomVersionId::V{X}` -* Rename `RoomIdOrAliasId` to `RoomOrAliasId` - -Improvements: - -* Add `host`, `port` and `is_ip_literal` methods to `ServerName` -* Add `MatrixToUri` to build `matrix.to` URIs - -Bug fixes: - -* Properly validate localpart when building a `UserId` via `parse_with_server_name` (and its - variants). This function was accepting localparts which were violating the - `localpart_is_fully_conforming` validation. If an invalid user was built, it would panic when - calling `is_historical`. - -# 0.20.0 - -Breaking changes: - -* Upgrade ruma-serde to 0.5.0 - -Improvements: - -* Add `RoomName`, `RoomNameBox` types - -# 0.19.4 - -Improvements: - -* Fix `ruma-serde-macros` dependency (don't require an exact version) - -# 0.19.3 - -Improvements: - -* Add `serde::{Deserialize, Serialize}` implementations for `Signatures` when the `serde` feature - is active -* Add conversions of borrowed `ServerName`, `DeviceId` and `KeyName` to `Arc<_>` and `Rc<_>` - -# 0.19.2 - -Improvements: - -* Add `get` method to `Signatures` type - -# 0.19.1 - -Improvements: - -* Bump dependency versions - -# 0.19.0 - -Breaking changes: - -* Make `MxcUri` accept any string - * `TryFrom` trait methods were changed to `From` trait - * Use `MxcUri::is_valid` to make sure it is spec-compliant - * `MxcUri::{media_id, server_name}` return `Some({value})` only if the URI is spec-compliant - -Improvements - -* Add a `compat` feature - * Under this feature, more user IDs are accepted that exist in the while but are not - spec-compliant - -# 0.18.1 - -Improvements: - -* Add `MxcUri` type for `mxc://` URIs - -# 0.18.0 - -Breaking changes: - -* Remove deprecated constructors -* Remove deprecated `is_` methods -* Rename `ServerKeyAlgorithm` to `SigningKeyAlgorithm` -* Rename `ServerKeyId` to `ServerSigningKeyId` -* Rename `Error::MissingSigil` to `Error::MissingLeadingSigil` -* Merge all missing delimiter error variants -* Update the set of conversion trait implementations for crypto algorithms - -Improvements: - -* Add `DeviceKeyId::from_parts` and `SigningKeyId::from_parts` -* Add `DeviceId` and `ServerNameBox` type aliases -* Clean up debug logs for identifiers -* Allow crypto algorithm enums to contain any string, for forwards compatibility - and to allow experimentation with non-specified ones - -# 0.17.4 - -Bug fixes: - -* Fix key algorithm serde (de)serialization -* Fix `key_algorithms::{DeviceKeyAlgorithm, ServerKeyAlgorithm}` not implementing `Deserialize` and - `Serialize` with `default-features = false` + `features = ["serde", …]` - -# 0.17.3 - -Bug fixes: - -* Fix `key_algorithms::{DeviceKeyAlgorithm, ServerKeyAlgorithm}` not implementing `Deserialize` and - `Serialize` with the default feature set - * This bug was introduced in 0.17.2 - * This problem still persists with `default-features = false` + `features = ["serde", …]`, but - there was never a reason to use ruma-identifiers like that - -# 0.17.2 (yanked) - -Bug fixes: - -* Fix `RoomVersionId::is_version_6` actually checking for version 5 -* Fix `TryFrom` implementations for `RoomVersionId`, which previously returned - `RoomVersionId::Custom` for the input `6` - -Improvements: - -* Add macros to construct identifiers with compile-time validation - -# 0.17.1 - -Improvements: - -* Add `.as_bytes()` to all identifier types that already had `.as_str()` - -# 0.17.0 - -Breaking changes: - -* Change `RoomVersionId` from being an opaque struct to a non-exhaustive enum - * The constructor functions and `is_` predicates are now deprecated - * Remove `RoomVersionId::custom`. It could be used to create invalid room versions (empty or - exceeding 32 code points in length). Use the `TryFrom<&str>` or `TryFrom` implementation - instead. -* Remove diesel integration. If you were using it, please comment on the corresponding issue: - [#22](https://github.com/ruma/ruma-identifiers/issues/22) -* Remove `TryFrom>` implementations for identifier types -* Update `parse_with_server_name`s signature (instead of `Into` it now requires - `Into>` of the id type). This is technically a breaking change, but extremely unlikely - to affect any existing code. -* Modify identifier types to use the new `ServerName` type: - * Change signature of `new()` methods of `EventId`, `RoomId`, and `UserId` from - ```rust - fn new(&str) -> Result - //... - ``` - to - ```rust - fn new(&ServerName) -> Self - ``` - - * Change signature of `server_name()` for `EventId`, `RoomAliasId`, `RoomId`, `RoomIdOrAliasId`, `UserId` from - ```rust - fn server_name() -> &str - ``` - to - ```rust - fn server_name() -> &ServerName - ``` -* Change `DeviceId` from being an alias for `String` to being a newtype around `str` - - This means owned device IDs are now `Box`. - -Deprecations: - -* Mark `server_name::is_valid_server_name` as deprecated in favor of `<&ServerName>::try_from()` - -Improvements: - -* Add `DeviceKeyId`, `DeviceKeyAlgorithm`, `ServerKeyId`, and `ServerKeyAlgorithm` -* Add a `ServerName` type - * This is a dynamically-sized type, if you need to store it use `Box` - -# 0.16.2 - -Improvements: - -* Update the internal representation of identifiers to be more compact -* Add `RoomVersionId::version_6` and `RoomVersionId::is_version_6` -* Add `PartialOrd` and `Ord` implementations for `RoomVersionId` - -# 0.16.1 - -Bug fixes: - -* Change `PartialEq` implementations to compare IDs with string literals from `str` to `&str` - * This is technically a breaking change, but the previous implementations were extremely - unlikely to actually be used - -# 0.16.0 - -Breaking changes: - -* Update `RoomId::parse_with_server_name`s bounds from `Into>` to - `AsRef + Into`. While this is a breaking change, it is not expected to actually - require code changes. - -Improvements: - -* Add conversion functions for `RoomIdOrAliasId` - * `impl From for RoomIdOrAliasId` - * `impl From for RoomIdOrAliasId` - * `impl TryFrom for RoomId` - * `impl TryFrom for RoomAliasId` - * `RoomIdOrAliasId::into_either` (if the optional dependency `either` is activated with the - identically named feature) - -# 0.15.1 - -Bug fixes: - -* Fix docs.rs build - -# 0.15.0 - -Breaking changes: - -* All identifiers now allocate at maximum one string (localpart and host are no longer stored - separately) - * Because of this, these traits are now implemented for them and only allocate in the obvious - case: - * `impl From<…Id> for String` - * `impl AsRef for …Id` - * `impl TryFrom> for …Id` - * `impl TryFrom for …Id` - * `PartialEq` for `String`s and string slices - * Additionally, the `Hash` implementations will now yield the same hashes as hashing the string - representation - * Note that hashes are generally only guaranteed consistent in the lifetime of the program - though, so do not persist them! - * The `hostname` methods have been rename to `server_name` and updated to return string slices - instead of `&url::Host` -* `Error::InvalidHost` has been renamed to `Error::InvalidServerName`, because it also covers errors - in the port, not just the host part section of the server name -* The random identifier generation functions (`Id::new`) are now only available if the `rand` - feature of this crate is enabled - -Improvements: - -* Add support for historical uppercase MXIDs -* Made all dependencies optional - * `serde` is the only one that is enabled by default -* The `user_id` module is now public and contains `fn localpart_is_fully_conforming` - * This function can be used to determine whether a user name (the localpart of a user ID) is valid - without actually constructing a full user ID first -* Add `UserId::parse_with_server_name` - -# 0.14.1 - -Breaking changes: - -* Our Minimum Supported Rust Version is now 1.36.0 - * This is done in a patch version because it is only a documentation change. Practically, a new - project using even ruma-identifiers 0.14 won't build out of the box on older versions of Rust - because of an MSRV bump in a minor release of an indirect dependency. Using ruma-identifiers - with older versions of Rust will potentially continue to work with some crates pinned to older - versions, but won't be tested in CI. - -Improvements: - -* Remove the dependency on `lazy_static` and `regex` -* We now support [historical user IDs](https://spec.matrix.org/v1.2/appendices/#historical-user-ids) diff --git a/crates/ruma-identifiers/Cargo.toml b/crates/ruma-identifiers/Cargo.toml deleted file mode 100644 index cf3762d8..00000000 --- a/crates/ruma-identifiers/Cargo.toml +++ /dev/null @@ -1,38 +0,0 @@ -[package] -categories = ["api-bindings"] -description = "Resource identifiers for Matrix." -homepage = "https://www.ruma.io/" -keywords = ["matrix", "chat", "messaging", "ruma"] -license = "MIT" -name = "ruma-identifiers" -readme = "README.md" -repository = "https://github.com/ruma/ruma" -version = "0.22.0" -edition = "2018" - -[package.metadata.docs.rs] -all-features = true -rustdoc-args = ["--cfg", "docsrs"] - -[features] -default = ["serde"] -compat = ["ruma-identifiers-validation/compat"] -rand = ["rand_crate", "uuid"] -serde = ["ruma-serde", "serde1"] - -[dependencies] -either = { version = "1.6.1", optional = true } -percent-encoding = "2.1.0" -rand_crate = { package = "rand", version = "0.8.3", optional = true } -ruma-identifiers-validation = { version = "0.7.0", path = "../ruma-identifiers-validation", default-features = false } -ruma-macros = { version = "=0.1.0", path = "../ruma-macros" } -ruma-serde = { version = "0.6.0", path = "../ruma-serde", optional = true } -# Renamed so we can have a serde feature. -serde1 = { package = "serde", version = "1.0.126", optional = true, features = ["derive"] } -url = "2.2.2" -uuid = { version = "0.8.2", optional = true, features = ["v4"] } - -[dev-dependencies] -matches = "0.1.8" -serde_json = "1.0.64" -trybuild = "1.0.42" diff --git a/crates/ruma-identifiers/README.md b/crates/ruma-identifiers/README.md deleted file mode 100644 index d9f6066f..00000000 --- a/crates/ruma-identifiers/README.md +++ /dev/null @@ -1,7 +0,0 @@ -# ruma-identifiers - -[![crates.io page](https://img.shields.io/crates/v/ruma-identifiers.svg)](https://crates.io/crates/ruma-identifiers) -[![docs.rs page](https://docs.rs/ruma-identifiers/badge.svg)](https://docs.rs/ruma-identifiers/) -![license: MIT](https://img.shields.io/crates/l/ruma-identifiers.svg) - -**ruma-identifiers** contains types for [Matrix](https://matrix.org/) identifiers for events, rooms, room aliases, and users. diff --git a/crates/ruma-identifiers/tests/id-macros.rs b/crates/ruma-identifiers/tests/id-macros.rs deleted file mode 100644 index a7da5793..00000000 --- a/crates/ruma-identifiers/tests/id-macros.rs +++ /dev/null @@ -1,6 +0,0 @@ -#[test] -fn ui() { - let t = trybuild::TestCases::new(); - t.pass("tests/ui/01-valid-id-macros.rs"); - t.compile_fail("tests/ui/02-invalid-id-macros.rs"); -} diff --git a/crates/ruma-identifiers/tests/ui/01-valid-id-macros.rs b/crates/ruma-identifiers/tests/ui/01-valid-id-macros.rs deleted file mode 100644 index 14897cb7..00000000 --- a/crates/ruma-identifiers/tests/ui/01-valid-id-macros.rs +++ /dev/null @@ -1,13 +0,0 @@ -fn main() { - let _ = ruma_identifiers::device_key_id!("ed25519:JLAFKJWSCS"); - let _ = ruma_identifiers::event_id!("$39hvsi03hlne:example.com"); - let _ = ruma_identifiers::event_id!("$acR1l0raoZnm60CBwAVgqbZqoO/mYU81xysh1u7XcJk"); - let _ = ruma_identifiers::mxc_uri!("mxc://myserver.fish/sdfdsfsdfsdfgsdfsd"); - let _ = ruma_identifiers::room_alias_id!("#alias:server.tld"); - let _ = ruma_identifiers::room_id!("!1234567890:matrix.org"); - let _ = ruma_identifiers::room_version_id!("1"); - let _ = ruma_identifiers::room_version_id!("1-custom"); - let _ = ruma_identifiers::server_signing_key_id!("ed25519:Abc_1"); - let _ = ruma_identifiers::server_name!("myserver.fish"); - let _ = ruma_identifiers::user_id!("@user:ruma.io"); -} diff --git a/crates/ruma-identifiers/tests/ui/02-invalid-id-macros.rs b/crates/ruma-identifiers/tests/ui/02-invalid-id-macros.rs deleted file mode 100644 index 0bfedee8..00000000 --- a/crates/ruma-identifiers/tests/ui/02-invalid-id-macros.rs +++ /dev/null @@ -1,10 +0,0 @@ -fn main() { - let _ = ruma_identifiers::event_id!("39hvsi03hlne:example.com"); - let _ = ruma_identifiers::event_id!("acR1l0raoZnm60CBwAVgqbZqoO/mYU81xysh1u7XcJk"); - let _ = ruma_identifiers::mxc_uri!(""); - let _ = ruma_identifiers::room_alias_id!("alias:server.tld"); - let _ = ruma_identifiers::room_id!("1234567890:matrix.org"); - let _ = ruma_identifiers::room_version_id!(""); - let _ = ruma_identifiers::server_name!(""); - let _ = ruma_identifiers::user_id!("user:ruma.io"); -} diff --git a/crates/ruma-identifiers/tests/ui/02-invalid-id-macros.stderr b/crates/ruma-identifiers/tests/ui/02-invalid-id-macros.stderr deleted file mode 100644 index 5e3f91b2..00000000 --- a/crates/ruma-identifiers/tests/ui/02-invalid-id-macros.stderr +++ /dev/null @@ -1,71 +0,0 @@ -error: proc macro panicked - --> $DIR/02-invalid-id-macros.rs:2:13 - | -2 | let _ = ruma_identifiers::event_id!("39hvsi03hlne:example.com"); - | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - | - = help: message: Invalid event id - = note: this error originates in the macro `ruma_identifiers::event_id` (in Nightly builds, run with -Z macro-backtrace for more info) - -error: proc macro panicked - --> $DIR/02-invalid-id-macros.rs:3:13 - | -3 | let _ = ruma_identifiers::event_id!("acR1l0raoZnm60CBwAVgqbZqoO/mYU81xysh1u7XcJk"); - | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - | - = help: message: Invalid event id - = note: this error originates in the macro `ruma_identifiers::event_id` (in Nightly builds, run with -Z macro-backtrace for more info) - -error: proc macro panicked - --> $DIR/02-invalid-id-macros.rs:4:13 - | -4 | let _ = ruma_identifiers::mxc_uri!(""); - | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - | - = help: message: Invalid mxc:// - = note: this error originates in the macro `ruma_identifiers::mxc_uri` (in Nightly builds, run with -Z macro-backtrace for more info) - -error: proc macro panicked - --> $DIR/02-invalid-id-macros.rs:5:13 - | -5 | let _ = ruma_identifiers::room_alias_id!("alias:server.tld"); - | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - | - = help: message: Invalid room_alias_id - = note: this error originates in the macro `ruma_identifiers::room_alias_id` (in Nightly builds, run with -Z macro-backtrace for more info) - -error: proc macro panicked - --> $DIR/02-invalid-id-macros.rs:6:13 - | -6 | let _ = ruma_identifiers::room_id!("1234567890:matrix.org"); - | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - | - = help: message: Invalid room_id - = note: this error originates in the macro `ruma_identifiers::room_id` (in Nightly builds, run with -Z macro-backtrace for more info) - -error: proc macro panicked - --> $DIR/02-invalid-id-macros.rs:7:13 - | -7 | let _ = ruma_identifiers::room_version_id!(""); - | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - | - = help: message: Invalid room_version_id - = note: this error originates in the macro `ruma_identifiers::room_version_id` (in Nightly builds, run with -Z macro-backtrace for more info) - -error: proc macro panicked - --> $DIR/02-invalid-id-macros.rs:8:13 - | -8 | let _ = ruma_identifiers::server_name!(""); - | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - | - = help: message: Invalid server_name - = note: this error originates in the macro `ruma_identifiers::server_name` (in Nightly builds, run with -Z macro-backtrace for more info) - -error: proc macro panicked - --> $DIR/02-invalid-id-macros.rs:9:13 - | -9 | let _ = ruma_identifiers::user_id!("user:ruma.io"); - | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - | - = help: message: Invalid user_id - = note: this error originates in the macro `ruma_identifiers::user_id` (in Nightly builds, run with -Z macro-backtrace for more info) diff --git a/crates/ruma-identity-service-api/Cargo.toml b/crates/ruma-identity-service-api/Cargo.toml index 781adee3..b0685a42 100644 --- a/crates/ruma-identity-service-api/Cargo.toml +++ b/crates/ruma-identity-service-api/Cargo.toml @@ -20,7 +20,6 @@ server = [] [dependencies] js_int = { version = "0.2.0", features = ["serde"] } ruma-common = { version = "0.8.0", path = "../ruma-common", features = ["api"] } -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"] } diff --git a/crates/ruma-identity-service-api/src/association/bind_3pid.rs b/crates/ruma-identity-service-api/src/association/bind_3pid.rs index c3417c96..7ade7aa4 100644 --- a/crates/ruma-identity-service-api/src/association/bind_3pid.rs +++ b/crates/ruma-identity-service-api/src/association/bind_3pid.rs @@ -7,8 +7,10 @@ pub mod v2 { //! //! [spec]: https://spec.matrix.org/v1.2/identity-service-api/#post_matrixidentityv23pidbind - use ruma_common::{api::ruma_api, thirdparty::Medium, MilliSecondsSinceUnixEpoch}; - use ruma_identifiers::{ClientSecret, ServerSignatures, SessionId, UserId}; + use ruma_common::{ + api::ruma_api, thirdparty::Medium, ClientSecret, MilliSecondsSinceUnixEpoch, + ServerSignatures, SessionId, UserId, + }; ruma_api! { metadata: { diff --git a/crates/ruma-identity-service-api/src/association/check_3pid_validity.rs b/crates/ruma-identity-service-api/src/association/check_3pid_validity.rs index 9595e560..eeb4d93b 100644 --- a/crates/ruma-identity-service-api/src/association/check_3pid_validity.rs +++ b/crates/ruma-identity-service-api/src/association/check_3pid_validity.rs @@ -8,8 +8,7 @@ pub mod v2 { //! [spec]: https://spec.matrix.org/v1.2/identity-service-api/#get_matrixidentityv23pidgetvalidated3pid use js_int::UInt; - use ruma_common::{api::ruma_api, thirdparty::Medium}; - use ruma_identifiers::{ClientSecret, SessionId}; + use ruma_common::{api::ruma_api, thirdparty::Medium, ClientSecret, SessionId}; ruma_api! { metadata: { diff --git a/crates/ruma-identity-service-api/src/association/email/create_email_validation_session.rs b/crates/ruma-identity-service-api/src/association/email/create_email_validation_session.rs index a8d3d4d7..d51188fa 100644 --- a/crates/ruma-identity-service-api/src/association/email/create_email_validation_session.rs +++ b/crates/ruma-identity-service-api/src/association/email/create_email_validation_session.rs @@ -8,8 +8,7 @@ pub mod v2 { //! [spec]: https://spec.matrix.org/v1.2/identity-service-api/#post_matrixidentityv2validateemailrequesttoken use js_int::UInt; - use ruma_common::api::ruma_api; - use ruma_identifiers::{ClientSecret, SessionId}; + use ruma_common::{api::ruma_api, ClientSecret, SessionId}; ruma_api! { metadata: { diff --git a/crates/ruma-identity-service-api/src/association/email/validate_email.rs b/crates/ruma-identity-service-api/src/association/email/validate_email.rs index 644615b4..507d2fa2 100644 --- a/crates/ruma-identity-service-api/src/association/email/validate_email.rs +++ b/crates/ruma-identity-service-api/src/association/email/validate_email.rs @@ -7,8 +7,7 @@ pub mod v2 { //! //! [spec]: https://spec.matrix.org/v1.2/identity-service-api/#post_matrixidentityv2validateemailsubmittoken - use ruma_common::api::ruma_api; - use ruma_identifiers::{ClientSecret, SessionId}; + use ruma_common::{api::ruma_api, ClientSecret, SessionId}; ruma_api! { metadata: { diff --git a/crates/ruma-identity-service-api/src/association/email/validate_email_by_end_user.rs b/crates/ruma-identity-service-api/src/association/email/validate_email_by_end_user.rs index 123b698c..e1b444c4 100644 --- a/crates/ruma-identity-service-api/src/association/email/validate_email_by_end_user.rs +++ b/crates/ruma-identity-service-api/src/association/email/validate_email_by_end_user.rs @@ -7,8 +7,7 @@ pub mod v2 { //! //! [spec]: https://spec.matrix.org/v1.2/identity-service-api/#get_matrixidentityv2validateemailsubmittoken - use ruma_common::api::ruma_api; - use ruma_identifiers::{ClientSecret, SessionId}; + use ruma_common::{api::ruma_api, ClientSecret, SessionId}; ruma_api! { metadata: { diff --git a/crates/ruma-identity-service-api/src/association/msisdn/create_msisdn_validation_session.rs b/crates/ruma-identity-service-api/src/association/msisdn/create_msisdn_validation_session.rs index df2a6615..030f8cbc 100644 --- a/crates/ruma-identity-service-api/src/association/msisdn/create_msisdn_validation_session.rs +++ b/crates/ruma-identity-service-api/src/association/msisdn/create_msisdn_validation_session.rs @@ -8,8 +8,7 @@ pub mod v2 { //! [spec]: https://spec.matrix.org/v1.2/identity-service-api/#post_matrixidentityv2validatemsisdnrequesttoken use js_int::UInt; - use ruma_common::api::ruma_api; - use ruma_identifiers::{ClientSecret, SessionId}; + use ruma_common::{api::ruma_api, ClientSecret, SessionId}; ruma_api! { metadata: { diff --git a/crates/ruma-identity-service-api/src/association/msisdn/validate_msisdn.rs b/crates/ruma-identity-service-api/src/association/msisdn/validate_msisdn.rs index 61893971..4da2ee43 100644 --- a/crates/ruma-identity-service-api/src/association/msisdn/validate_msisdn.rs +++ b/crates/ruma-identity-service-api/src/association/msisdn/validate_msisdn.rs @@ -7,8 +7,7 @@ pub mod v2 { //! //! [spec]: https://spec.matrix.org/v1.2/identity-service-api/#post_matrixidentityv2validatemsisdnsubmittoken - use ruma_common::api::ruma_api; - use ruma_identifiers::{ClientSecret, SessionId}; + use ruma_common::{api::ruma_api, ClientSecret, SessionId}; ruma_api! { metadata: { diff --git a/crates/ruma-identity-service-api/src/association/msisdn/validate_msisdn_by_phone_number.rs b/crates/ruma-identity-service-api/src/association/msisdn/validate_msisdn_by_phone_number.rs index 3c7ea2ce..0b8f9bd5 100644 --- a/crates/ruma-identity-service-api/src/association/msisdn/validate_msisdn_by_phone_number.rs +++ b/crates/ruma-identity-service-api/src/association/msisdn/validate_msisdn_by_phone_number.rs @@ -7,8 +7,7 @@ pub mod v2 { //! //! [spec]: https://spec.matrix.org/v1.2/identity-service-api/#get_matrixidentityv2validatemsisdnsubmittoken - use ruma_common::api::ruma_api; - use ruma_identifiers::{ClientSecret, SessionId}; + use ruma_common::{api::ruma_api, ClientSecret, SessionId}; ruma_api! { metadata: { diff --git a/crates/ruma-identity-service-api/src/association/unbind_3pid.rs b/crates/ruma-identity-service-api/src/association/unbind_3pid.rs index c209b56d..19e43575 100644 --- a/crates/ruma-identity-service-api/src/association/unbind_3pid.rs +++ b/crates/ruma-identity-service-api/src/association/unbind_3pid.rs @@ -7,8 +7,9 @@ pub mod v2 { //! //! [spec]: https://spec.matrix.org/v1.2/identity-service-api/#post_matrixidentityv23pidunbind - use ruma_common::{api::ruma_api, thirdparty::Medium}; - use ruma_identifiers::{user_id::UserId, ClientSecret, SessionId}; + use ruma_common::{ + api::ruma_api, thirdparty::Medium, user_id::UserId, ClientSecret, SessionId, + }; use serde::{Deserialize, Serialize}; ruma_api! { diff --git a/crates/ruma-identity-service-api/src/authentication/get_account_information.rs b/crates/ruma-identity-service-api/src/authentication/get_account_information.rs index d9343b62..feacb603 100644 --- a/crates/ruma-identity-service-api/src/authentication/get_account_information.rs +++ b/crates/ruma-identity-service-api/src/authentication/get_account_information.rs @@ -7,8 +7,7 @@ pub mod v2 { //! //! [spec]: https://spec.matrix.org/v1.2/identity-service-api/#get_matrixidentityv2account - use ruma_common::api::ruma_api; - use ruma_identifiers::UserId; + use ruma_common::{api::ruma_api, UserId}; ruma_api! { metadata: { diff --git a/crates/ruma-identity-service-api/src/authentication/register.rs b/crates/ruma-identity-service-api/src/authentication/register.rs index 443a7c45..f9786473 100644 --- a/crates/ruma-identity-service-api/src/authentication/register.rs +++ b/crates/ruma-identity-service-api/src/authentication/register.rs @@ -9,8 +9,7 @@ pub mod v2 { use std::time::Duration; - use ruma_common::{api::ruma_api, authentication::TokenType}; - use ruma_identifiers::ServerName; + use ruma_common::{api::ruma_api, authentication::TokenType, ServerName}; ruma_api! { metadata: { diff --git a/crates/ruma-identity-service-api/src/invitation/sign_invitation_ed25519.rs b/crates/ruma-identity-service-api/src/invitation/sign_invitation_ed25519.rs index b1300527..e29a25b2 100644 --- a/crates/ruma-identity-service-api/src/invitation/sign_invitation_ed25519.rs +++ b/crates/ruma-identity-service-api/src/invitation/sign_invitation_ed25519.rs @@ -7,8 +7,7 @@ pub mod v2 { //! //! [spec]: https://spec.matrix.org/v1.2/identity-service-api/#post_matrixidentityv2sign-ed25519 - use ruma_common::api::ruma_api; - use ruma_identifiers::{ServerSignatures, UserId}; + use ruma_common::{api::ruma_api, ServerSignatures, UserId}; use ruma_serde::Base64; ruma_api! { diff --git a/crates/ruma-identity-service-api/src/invitation/store_invitation.rs b/crates/ruma-identity-service-api/src/invitation/store_invitation.rs index 900e4c90..e36b8fd8 100644 --- a/crates/ruma-identity-service-api/src/invitation/store_invitation.rs +++ b/crates/ruma-identity-service-api/src/invitation/store_invitation.rs @@ -7,8 +7,10 @@ pub mod v2 { //! //! [spec]: https://spec.matrix.org/v1.2/identity-service-api/#post_matrixidentityv2store-invite - use ruma_common::{api::ruma_api, room::RoomType, thirdparty::Medium}; - use ruma_identifiers::{MxcUri, RoomAliasId, RoomId, RoomName, UserId}; + use ruma_common::{ + api::ruma_api, room::RoomType, thirdparty::Medium, MxcUri, RoomAliasId, RoomId, RoomName, + UserId, + }; use serde::{ser::SerializeSeq, Deserialize, Serialize}; ruma_api! { diff --git a/crates/ruma-identity-service-api/src/keys/get_public_key.rs b/crates/ruma-identity-service-api/src/keys/get_public_key.rs index cb0abb8b..f91c9b08 100644 --- a/crates/ruma-identity-service-api/src/keys/get_public_key.rs +++ b/crates/ruma-identity-service-api/src/keys/get_public_key.rs @@ -7,8 +7,7 @@ pub mod v2 { //! //! [spec]: https://spec.matrix.org/v1.2/identity-service-api/#get_matrixidentityv2pubkeykeyid - use ruma_common::api::ruma_api; - use ruma_identifiers::ServerSigningKeyId; + use ruma_common::{api::ruma_api, ServerSigningKeyId}; use ruma_serde::Base64; ruma_api! { diff --git a/crates/ruma-identity-service-api/src/lookup/lookup_3pid.rs b/crates/ruma-identity-service-api/src/lookup/lookup_3pid.rs index 97677dc7..c085b28c 100644 --- a/crates/ruma-identity-service-api/src/lookup/lookup_3pid.rs +++ b/crates/ruma-identity-service-api/src/lookup/lookup_3pid.rs @@ -9,8 +9,7 @@ pub mod v2 { use std::collections::BTreeMap; - use ruma_common::api::ruma_api; - use ruma_identifiers::UserId; + use ruma_common::{api::ruma_api, UserId}; use crate::lookup::IdentifierHashingAlgorithm; diff --git a/crates/ruma-macros/src/events/event.rs b/crates/ruma-macros/src/events/event.rs index 405696a2..0e28ecd2 100644 --- a/crates/ruma-macros/src/events/event.rs +++ b/crates/ruma-macros/src/events/event.rs @@ -414,8 +414,6 @@ fn expand_redact_event( fields: &[Field], ruma_common: &TokenStream, ) -> TokenStream { - let ruma_identifiers = quote! { #ruma_common::exports::ruma_identifiers }; - let redacted_type = kind.to_event_ident(var.to_redacted()); let redacted_content_trait = format_ident!("{}Content", kind.to_event_ident(EventKindVariation::Redacted)); @@ -469,7 +467,7 @@ fn expand_redact_event( fn redact( self, redaction: #ruma_common::events::room::redaction::SyncRoomRedactionEvent, - version: &#ruma_identifiers::RoomVersionId, + version: &#ruma_common::RoomVersionId, ) -> Self::Redacted { let content = #ruma_common::events::RedactContent::redact(self.content, version); #ruma_common::events::#redacted_type { @@ -488,8 +486,6 @@ fn expand_sync_from_into_full( fields: &[Field], ruma_common: &TokenStream, ) -> TokenStream { - let ruma_identifiers = quote! { #ruma_common::exports::ruma_identifiers }; - let ident = &input.ident; let full_struct = kind.to_event_ident(var.to_full()); let (impl_generics, ty_gen, where_clause) = input.generics.split_for_impl(); @@ -511,7 +507,7 @@ fn expand_sync_from_into_full( /// Convert this sync event into a full event, one with a room_id field. pub fn into_full_event( self, - room_id: ::std::boxed::Box<#ruma_identifiers::RoomId>, + room_id: ::std::boxed::Box<#ruma_common::RoomId>, ) -> #full_struct #ty_gen { let Self { #( #fields, )* } = self; #full_struct { diff --git a/crates/ruma-macros/src/events/event_content.rs b/crates/ruma-macros/src/events/event_content.rs index ff31519c..a477bf43 100644 --- a/crates/ruma-macros/src/events/event_content.rs +++ b/crates/ruma-macros/src/events/event_content.rs @@ -175,7 +175,6 @@ fn generate_redacted_event_content( ruma_common: &TokenStream, event_kind: Option, ) -> Result { - let ruma_identifiers = quote! { #ruma_common::exports::ruma_identifiers }; let serde = quote! { #ruma_common::exports::serde }; let serde_json = quote! { #ruma_common::exports::serde_json }; @@ -283,7 +282,7 @@ fn generate_redacted_event_content( impl #ruma_common::events::RedactContent for #ident { type Redacted = #redacted_ident; - fn redact(self, version: &#ruma_identifiers::RoomVersionId) -> #redacted_ident { + fn redact(self, version: &#ruma_common::RoomVersionId) -> #redacted_ident { #redacted_ident { #( #redaction_struct_fields: self.#redaction_struct_fields, )* } diff --git a/crates/ruma-macros/src/events/event_enum.rs b/crates/ruma-macros/src/events/event_enum.rs index 029f4286..d9da4d26 100644 --- a/crates/ruma-macros/src/events/event_enum.rs +++ b/crates/ruma-macros/src/events/event_enum.rs @@ -208,8 +208,6 @@ fn expand_into_full_event( variants: &[EventEnumVariant], ruma_common: &TokenStream, ) -> TokenStream { - let ruma_identifiers = quote! { #ruma_common::exports::ruma_identifiers }; - let ident = kind.to_event_enum_ident(var); let full = kind.to_event_enum_ident(var.to_full()); @@ -222,7 +220,7 @@ fn expand_into_full_event( /// Convert this sync event into a full event (one with a `room_id` field). pub fn into_full_event( self, - room_id: ::std::boxed::Box<#ruma_identifiers::RoomId>, + room_id: ::std::boxed::Box<#ruma_common::RoomId>, ) -> #full { match self { #( @@ -330,8 +328,6 @@ fn expand_redact( variants: &[EventEnumVariant], ruma_common: &TokenStream, ) -> TokenStream { - let ruma_identifiers = quote! { #ruma_common::exports::ruma_identifiers }; - let ident = kind.to_event_enum_ident(var); let redacted_enum = kind.to_event_enum_ident(var.to_redacted()); @@ -346,7 +342,7 @@ fn expand_redact( fn redact( self, redaction: #ruma_common::events::room::redaction::SyncRoomRedactionEvent, - version: &#ruma_identifiers::RoomVersionId, + version: &#ruma_common::RoomVersionId, ) -> #redacted_enum { match self { #( @@ -606,13 +602,11 @@ fn field_return_type( var: EventKindVariation, ruma_common: &TokenStream, ) -> TokenStream { - let ruma_identifiers = quote! { #ruma_common::exports::ruma_identifiers }; - match name { "origin_server_ts" => quote! { #ruma_common::MilliSecondsSinceUnixEpoch }, - "room_id" => quote! { #ruma_identifiers::RoomId }, - "event_id" => quote! { #ruma_identifiers::EventId }, - "sender" => quote! { #ruma_identifiers::UserId }, + "room_id" => quote! { #ruma_common::RoomId }, + "event_id" => quote! { #ruma_common::EventId }, + "sender" => quote! { #ruma_common::UserId }, "state_key" => quote! { ::std::primitive::str }, "unsigned" => { if var.is_redacted() { diff --git a/crates/ruma-macros/src/identifiers.rs b/crates/ruma-macros/src/identifiers.rs index ba270058..feaa0421 100644 --- a/crates/ruma-macros/src/identifiers.rs +++ b/crates/ruma-macros/src/identifiers.rs @@ -1,6 +1,4 @@ -//! Methods and types for generating [ruma-identifiers]. -//! -//! [ruma-identifiers]: https://github.com/ruma/ruma/tree/main/ruma-identifiers +//! Methods and types for generating identifiers. use syn::{parse::Parse, LitStr, Path, Token}; diff --git a/crates/ruma-push-gateway-api/Cargo.toml b/crates/ruma-push-gateway-api/Cargo.toml index 7a71d538..6cc9a9ca 100644 --- a/crates/ruma-push-gateway-api/Cargo.toml +++ b/crates/ruma-push-gateway-api/Cargo.toml @@ -20,7 +20,6 @@ server = [] [dependencies] js_int = { version = "0.2.0", features = ["serde"] } 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" diff --git a/crates/ruma-push-gateway-api/src/send_event_notification.rs b/crates/ruma-push-gateway-api/src/send_event_notification.rs index 64d07c72..ddab448a 100644 --- a/crates/ruma-push-gateway-api/src/send_event_notification.rs +++ b/crates/ruma-push-gateway-api/src/send_event_notification.rs @@ -13,9 +13,8 @@ pub mod v1 { api::ruma_api, events::EventType, push::{PusherData, Tweak}, - SecondsSinceUnixEpoch, + EventId, RoomAliasId, RoomId, RoomName, SecondsSinceUnixEpoch, UserId, }; - use ruma_identifiers::{EventId, RoomAliasId, RoomId, RoomName, UserId}; use ruma_serde::{Outgoing, StringEnum}; use serde::{Deserialize, Serialize}; use serde_json::value::RawValue as RawJsonValue; @@ -321,8 +320,9 @@ pub mod v1 { #[cfg(test)] mod tests { use js_int::uint; - use ruma_common::{events::EventType, SecondsSinceUnixEpoch}; - use ruma_identifiers::{event_id, room_alias_id, room_id, user_id}; + use ruma_common::{ + event_id, events::EventType, room_alias_id, room_id, user_id, SecondsSinceUnixEpoch, + }; use serde_json::{ from_value as from_json_value, json, to_value as to_json_value, Value as JsonValue, }; diff --git a/crates/ruma-serde/Cargo.toml b/crates/ruma-serde/Cargo.toml index 8ef65624..9006bbb3 100644 --- a/crates/ruma-serde/Cargo.toml +++ b/crates/ruma-serde/Cargo.toml @@ -19,4 +19,4 @@ serde_json = { version = "1.0.61", features = ["raw_value"] } [dev-dependencies] matches = "0.1.8" -ruma-identifiers = { path = "../ruma-identifiers" , version = "0.22.0"} +ruma-common = { path = "../ruma-common" , version = "0.8.0"} diff --git a/crates/ruma-serde/tests/empty_strings.rs b/crates/ruma-serde/tests/empty_strings.rs index e073161a..b4ff0cb0 100644 --- a/crates/ruma-serde/tests/empty_strings.rs +++ b/crates/ruma-serde/tests/empty_strings.rs @@ -49,7 +49,7 @@ mod string { } mod user { - use ruma_identifiers::{user_id, UserId}; + use ruma_common::{user_id, UserId}; use serde::{Deserialize, Serialize}; use serde_json::{from_value as from_json_value, json, to_value as to_json_value}; diff --git a/crates/ruma-signatures/Cargo.toml b/crates/ruma-signatures/Cargo.toml index 029c4c33..84b815c9 100644 --- a/crates/ruma-signatures/Cargo.toml +++ b/crates/ruma-signatures/Cargo.toml @@ -23,7 +23,7 @@ ed25519-dalek = "1.0.1" pkcs8 = { version = "0.7.0", features = ["alloc"] } # because dalek uses an older version of rand_core rand = { version = "0.7", features = ["getrandom"] } -ruma-identifiers = { version = "0.22.0", path = "../ruma-identifiers" } +ruma-common = { version = "0.8.0", path = "../ruma-common" } ruma-serde = { version = "0.6.0", path = "../ruma-serde" } serde_json = "1.0.60" sha2 = "0.9.5" diff --git a/crates/ruma-signatures/src/error.rs b/crates/ruma-signatures/src/error.rs index 3c986dcb..384535d6 100644 --- a/crates/ruma-signatures/src/error.rs +++ b/crates/ruma-signatures/src/error.rs @@ -1,4 +1,4 @@ -use ruma_identifiers::{EventId, RoomVersionId, ServerName}; +use ruma_common::{EventId, RoomVersionId, ServerName}; use ruma_serde::Base64DecodeError; use thiserror::Error; @@ -176,11 +176,11 @@ impl VerificationError { pub enum ParseError { /// For user ID parsing errors. #[error("Could not parse User ID: {0}")] - UserId(#[source] ruma_identifiers::Error), + UserId(#[source] ruma_common::Error), /// For event ID parsing errors. #[error("Could not parse Event ID: {0}")] - EventId(#[source] ruma_identifiers::Error), + EventId(#[source] ruma_common::Error), /// For when an event ID, coupled with a specific room version, doesn't have a server name /// embedded. diff --git a/crates/ruma-signatures/src/functions.rs b/crates/ruma-signatures/src/functions.rs index fde18776..91db4880 100644 --- a/crates/ruma-signatures/src/functions.rs +++ b/crates/ruma-signatures/src/functions.rs @@ -8,7 +8,7 @@ use std::{ }; use base64::{encode_config, STANDARD_NO_PAD, URL_SAFE_NO_PAD}; -use ruma_identifiers::{EventId, RoomVersionId, ServerName, UserId}; +use ruma_common::{EventId, RoomVersionId, ServerName, UserId}; use ruma_serde::{base64::Standard, Base64, CanonicalJsonObject, CanonicalJsonValue}; use serde_json::{from_str as from_json_str, to_string as to_json_string}; use sha2::{digest::Digest, Sha256}; @@ -416,7 +416,7 @@ pub fn reference_hash( /// # Examples /// /// ```rust -/// # use ruma_identifiers::RoomVersionId; +/// # use ruma_common::RoomVersionId; /// # use ruma_signatures::{hash_and_sign_event, Ed25519KeyPair}; /// # /// const PKCS8: &str = "\ @@ -541,7 +541,7 @@ where /// /// ```rust /// # use std::collections::BTreeMap; -/// # use ruma_identifiers::RoomVersionId; +/// # use ruma_common::RoomVersionId; /// # use ruma_serde::Base64; /// # use ruma_signatures::{verify_event, Verified}; /// # @@ -848,7 +848,7 @@ mod tests { convert::{TryFrom, TryInto}, }; - use ruma_identifiers::{RoomVersionId, ServerSigningKeyId, SigningKeyAlgorithm}; + use ruma_common::{RoomVersionId, ServerSigningKeyId, SigningKeyAlgorithm}; use ruma_serde::{Base64, CanonicalJsonValue}; use serde_json::json; diff --git a/crates/ruma-signatures/src/lib.rs b/crates/ruma-signatures/src/lib.rs index df04765c..a3581e1e 100644 --- a/crates/ruma-signatures/src/lib.rs +++ b/crates/ruma-signatures/src/lib.rs @@ -106,7 +106,7 @@ mod tests { use base64::{decode_config, STANDARD_NO_PAD}; use pkcs8::{der::Decodable, PrivateKeyInfo}; - use ruma_identifiers::RoomVersionId; + use ruma_common::RoomVersionId; use ruma_serde::Base64; use serde_json::{from_str as from_json_str, to_string as to_json_string}; diff --git a/crates/ruma-state-res/Cargo.toml b/crates/ruma-state-res/Cargo.toml index 028835cc..b7414c71 100644 --- a/crates/ruma-state-res/Cargo.toml +++ b/crates/ruma-state-res/Cargo.toml @@ -24,7 +24,6 @@ __ci = ["ruma-common/unstable-pre-spec"] itertools = "0.10.0" js_int = "0.2.0" ruma-common = { version = "0.8.0", path = "../ruma-common", features = ["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.60" diff --git a/crates/ruma-state-res/benches/state_res_bench.rs b/crates/ruma-state-res/benches/state_res_bench.rs index 67681472..fc79b315 100644 --- a/crates/ruma-state-res/benches/state_res_bench.rs +++ b/crates/ruma-state-res/benches/state_res_bench.rs @@ -30,9 +30,8 @@ use ruma_common::{ }, EventType, }, - MilliSecondsSinceUnixEpoch, + room_id, user_id, EventId, MilliSecondsSinceUnixEpoch, RoomId, RoomVersionId, UserId, }; -use ruma_identifiers::{room_id, user_id, EventId, RoomId, RoomVersionId, UserId}; use ruma_state_res::{self as state_res, Error, Event, Result, StateMap}; use serde_json::{ json, @@ -538,9 +537,8 @@ fn BAN_STATE_SET() -> HashMap, Arc> { mod event { use ruma_common::{ events::{pdu::Pdu, EventType}, - MilliSecondsSinceUnixEpoch, + EventId, MilliSecondsSinceUnixEpoch, RoomId, UserId, }; - use ruma_identifiers::{EventId, RoomId, UserId}; use ruma_state_res::Event; use serde::{Deserialize, Serialize}; use serde_json::value::RawValue as RawJsonValue; diff --git a/crates/ruma-state-res/src/event_auth.rs b/crates/ruma-state-res/src/event_auth.rs index 339d28e2..df3d89ab 100644 --- a/crates/ruma-state-res/src/event_auth.rs +++ b/crates/ruma-state-res/src/event_auth.rs @@ -1,17 +1,19 @@ use std::{borrow::Borrow, collections::BTreeSet, convert::TryFrom}; use js_int::{int, Int}; -use ruma_common::events::{ - room::{ - create::RoomCreateEventContent, - join_rules::{JoinRule, RoomJoinRulesEventContent}, - member::{MembershipState, ThirdPartyInvite}, - power_levels::RoomPowerLevelsEventContent, - third_party_invite::RoomThirdPartyInviteEventContent, +use ruma_common::{ + events::{ + room::{ + create::RoomCreateEventContent, + join_rules::{JoinRule, RoomJoinRulesEventContent}, + member::{MembershipState, ThirdPartyInvite}, + power_levels::RoomPowerLevelsEventContent, + third_party_invite::RoomThirdPartyInviteEventContent, + }, + EventType, }, - EventType, + RoomVersionId, UserId, }; -use ruma_identifiers::{RoomVersionId, UserId}; use ruma_serde::{Base64, Raw}; use serde::{de::IgnoredAny, Deserialize}; use serde_json::{from_str as from_json_str, value::RawValue as RawJsonValue}; diff --git a/crates/ruma-state-res/src/lib.rs b/crates/ruma-state-res/src/lib.rs index caad6a27..a2e60618 100644 --- a/crates/ruma-state-res/src/lib.rs +++ b/crates/ruma-state-res/src/lib.rs @@ -12,9 +12,8 @@ use ruma_common::{ room::member::{MembershipState, RoomMemberEventContent}, EventType, }, - MilliSecondsSinceUnixEpoch, + EventId, MilliSecondsSinceUnixEpoch, RoomVersionId, UserId, }; -use ruma_identifiers::{EventId, RoomVersionId, UserId}; use serde::Deserialize; use serde_json::from_str as from_json_str; use tracing::{debug, info, trace, warn}; @@ -648,9 +647,8 @@ mod tests { room::join_rules::{JoinRule, RoomJoinRulesEventContent}, EventType, }, - MilliSecondsSinceUnixEpoch, + EventId, MilliSecondsSinceUnixEpoch, RoomVersionId, }; - use ruma_identifiers::{EventId, RoomVersionId}; use serde_json::{json, value::to_raw_value as to_raw_json_value}; use tracing::debug; diff --git a/crates/ruma-state-res/src/room_version.rs b/crates/ruma-state-res/src/room_version.rs index b96c7310..7f450d46 100644 --- a/crates/ruma-state-res/src/room_version.rs +++ b/crates/ruma-state-res/src/room_version.rs @@ -1,4 +1,4 @@ -use ruma_identifiers::RoomVersionId; +use ruma_common::RoomVersionId; use crate::{Error, Result}; diff --git a/crates/ruma-state-res/src/state_event.rs b/crates/ruma-state-res/src/state_event.rs index d9d009f4..a5dd7bf7 100644 --- a/crates/ruma-state-res/src/state_event.rs +++ b/crates/ruma-state-res/src/state_event.rs @@ -5,8 +5,7 @@ use std::{ sync::Arc, }; -use ruma_common::{events::EventType, MilliSecondsSinceUnixEpoch}; -use ruma_identifiers::{EventId, RoomId, UserId}; +use ruma_common::{events::EventType, EventId, MilliSecondsSinceUnixEpoch, RoomId, UserId}; use serde_json::value::RawValue as RawJsonValue; /// Abstraction of a PDU so users can have their own PDU types. diff --git a/crates/ruma-state-res/src/test_utils.rs b/crates/ruma-state-res/src/test_utils.rs index 10402462..125e8344 100644 --- a/crates/ruma-state-res/src/test_utils.rs +++ b/crates/ruma-state-res/src/test_utils.rs @@ -10,6 +10,7 @@ use std::{ use js_int::{int, uint}; use ruma_common::{ + event_id, events::{ pdu::{EventHash, Pdu, RoomV3Pdu}, room::{ @@ -18,9 +19,8 @@ use ruma_common::{ }, EventType, }, - MilliSecondsSinceUnixEpoch, + room_id, user_id, EventId, MilliSecondsSinceUnixEpoch, RoomId, RoomVersionId, UserId, }; -use ruma_identifiers::{event_id, room_id, user_id, EventId, RoomId, RoomVersionId, UserId}; use serde_json::{ json, value::{to_raw_value as to_raw_json_value, RawValue as RawJsonValue}, @@ -564,9 +564,8 @@ pub fn INITIAL_EDGES() -> Vec> { pub mod event { use ruma_common::{ events::{pdu::Pdu, EventType}, - MilliSecondsSinceUnixEpoch, + EventId, MilliSecondsSinceUnixEpoch, RoomId, UserId, }; - use ruma_identifiers::{EventId, RoomId, UserId}; use serde::{Deserialize, Serialize}; use serde_json::value::RawValue as RawJsonValue; diff --git a/crates/ruma/Cargo.toml b/crates/ruma/Cargo.toml index a776141c..1dc5a0b8 100644 --- a/crates/ruma/Cargo.toml +++ b/crates/ruma/Cargo.toml @@ -54,8 +54,8 @@ push-gateway-api-s = ["api", "ruma-push-gateway-api/server"] push-gateway-api = ["push-gateway-api-c", "push-gateway-api-s"] # Convenience features -either = ["ruma-identifiers/either"] -rand = ["ruma-identifiers/rand"] +either = ["ruma-common/either"] +rand = ["ruma-common/rand"] markdown = ["ruma-common/markdown"] # Everything except compat and unstable features @@ -83,7 +83,6 @@ full = [ # missing with this feature. compat = [ "ruma-common/compat", - "ruma-identifiers/compat", "ruma-client-api/compat", "ruma-signatures/compat", "ruma-state-res/compat", @@ -140,7 +139,6 @@ assign = "1.1.1" js_int = "0.2.0" ruma-common = { version = "0.8.0", path = "../ruma-common" } -ruma-identifiers = { version = "0.22.0", path = "../ruma-identifiers", features = ["serde"] } ruma-serde = { version = "0.6.0", path = "../ruma-serde" } ruma-client = { version = "0.8.0", path = "../ruma-client", optional = true } diff --git a/crates/ruma/examples/hello_world.rs b/crates/ruma/examples/hello_world.rs index de3e6776..958b0279 100644 --- a/crates/ruma/examples/hello_world.rs +++ b/crates/ruma/examples/hello_world.rs @@ -5,7 +5,7 @@ use ruma::{ events::room::message::RoomMessageEventContent, RoomAliasId, }; -use ruma_identifiers::TransactionId; +use ruma_common::TransactionId; type HttpClient = ruma::client::http_client::HyperNativeTls; diff --git a/crates/ruma/src/lib.rs b/crates/ruma/src/lib.rs index 8c838428..d4081acc 100644 --- a/crates/ruma/src/lib.rs +++ b/crates/ruma/src/lib.rs @@ -71,7 +71,7 @@ #![cfg_attr(docsrs, feature(doc_cfg, doc_auto_cfg))] #[doc(inline)] -pub use ruma_identifiers as identifiers; +pub use ruma_common as common; #[doc(inline)] pub use ruma_serde as serde; @@ -160,15 +160,13 @@ pub use js_int::{int, uint, Int, UInt}; #[cfg(feature = "client-ext-client-api")] pub use ruma_client::Client; pub use ruma_common::{ - authentication, directory, encryption, power_levels, presence, push, receipt, room, thirdparty, - to_device, MilliSecondsSinceUnixEpoch, PrivOwnedStr, SecondsSinceUnixEpoch, -}; -pub use ruma_identifiers::{ - device_id, device_key_id, event_id, matrix_uri, mxc_uri, room_alias_id, room_id, - room_version_id, server_name, server_signing_key_id, user_id, ClientSecret, DeviceId, + authentication, device_id, device_key_id, directory, encryption, event_id, matrix_uri, mxc_uri, + power_levels, presence, push, receipt, room, room_alias_id, room_id, room_version_id, + server_name, server_signing_key_id, thirdparty, to_device, user_id, ClientSecret, DeviceId, DeviceKeyAlgorithm, DeviceKeyId, DeviceSignatures, DeviceSigningKeyId, EntitySignatures, - EventEncryptionAlgorithm, EventId, KeyId, KeyName, MatrixToUri, MxcUri, RoomAliasId, RoomId, - RoomOrAliasId, RoomVersionId, ServerName, ServerSignatures, ServerSigningKeyId, SessionId, - Signatures, SigningKeyAlgorithm, TransactionId, UserId, + EventEncryptionAlgorithm, EventId, KeyId, KeyName, MatrixToUri, MilliSecondsSinceUnixEpoch, + MxcUri, PrivOwnedStr, RoomAliasId, RoomId, RoomOrAliasId, RoomVersionId, SecondsSinceUnixEpoch, + ServerName, ServerSignatures, ServerSigningKeyId, SessionId, Signatures, SigningKeyAlgorithm, + TransactionId, UserId, }; pub use ruma_serde::Outgoing; diff --git a/crates/ruma/tests/outgoing.rs b/crates/ruma/tests/outgoing.rs index 03904501..15276dc2 100644 --- a/crates/ruma/tests/outgoing.rs +++ b/crates/ruma/tests/outgoing.rs @@ -32,13 +32,13 @@ pub struct OtherThing<'t> { pub struct FakeRequest<'a, T> { pub abc: &'a str, pub thing: Thing<'a, T>, - pub device_id: &'a ::ruma_identifiers::DeviceId, + pub device_id: &'a ::ruma_common::DeviceId, pub user_id: &'a UserId, pub bytes: &'a [u8], pub recursive: &'a [Thing<'a, T>], pub option: Option<&'a [u8]>, pub depth: Option<&'a [(&'a str, &'a str)]>, - pub arc_type: std::sync::Arc<&'a ::ruma_identifiers::ServerName>, + pub arc_type: std::sync::Arc<&'a ::ruma_common::ServerName>, pub thing_ref: &'a Thing<'a, T>, pub double_ref: &'a &'a u8, pub triple_ref: &'a &'a &'a str, @@ -50,7 +50,7 @@ pub struct FakeRequest<'a, T> { pub enum EnumThing<'a, T> { Abc(&'a str), Stuff(Thing<'a, T>), - Boxy(&'a ::ruma_identifiers::DeviceId), + Boxy(&'a ::ruma_common::DeviceId), Other(Option<&'a str>), - StructVar { stuff: &'a str, more: &'a ::ruma_identifiers::ServerName }, + StructVar { stuff: &'a str, more: &'a ::ruma_common::ServerName }, } diff --git a/examples/joke_bot/src/main.rs b/examples/joke_bot/src/main.rs index f447674f..89ea3b38 100644 --- a/examples/joke_bot/src/main.rs +++ b/examples/joke_bot/src/main.rs @@ -11,10 +11,9 @@ use ruma::{ room::message::{MessageType, RoomMessageEventContent}, AnySyncMessageLikeEvent, AnySyncRoomEvent, }, - identifiers::TransactionId, presence::PresenceState, serde::Raw, - RoomId, UserId, + RoomId, TransactionId, UserId, }; use serde_json::Value as JsonValue; use tokio::fs; diff --git a/xtask/src/ci.rs b/xtask/src/ci.rs index eee2ad68..aa224ad8 100644 --- a/xtask/src/ci.rs +++ b/xtask/src/ci.rs @@ -68,7 +68,7 @@ impl CiTask { // 1. Make sure everything compiles cmd!("rustup run stable cargo check --workspace --all-features").run()?; cmd!("rustup run stable cargo check -p ruma-client --no-default-features").run()?; - cmd!("rustup run stable cargo check -p ruma-identifiers --no-default-features").run()?; + cmd!("rustup run stable cargo check -p ruma-common --no-default-features --features client,server").run()?; // 2. Run tests let workspace_res = cmd!("rustup run stable cargo test --features __ci").run();