macros: Rename ruma-events-macros to ruma-macros

crates/ruma-events-macros/CHANGELOG.md

@@ -1,23 +0,0 @@
-Since version 0.19.0 of ruma-events, ruma-events-macros is versioned in lockstep with ruma-api.
-Since ruma-events-macros cannot be used independently anyway, it no longer maintains a separate
-change log or its own version. Instead, refer to ruma-events's change log for changes in versions
-0.19.0 and above.
-
-# 0.3.0
-
-Breaking changes:
-
-* Update `event_type` in `ruma_events!` to refer to the serialized form of the
-  event type, not the variant of `ruma_events::EventType`
-
-Improvements:
-
-* Split `FromRaw` implementation generation from `ruma_event!` into a separate
-  proc-macro
-
-# 0.2.0
-
-Improvements:
-
-* Code generation was updated to account for the changes in ruma-events 0.15
-* Dependencies were updated (notably to syn 1.0 and quote 1.0)

crates/ruma-events-macros/README.md

@@ -1,5 +0,0 @@
-# ruma-events-macros
-
-**ruma-events-macros** provides a procedural macro for easily generating event types for [ruma-events].
-
-[ruma-events]: https://github.com/ruma/ruma/tree/main/ruma-events

crates/ruma-events/Cargo.toml

@@ -15,7 +15,7 @@ all-features = true
 rustdoc-args = ["--cfg", "docsrs"]
 
 [features]
-compat = ["ruma-events-macros/compat"]
+compat = ["ruma-macros/compat"]
 markdown = ["pulldown-cmark"]
 
 unstable-exhaustive-types = []
@@ -32,8 +32,8 @@ indoc = "1.0"
 js_int = { version = "0.2.0", features = ["serde"] }
 pulldown-cmark = { version = "0.8", default-features = false, optional = true }
 ruma-common = { version = "0.8.0", path = "../ruma-common" }
-ruma-events-macros = { version = "=0.26.0", path = "../ruma-events-macros" }
 ruma-identifiers = { version = "0.22.0", path = "../ruma-identifiers", features = ["serde"] }
+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"] }

crates/ruma-events/src/call/answer.rs

@@ -3,7 +3,7 @@
 //! [`m.call.answer`]: https://spec.matrix.org/v1.2/client-server-api/#mcallanswer
 
 use js_int::UInt;
-use ruma_events_macros::EventContent;
+use ruma_macros::EventContent;
 use serde::{Deserialize, Serialize};
 
 use super::SessionDescription;

crates/ruma-events/src/call/candidates.rs

@@ -3,7 +3,7 @@
 //! [`m.call.candidates`]: https://spec.matrix.org/v1.2/client-server-api/#mcallcandidates
 
 use js_int::UInt;
-use ruma_events_macros::EventContent;
+use ruma_macros::EventContent;
 use serde::{Deserialize, Serialize};
 
 /// The content of an `m.call.candidates` event.

crates/ruma-events/src/call/hangup.rs

@@ -3,7 +3,7 @@
 //! [`m.call.hangup`]: https://spec.matrix.org/v1.2/client-server-api/#mcallhangup
 
 use js_int::UInt;
-use ruma_events_macros::EventContent;
+use ruma_macros::EventContent;
 use ruma_serde::StringEnum;
 use serde::{Deserialize, Serialize};
 

crates/ruma-events/src/call/invite.rs

@@ -3,7 +3,7 @@
 //! [`m.call.invite`]: https://spec.matrix.org/v1.2/client-server-api/#mcallinvite
 
 use js_int::UInt;
-use ruma_events_macros::EventContent;
+use ruma_macros::EventContent;
 use serde::{Deserialize, Serialize};
 
 use super::SessionDescription;

crates/ruma-events/src/direct.rs

@@ -7,8 +7,8 @@ use std::{
     ops::{Deref, DerefMut},
 };
 
-use ruma_events_macros::EventContent;
 use ruma_identifiers::{RoomId, UserId};
+use ruma_macros::EventContent;
 use serde::{Deserialize, Serialize};
 
 /// The content of an `m.direct` event.

crates/ruma-events/src/dummy.rs

@@ -4,7 +4,7 @@
 
 use std::fmt;
 
-use ruma_events_macros::EventContent;
+use ruma_macros::EventContent;
 use serde::{
     de::{self, Deserialize, Deserializer},
     ser::{Serialize, SerializeStruct as _, Serializer},

crates/ruma-events/src/enums.rs

@@ -1,6 +1,6 @@
 use ruma_common::MilliSecondsSinceUnixEpoch;
-use ruma_events_macros::{event_enum, EventEnumFromEvent};
 use ruma_identifiers::{EventId, RoomId, RoomVersionId, UserId};
+use ruma_macros::{event_enum, EventEnumFromEvent};
 use ruma_serde::from_raw_json_value;
 use serde::{de, Deserialize};
 use serde_json::value::RawValue as RawJsonValue;

crates/ruma-events/src/event_kinds.rs

@@ -1,8 +1,8 @@
 #![allow(clippy::exhaustive_structs)]
 
 use ruma_common::MilliSecondsSinceUnixEpoch;
-use ruma_events_macros::Event;
 use ruma_identifiers::{EventId, RoomId, UserId};
+use ruma_macros::Event;
 use serde::{Deserialize, Serialize};
 
 use crate::{

crates/ruma-events/src/forwarded_room_key.rs

@@ -2,8 +2,8 @@
 //!
 //! [`m.forwarded_room_key`]: https://spec.matrix.org/v1.2/client-server-api/#mforwarded_room_key
 
-use ruma_events_macros::EventContent;
 use ruma_identifiers::{EventEncryptionAlgorithm, RoomId};
+use ruma_macros::EventContent;
 use serde::{Deserialize, Serialize};
 
 /// The content of an `m.forwarded_room_key` event.

crates/ruma-events/src/fully_read.rs

@@ -2,8 +2,8 @@
 //!
 //! [`m.fully_read`]: https://spec.matrix.org/v1.2/client-server-api/#mfully_read
 
-use ruma_events_macros::EventContent;
 use ruma_identifiers::EventId;
+use ruma_macros::EventContent;
 use serde::{Deserialize, Serialize};
 
 /// The content of an `m.fully_read` event.

crates/ruma-events/src/ignored_user_list.rs

@@ -2,8 +2,8 @@
 //!
 //! [`m.ignored_user_list`]: https://spec.matrix.org/v1.2/client-server-api/#mignored_user_list
 
-use ruma_events_macros::EventContent;
 use ruma_identifiers::UserId;
+use ruma_macros::EventContent;
 use serde::{Deserialize, Serialize};
 
 /// The content of an `m.ignored_user_list` event.

crates/ruma-events/src/key/verification/accept.rs

@@ -4,8 +4,8 @@
 
 use std::collections::BTreeMap;
 
-use ruma_events_macros::EventContent;
 use ruma_identifiers::TransactionId;
+use ruma_macros::EventContent;
 use ruma_serde::Base64;
 use serde::{Deserialize, Serialize};
 use serde_json::Value as JsonValue;

crates/ruma-events/src/key/verification/cancel.rs

@@ -2,8 +2,8 @@
 //!
 //! [`m.key.verification.cancel`]: https://spec.matrix.org/v1.2/client-server-api/#mkeyverificationcancel
 
-use ruma_events_macros::EventContent;
 use ruma_identifiers::TransactionId;
+use ruma_macros::EventContent;
 use ruma_serde::StringEnum;
 use serde::{Deserialize, Serialize};
 

crates/ruma-events/src/key/verification/done.rs

@@ -2,8 +2,8 @@
 //!
 //! [`m.key.verification.done`]: https://spec.matrix.org/v1.2/client-server-api/#mkeyverificationdone
 
-use ruma_events_macros::EventContent;
 use ruma_identifiers::TransactionId;
+use ruma_macros::EventContent;
 use serde::{Deserialize, Serialize};
 
 use super::Relation;

crates/ruma-events/src/key/verification/key.rs

@@ -2,8 +2,8 @@
 //!
 //! [`m.key.verification.key`]: https://spec.matrix.org/v1.2/client-server-api/#mkeyverificationkey
 
-use ruma_events_macros::EventContent;
 use ruma_identifiers::TransactionId;
+use ruma_macros::EventContent;
 use ruma_serde::Base64;
 use serde::{Deserialize, Serialize};
 

crates/ruma-events/src/key/verification/mac.rs

@@ -4,8 +4,8 @@
 
 use std::collections::BTreeMap;
 
-use ruma_events_macros::EventContent;
 use ruma_identifiers::TransactionId;
+use ruma_macros::EventContent;
 use ruma_serde::Base64;
 use serde::{Deserialize, Serialize};
 

crates/ruma-events/src/key/verification/ready.rs

@@ -2,8 +2,8 @@
 //!
 //! [`m.key.verification.ready`]: https://spec.matrix.org/v1.2/client-server-api/#mkeyverificationready
 
-use ruma_events_macros::EventContent;
 use ruma_identifiers::{DeviceId, TransactionId};
+use ruma_macros::EventContent;
 use serde::{Deserialize, Serialize};
 
 use super::{Relation, VerificationMethod};

crates/ruma-events/src/key/verification/request.rs

@@ -3,8 +3,8 @@
 //! [`m.key.verification.request`]: https://spec.matrix.org/v1.2/client-server-api/#mkeyverificationrequest
 
 use ruma_common::MilliSecondsSinceUnixEpoch;
-use ruma_events_macros::EventContent;
 use ruma_identifiers::{DeviceId, TransactionId};
+use ruma_macros::EventContent;
 use serde::{Deserialize, Serialize};
 
 use super::VerificationMethod;

crates/ruma-events/src/key/verification/start.rs

@@ -4,8 +4,8 @@
 
 use std::collections::BTreeMap;
 
-use ruma_events_macros::EventContent;
 use ruma_identifiers::{DeviceId, TransactionId};
+use ruma_macros::EventContent;
 use ruma_serde::Base64;
 use serde::{Deserialize, Serialize};
 use serde_json::Value as JsonValue;

crates/ruma-events/src/lib.rs

@@ -166,7 +166,7 @@ pub mod exports {
 
 /// Re-export of all the derives needed to create your own event types.
 pub mod macros {
-    pub use ruma_events_macros::{Event, EventContent};
+    pub use ruma_macros::{Event, EventContent};
 }
 
 pub mod call;

crates/ruma-events/src/policy/rule/room.rs

@@ -2,7 +2,7 @@
 //!
 //! [`m.policy.rule.room`]: https://spec.matrix.org/v1.2/client-server-api/#mpolicyruleroom
 
-use ruma_events_macros::EventContent;
+use ruma_macros::EventContent;
 use serde::{Deserialize, Serialize};
 
 use crate::policy::rule::PolicyRuleEventContent;

crates/ruma-events/src/policy/rule/server.rs

@@ -2,7 +2,7 @@
 //!
 //! [`m.policy.rule.server`]: https://spec.matrix.org/v1.2/client-server-api/#mpolicyruleserver
 
-use ruma_events_macros::EventContent;
+use ruma_macros::EventContent;
 use serde::{Deserialize, Serialize};
 
 use crate::policy::rule::PolicyRuleEventContent;

crates/ruma-events/src/policy/rule/user.rs

@@ -2,7 +2,7 @@
 //!
 //! [`m.policy.rule.user`]: https://spec.matrix.org/v1.2/client-server-api/#mpolicyruleuser
 
-use ruma_events_macros::EventContent;
+use ruma_macros::EventContent;
 use serde::{Deserialize, Serialize};
 
 use crate::policy::rule::PolicyRuleEventContent;

crates/ruma-events/src/presence.rs

@@ -4,8 +4,8 @@
 
 use js_int::UInt;
 use ruma_common::presence::PresenceState;
-use ruma_events_macros::{Event, EventContent};
 use ruma_identifiers::{MxcUri, UserId};
+use ruma_macros::{Event, EventContent};
 use serde::{Deserialize, Serialize};
 
 use crate::{EventKind, StaticEventContent};

crates/ruma-events/src/push_rules.rs

@@ -3,7 +3,7 @@
 //! [`m.push_rules`]: https://spec.matrix.org/v1.2/client-server-api/#mpush_rules
 
 use ruma_common::push::Ruleset;
-use ruma_events_macros::EventContent;
+use ruma_macros::EventContent;
 use serde::{Deserialize, Serialize};
 
 /// The content of an `m.push_rules` event.

crates/ruma-events/src/reaction.rs

@@ -1,7 +1,7 @@
 //! Types for the `m.reaction` event.
 
-use ruma_events_macros::EventContent;
 use ruma_identifiers::EventId;
+use ruma_macros::EventContent;
 use serde::{Deserialize, Serialize};
 
 /// The payload for a `m.reaction` event.

crates/ruma-events/src/receipt.rs

@@ -8,8 +8,8 @@ use std::{
 };
 
 use ruma_common::{receipt::ReceiptType, MilliSecondsSinceUnixEpoch};
-use ruma_events_macros::EventContent;
 use ruma_identifiers::{EventId, UserId};
+use ruma_macros::EventContent;
 use serde::{Deserialize, Serialize};
 
 /// The content of an `m.receipt` event.

crates/ruma-events/src/room/aliases.rs

@@ -1,7 +1,7 @@
 //! Types for the `m.room.aliases` event.
 
-use ruma_events_macros::EventContent;
 use ruma_identifiers::{RoomAliasId, RoomVersionId};
+use ruma_macros::EventContent;
 use serde::{Deserialize, Serialize};
 use serde_json::value::RawValue as RawJsonValue;
 

crates/ruma-events/src/room/avatar.rs

@@ -3,8 +3,8 @@
 //! [`m.room.avatar`]: https://spec.matrix.org/v1.2/client-server-api/#mroomavatar
 
 use js_int::UInt;
-use ruma_events_macros::EventContent;
 use ruma_identifiers::MxcUri;
+use ruma_macros::EventContent;
 use serde::{Deserialize, Serialize};
 
 use super::ThumbnailInfo;

crates/ruma-events/src/room/canonical_alias.rs

@@ -2,8 +2,8 @@
 //!
 //! [`m.room.canonical_alias`]: https://spec.matrix.org/v1.2/client-server-api/#mroomcanonical_alias
 
-use ruma_events_macros::EventContent;
 use ruma_identifiers::RoomAliasId;
+use ruma_macros::EventContent;
 use serde::{Deserialize, Serialize};
 
 /// The content of an `m.room.canonical_alias` event.

crates/ruma-events/src/room/create.rs

@@ -3,8 +3,8 @@
 //! [`m.room.create`]: https://spec.matrix.org/v1.2/client-server-api/#mroomcreate
 
 use ruma_common::room::RoomType;
-use ruma_events_macros::EventContent;
 use ruma_identifiers::{EventId, RoomId, RoomVersionId, UserId};
+use ruma_macros::EventContent;
 use serde::{Deserialize, Serialize};
 
 /// The content of an `m.room.create` event.

crates/ruma-events/src/room/encrypted.rs

@@ -5,8 +5,8 @@
 use std::collections::BTreeMap;
 
 use js_int::UInt;
-use ruma_events_macros::EventContent;
 use ruma_identifiers::{DeviceId, EventId};
+use ruma_macros::EventContent;
 use serde::{Deserialize, Serialize};
 
 use crate::room::message::InReplyTo;

crates/ruma-events/src/room/encryption.rs

@@ -3,7 +3,7 @@
 //! [`m.room.encryption`]: https://spec.matrix.org/v1.2/client-server-api/#mroomencryption
 
 use js_int::UInt;
-use ruma_events_macros::EventContent;
+use ruma_macros::EventContent;
 use serde::{Deserialize, Serialize};
 
 use crate::EventEncryptionAlgorithm;

crates/ruma-events/src/room/guest_access.rs

@@ -2,7 +2,7 @@
 //!
 //! [`m.room.guest_access`]: https://spec.matrix.org/v1.2/client-server-api/#mroomguest_access
 
-use ruma_events_macros::EventContent;
+use ruma_macros::EventContent;
 use ruma_serde::StringEnum;
 use serde::{Deserialize, Serialize};
 

crates/ruma-events/src/room/history_visibility.rs

@@ -2,7 +2,7 @@
 //!
 //! [`m.room.history_visibility`]: https://spec.matrix.org/v1.2/client-server-api/#mroomhistory_visibility
 
-use ruma_events_macros::EventContent;
+use ruma_macros::EventContent;
 use ruma_serde::StringEnum;
 use serde::{Deserialize, Serialize};
 

crates/ruma-events/src/room/join_rules.rs

@@ -4,8 +4,8 @@
 
 use std::{borrow::Cow, collections::BTreeMap};
 
-use ruma_events_macros::EventContent;
 use ruma_identifiers::RoomId;
+use ruma_macros::EventContent;
 use ruma_serde::from_raw_json_value;
 use serde::{
     de::{Deserializer, Error},

crates/ruma-events/src/room/member.rs

@@ -4,8 +4,8 @@
 
 use std::collections::BTreeMap;
 
-use ruma_events_macros::EventContent;
 use ruma_identifiers::{MxcUri, RoomVersionId, ServerName, ServerSigningKeyId, UserId};
+use ruma_macros::EventContent;
 use ruma_serde::StringEnum;
 use serde::{Deserialize, Serialize};
 use serde_json::value::RawValue as RawJsonValue;

crates/ruma-events/src/room/message.rs

@@ -5,8 +5,8 @@
 use std::{borrow::Cow, fmt};
 
 use js_int::UInt;
-use ruma_events_macros::EventContent;
 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;

crates/ruma-events/src/room/message/feedback.rs

@@ -2,8 +2,8 @@
 //!
 //! [`m.room.message.feedback`]: https://spec.matrix.org/v1.2/client-server-api/#mroommessagefeedback
 
-use ruma_events_macros::EventContent;
 use ruma_identifiers::EventId;
+use ruma_macros::EventContent;
 use ruma_serde::StringEnum;
 use serde::{Deserialize, Serialize};
 

crates/ruma-events/src/room/name.rs

@@ -2,8 +2,8 @@
 //!
 //! [`m.room.name`]: https://spec.matrix.org/v1.2/client-server-api/#mroomname
 
-use ruma_events_macros::EventContent;
 use ruma_identifiers::RoomName;
+use ruma_macros::EventContent;
 use serde::{Deserialize, Serialize};
 
 /// The content of an `m.room.name` event.

crates/ruma-events/src/room/pinned_events.rs

@@ -2,8 +2,8 @@
 //!
 //! [`m.room.pinned_events`]: https://spec.matrix.org/v1.2/client-server-api/#mroompinned_events
 
-use ruma_events_macros::EventContent;
 use ruma_identifiers::EventId;
+use ruma_macros::EventContent;
 use serde::{Deserialize, Serialize};
 
 /// The content of an `m.room.pinned_events` event.

crates/ruma-events/src/room/power_levels.rs

@@ -6,8 +6,8 @@ use std::collections::BTreeMap;
 
 use js_int::{int, Int};
 use ruma_common::power_levels::{default_power_level, NotificationPowerLevels};
-use ruma_events_macros::EventContent;
 use ruma_identifiers::UserId;
+use ruma_macros::EventContent;
 use serde::{Deserialize, Serialize};
 
 use crate::EventType;

crates/ruma-events/src/room/redaction.rs

@@ -3,8 +3,8 @@
 //! [`m.room.redaction`]: https://spec.matrix.org/v1.2/client-server-api/#mroomredaction
 
 use ruma_common::MilliSecondsSinceUnixEpoch;
-use ruma_events_macros::{Event, EventContent};
 use ruma_identifiers::{EventId, RoomId, UserId};
+use ruma_macros::{Event, EventContent};
 use serde::{Deserialize, Serialize};
 
 use crate::{Redact, RedactContent, RedactedUnsigned, Unsigned};

crates/ruma-events/src/room/server_acl.rs

@@ -2,8 +2,8 @@
 //!
 //! [`m.room.server_acl`]: https://spec.matrix.org/v1.2/client-server-api/#mroomserver_acl
 
-use ruma_events_macros::EventContent;
 use ruma_identifiers::ServerName;
+use ruma_macros::EventContent;
 use serde::{Deserialize, Serialize};
 use wildmatch::WildMatch;
 

crates/ruma-events/src/room/third_party_invite.rs

@@ -2,7 +2,7 @@
 //!
 //! [`m.room.third_party_invite`]: https://spec.matrix.org/v1.2/client-server-api/#mroomthird_party_invite
 
-use ruma_events_macros::EventContent;
+use ruma_macros::EventContent;
 use ruma_serde::Base64;
 use serde::{Deserialize, Serialize};
 

crates/ruma-events/src/room/tombstone.rs

@@ -2,8 +2,8 @@
 //!
 //! [`m.room.tombstone`]: https://spec.matrix.org/v1.2/client-server-api/#mroomtombstone
 
-use ruma_events_macros::EventContent;
 use ruma_identifiers::RoomId;
+use ruma_macros::EventContent;
 use serde::{Deserialize, Serialize};
 
 /// The content of an `m.room.tombstone` event.

crates/ruma-events/src/room/topic.rs

@@ -2,7 +2,7 @@
 //!
 //! [`m.room.topic`]: https://spec.matrix.org/v1.2/client-server-api/#mroomtopic
 
-use ruma_events_macros::EventContent;
+use ruma_macros::EventContent;
 use serde::{Deserialize, Serialize};
 
 /// The content of an `m.room.topic` event.

crates/ruma-events/src/room_key.rs

@@ -2,8 +2,8 @@
 //!
 //! [`m.room_key`]: https://spec.matrix.org/v1.2/client-server-api/#mroom_key
 
-use ruma_events_macros::EventContent;
 use ruma_identifiers::{EventEncryptionAlgorithm, RoomId};
+use ruma_macros::EventContent;
 use serde::{Deserialize, Serialize};
 
 /// The content of an `m.room_key` event.

crates/ruma-events/src/room_key_request.rs

@@ -2,8 +2,8 @@
 //!
 //! [`m.room_key_request`]: https://spec.matrix.org/v1.2/client-server-api/#mroom_key_request
 
-use ruma_events_macros::EventContent;
 use ruma_identifiers::{DeviceId, EventEncryptionAlgorithm, RoomId, TransactionId};
+use ruma_macros::EventContent;
 use ruma_serde::StringEnum;
 use serde::{Deserialize, Serialize};
 

crates/ruma-events/src/secret/request.rs

@@ -4,8 +4,8 @@
 
 use std::convert::TryFrom;
 
-use ruma_events_macros::EventContent;
 use ruma_identifiers::{DeviceId, TransactionId};
+use ruma_macros::EventContent;
 use ruma_serde::StringEnum;
 use serde::{ser::SerializeStruct, Deserialize, Serialize};
 

crates/ruma-events/src/secret/send.rs

@@ -2,8 +2,8 @@
 //!
 //! [`m.secret.send`]: https://spec.matrix.org/v1.2/client-server-api/#msecretsend
 
-use ruma_events_macros::EventContent;
 use ruma_identifiers::TransactionId;
+use ruma_macros::EventContent;
 use serde::{Deserialize, Serialize};
 
 /// The content of an `m.secret.send` event.

crates/ruma-events/src/space/child.rs

@@ -2,8 +2,8 @@
 //!
 //! [`m.space.child`]: https://spec.matrix.org/v1.2/client-server-api/#mspacechild
 
-use ruma_events_macros::EventContent;
 use ruma_identifiers::ServerName;
+use ruma_macros::EventContent;
 use serde::{Deserialize, Serialize};
 
 /// The content of an `m.space.child` event.

crates/ruma-events/src/space/parent.rs

@@ -2,8 +2,8 @@
 //!
 //! [`m.space.parent`]: https://spec.matrix.org/v1.2/client-server-api/#mspaceparent
 
-use ruma_events_macros::EventContent;
 use ruma_identifiers::ServerName;
+use ruma_macros::EventContent;
 use serde::{Deserialize, Serialize};
 
 /// The content of an `m.space.parent` event.

crates/ruma-events/src/sticker.rs

@@ -2,8 +2,8 @@
 //!
 //! [`m.sticker`]: https://spec.matrix.org/v1.2/client-server-api/#msticker
 
-use ruma_events_macros::EventContent;
 use ruma_identifiers::MxcUri;
+use ruma_macros::EventContent;
 use serde::{Deserialize, Serialize};
 
 use crate::room::ImageInfo;

crates/ruma-events/src/tag.rs

@@ -4,7 +4,7 @@
 
 use std::{collections::BTreeMap, error::Error, fmt, str::FromStr};
 
-use ruma_events_macros::EventContent;
+use ruma_macros::EventContent;
 use ruma_serde::deserialize_cow_str;
 use serde::{Deserialize, Serialize};
 

crates/ruma-events/src/typing.rs

@@ -2,8 +2,8 @@
 //!
 //! [`m.typing`]: https://spec.matrix.org/v1.2/client-server-api/#mtyping
 
-use ruma_events_macros::EventContent;
 use ruma_identifiers::UserId;
+use ruma_macros::EventContent;
 use serde::{Deserialize, Serialize};
 
 /// The content of an `m.typing` event.

crates/ruma-events/tests/ui/01-content-sanity-check.rs

@@ -1,4 +1,4 @@
-use ruma_events_macros::EventContent;
+use ruma_macros::EventContent;
 use serde::{Deserialize, Serialize};
 
 #[derive(Clone, Debug, Deserialize, Serialize, EventContent)]

crates/ruma-events/tests/ui/02-no-event-type.rs

@@ -1,4 +1,4 @@
-use ruma_events_macros::EventContent;
+use ruma_macros::EventContent;
 use serde::{Deserialize, Serialize};
 
 #[derive(Clone, Debug, Deserialize, Serialize, EventContent)]

crates/ruma-events/tests/ui/03-invalid-event-type.rs

@@ -1,4 +1,4 @@
-use ruma_events_macros::EventContent;
+use ruma_macros::EventContent;
 use serde::{Deserialize, Serialize};
 
 #[derive(Clone, Debug, Deserialize, Serialize, EventContent)]

crates/ruma-events/tests/ui/04-event-sanity-check.rs

@@ -5,7 +5,7 @@ extern crate serde;
 
 use ruma_common::MilliSecondsSinceUnixEpoch;
 use ruma_events::{StateEventContent, Unsigned};
-use ruma_events_macros::Event;
+use ruma_macros::Event;
 use ruma_identifiers::{EventId, RoomId, UserId};
 
 /// State event.

crates/ruma-events/tests/ui/05-named-fields.rs

@@ -1,5 +1,5 @@
 use ruma_events::StateEventContent;
-use ruma_events_macros::Event;
+use ruma_macros::Event;
 
 /// State event.
 #[derive(Clone, Debug, Event)]

crates/ruma-events/tests/ui/06-no-content-field.rs

@@ -1,5 +1,5 @@
 use ruma_events::StateEventContent;
-use ruma_events_macros::Event;
+use ruma_macros::Event;
 
 /// State event.
 #[derive(Clone, Debug, Event)]

crates/ruma-events/tests/ui/07-enum-sanity-check.rs

@@ -1,4 +1,4 @@
-use ruma_events_macros::event_enum;
+use ruma_macros::event_enum;
 
 event_enum! {
     /// Any global account data event.

crates/ruma-events/tests/ui/08-enum-invalid-path.rs

@@ -1,4 +1,4 @@
-use ruma_events_macros::event_enum;
+use ruma_macros::event_enum;
 
 event_enum! {
     enum State {

crates/ruma-events/tests/ui/09-enum-invalid-kind.rs

@@ -1,4 +1,4 @@
-use ruma_events_macros::event_enum;
+use ruma_macros::event_enum;
 
 event_enum! {
     enum NotReal {

crates/ruma-macros/Cargo.toml

@@ -1,14 +1,14 @@
 [package]
 categories = ["api-bindings", "web-programming"]
-description = "A procedural macro used by the ruma-events crate."
+description = "Procedural macros used by the Ruma crates."
 edition = "2018"
 homepage = "https://www.ruma.io/"
 keywords = ["matrix", "chat", "messaging", "ruma"]
 license = "MIT"
-name = "ruma-events-macros"
+name = "ruma-macros"
 readme = "README.md"
 repository = "https://github.com/ruma/ruma"
-version = "0.26.0"
+version = "0.1.0"
 
 [lib]
 proc-macro = true

crates/ruma-macros/README.md

@@ -0,0 +1,5 @@
+# ruma-macros
+
+**ruma-macros** provides procedural macros for easily generating types for [Ruma] crates.
+
+[Ruma]: https://github.com/ruma/ruma/

crates/ruma-macros/src/events.rs

@@ -0,0 +1,10 @@
+//! Methods and types for generating [ruma-events] events.
+//!
+//! [ruma-events]: https://github.com/ruma/ruma/tree/main/ruma-events
+
+pub mod event;
+pub mod event_content;
+pub mod event_enum;
+pub mod event_parse;
+pub mod event_type;
+mod util;

crates/ruma-macros/src/events/event.rs

@@ -7,11 +7,11 @@ use syn::{
     Meta, MetaList, NestedMeta,
 };
 
-use crate::{
+use super::{
     event_parse::{to_kind_variation, EventKind, EventKindVariation},
-    import_ruma_events,
     util::is_non_stripped_room_event,
 };
+use crate::import_ruma_events;
 
 /// Derive `Event` macro code generation.
 pub fn expand_event(input: DeriveInput) -> syn::Result<TokenStream> {

crates/ruma-macros/src/events/event_content.rs

@@ -9,7 +9,7 @@ use syn::{
     DeriveInput, Ident, LitStr, Token,
 };
 
-use crate::event_parse::{EventKind, EventKindVariation};
+use super::event_parse::{EventKind, EventKindVariation};
 
 mod kw {
     // This `content` field is kept when the event is redacted.

crates/ruma-macros/src/events/event_enum.rs

@@ -4,7 +4,7 @@ use proc_macro2::{Span, TokenStream};
 use quote::{format_ident, quote, ToTokens};
 use syn::{Attribute, Data, DataEnum, DeriveInput, Ident, LitStr};
 
-use crate::{
+use super::{
     event_parse::{EventEnumDecl, EventEnumEntry, EventKind, EventKindVariation},
     util::{has_prev_content_field, EVENT_FIELDS},
 };
@@ -618,7 +618,7 @@ fn field_return_type(
                 quote! { #ruma_events::Unsigned }
             }
         }
-        _ => panic!("the `ruma_events_macros::event_enum::EVENT_FIELD` const was changed"),
+        _ => panic!("the `ruma_macros::event_enum::EVENT_FIELD` const was changed"),
     }
 }
 

crates/ruma-macros/src/events/event_type.rs

@@ -2,7 +2,7 @@ use proc_macro2::{Span, TokenStream};
 use quote::{format_ident, quote};
 use syn::{Ident, LitStr};
 
-use crate::event_parse::{EventEnumEntry, EventEnumInput, EventKind};
+use super::event_parse::{EventEnumEntry, EventEnumInput, EventKind};
 
 pub fn expand_event_type_enum(
     input: EventEnumInput,

crates/ruma-macros/src/events/util.rs

@@ -1,4 +1,4 @@
-use crate::event_parse::{EventKind, EventKindVariation};
+use super::event_parse::{EventKind, EventKindVariation};
 
 pub(crate) fn is_non_stripped_room_event(kind: EventKind, var: EventKindVariation) -> bool {
     matches!(kind, EventKind::MessageLike | EventKind::State)

crates/ruma-macros/src/lib.rs

@@ -1,33 +1,26 @@
 #![doc(html_favicon_url = "https://www.ruma.io/favicon.ico")]
 #![doc(html_logo_url = "https://www.ruma.io/images/logo.png")]
-//! A procedural macro for generating [ruma-events] events.
+//! Procedural macros used by ruma crates.
 //!
 //! See the documentation for the individual macros for usage details.
-//!
-//! [ruma-events]: https://github.com/ruma/ruma/tree/main/ruma-events
 
 #![warn(missing_docs)]
 
-use event_parse::EventEnumInput;
 use proc_macro::TokenStream;
 use proc_macro2 as pm2;
 use proc_macro_crate::{crate_name, FoundCrate};
 use quote::{format_ident, quote};
 use syn::{parse_macro_input, DeriveInput};
 
-use self::{
+use self::events::{
     event::expand_event,
     event_content::expand_event_content,
     event_enum::{expand_event_enums, expand_from_impls_derived},
+    event_parse::EventEnumInput,
     event_type::expand_event_type_enum,
 };
 
-mod event;
+mod events;
-mod event_content;
-mod event_enum;
-mod event_parse;
-mod event_type;
-mod util;
 
 /// Generates an enum to represent the various Matrix event types.
 ///
@@ -38,7 +31,7 @@ mod util;
 ///
 /// ```ignore
 /// # // HACK: This is "ignore" because of cyclical dependency drama.
-/// use ruma_events_macros::event_enum;
+/// use ruma_macros::event_enum;
 ///
 /// event_enum! {
 ///     enum ToDevice {