chris/ruwuma
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

macros: Add .m.rule.snake_case rename rule for StringEnum

Browse Source
This commit is contained in:
Kévin Commaille 2022-11-11 13:50:07 +01:00 committed by Kévin Commaille
parent eecae05721
commit c5fb935472
2 changed files with 33 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
crates/ruma-common/src/push/predefined.rs
View File

@ -372,30 +372,25 @@ pub enum PredefinedRuleId {
/// The rule IDs of the predefined override server push rules.
#[doc = include_str!(concat!(env!("CARGO_MANIFEST_DIR"), "/src/doc/string_enum.md"))]
#[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord, StringEnum)]
#[ruma_enum(rename_all = ".m.rule.snake_case")]
#[non_exhaustive]
pub enum PredefinedOverrideRuleId {
/// `.m.rule.master`
#[ruma_enum(rename = ".m.rule.master")]
Master,
/// `.m.rule.suppress_notices`
#[ruma_enum(rename = ".m.rule.suppress_notices")]
SuppressNotices,
/// `.m.rule.invite_for_me`
#[ruma_enum(rename = ".m.rule.invite_for_me")]
InviteForMe,
/// `.m.rule.member_event`
#[ruma_enum(rename = ".m.rule.member_event")]
MemberEvent,
/// `.m.rule.contains_display_name`
#[ruma_enum(rename = ".m.rule.contains_display_name")]
ContainsDisplayName,
/// `.m.rule.tombstone`
#[ruma_enum(rename = ".m.rule.tombstone")]
Tombstone,
/// `.m.rule.room.server_acl`
@ -408,7 +403,6 @@ pub enum PredefinedOverrideRuleId {
/// `.m.rule.reaction`
#[cfg(feature = "unstable-msc2677")]
#[ruma_enum(rename = ".m.rule.reaction")]
Reaction,
#[doc(hidden)]
@ -418,46 +412,38 @@ pub enum PredefinedOverrideRuleId {
/// The rule IDs of the predefined underride server push rules.
#[doc = include_str!(concat!(env!("CARGO_MANIFEST_DIR"), "/src/doc/string_enum.md"))]
#[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord, StringEnum)]
#[ruma_enum(rename_all = ".m.rule.snake_case")]
#[non_exhaustive]
pub enum PredefinedUnderrideRuleId {
/// `.m.rule.call`
#[ruma_enum(rename = ".m.rule.call")]
Call,
/// `.m.rule.encrypted_room_one_to_one`
#[ruma_enum(rename = ".m.rule.encrypted_room_one_to_one")]
EncryptedRoomOneToOne,
/// `.m.rule.room_one_to_one`
#[ruma_enum(rename = ".m.rule.room_one_to_one")]
RoomOneToOne,
/// `.m.rule.message`
#[ruma_enum(rename = ".m.rule.message")]
Message,
/// `.m.rule.encrypted`
#[ruma_enum(rename = ".m.rule.encrypted")]
Encrypted,
/// `.m.rule.poll_start_one_to_one`
#[cfg(feature = "unstable-msc3381")]
#[ruma_enum(rename = ".m.rule.poll_start_one_to_one")]
PollStartOneToOne,
/// `.m.rule.poll_start`
#[cfg(feature = "unstable-msc3381")]
#[ruma_enum(rename = ".m.rule.poll_start")]
PollStart,
/// `.m.rule.poll_end_one_to_one`
#[cfg(feature = "unstable-msc3381")]
#[ruma_enum(rename = ".m.rule.poll_end_one_to_one")]
PollEndOneToOne,
/// `.m.rule.poll_end`
#[cfg(feature = "unstable-msc3381")]
#[ruma_enum(rename = ".m.rule.poll_end")]
PollEnd,
#[doc(hidden)]
@ -467,10 +453,10 @@ pub enum PredefinedUnderrideRuleId {
/// The rule IDs of the predefined content server push rules.
#[doc = include_str!(concat!(env!("CARGO_MANIFEST_DIR"), "/src/doc/string_enum.md"))]
#[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord, StringEnum)]
#[ruma_enum(rename_all = ".m.rule.snake_case")]
#[non_exhaustive]
pub enum PredefinedContentRuleId {
/// `.m.rule.contains_user_name`
#[ruma_enum(rename = ".m.rule.contains_user_name")]
ContainsUserName,
#[doc(hidden)]

34
crates/ruma-macros/src/serde/case.rs
View File

@ -40,6 +40,8 @@ pub enum RenameRule {
MatrixSnakeCase,
/// Rename the direct children to "m.dotted.case" style.
MatrixDottedCase,
/// Rename the direct children to "m.rule.snake_case" style.
MatrixRuleSnakeCase,
}
impl RenameRule {
@ -68,6 +70,7 @@ impl RenameRule {
MatrixDottedCase => {
String::from("m.") + &SnakeCase.apply_to_variant(variant).replace('_', ".")
}
MatrixRuleSnakeCase => String::from(".m.rule.") + &SnakeCase.apply_to_variant(variant),
}
}
@ -102,6 +105,7 @@ impl RenameRule {
MatrixErrorCase => String::from("M_") + &ScreamingSnakeCase.apply_to_field(field),
MatrixSnakeCase => String::from("m.") + field,
MatrixDottedCase => String::from("m.") + &field.replace('_', "."),
MatrixRuleSnakeCase => String::from(".m.rule.") + field,
}
}
}
@ -122,6 +126,7 @@ impl FromStr for RenameRule {
"M_MATRIX_ERROR_CASE" => Ok(MatrixErrorCase),
"m.snake_case" => Ok(MatrixSnakeCase),
"m.dotted.case" => Ok(MatrixDottedCase),
".m.rule.snake_case" => Ok(MatrixRuleSnakeCase),
_ => Err(()),
}
}
@ -141,6 +146,7 @@ fn rename_variants() {
matrix_error,
m_snake,
m_dotted,
m_rule_snake,
) in &[
(
"Outcome",
@ -154,6 +160,7 @@ fn rename_variants() {
"M_OUTCOME",
"m.outcome",
"m.outcome",
".m.rule.outcome",
),
(
"VeryTasty",
@ -167,9 +174,23 @@ fn rename_variants() {
"M_VERY_TASTY",
"m.very_tasty",
"m.very.tasty",
".m.rule.very_tasty",
),
("A", "a", "A", "a", "a", "A", "a", "A", "M_A", "m.a", "m.a", ".m.rule.a"),
(
"Z42",
"z42",
"Z42",
"z42",
"z42",
"Z42",
"z42",
"Z42",
"M_Z42",
"m.z42",
"m.z42",
".m.rule.z42",
),
("A", "a", "A", "a", "a", "A", "a", "A", "M_A", "m.a", "m.a"),
("Z42", "z42", "Z42", "z42", "z42", "Z42", "z42", "Z42", "M_Z42", "m.z42", "m.z42"),
] {
assert_eq!(None.apply_to_variant(original), original);
assert_eq!(LowerCase.apply_to_variant(original), lower);
@ -183,6 +204,7 @@ fn rename_variants() {
assert_eq!(MatrixErrorCase.apply_to_variant(original), matrix_error);
assert_eq!(MatrixSnakeCase.apply_to_variant(original), m_snake);
assert_eq!(MatrixDottedCase.apply_to_variant(original), m_dotted);
assert_eq!(MatrixRuleSnakeCase.apply_to_variant(original), m_rule_snake);
}
}
@ -199,6 +221,7 @@ fn rename_fields() {
matrix_error,
m_snake,
m_dotted,
m_rule_snake,
) in &[
(
"outcome",
@ -211,6 +234,7 @@ fn rename_fields() {
"M_OUTCOME",
"m.outcome",
"m.outcome",
".m.rule.outcome",
),
(
"very_tasty",
@ -223,9 +247,10 @@ fn rename_fields() {
"M_VERY_TASTY",
"m.very_tasty",
"m.very.tasty",
".m.rule.very_tasty",
),
("a", "A", "A", "a", "A", "a", "A", "M_A", "m.a", "m.a"),
("z42", "Z42", "Z42", "z42", "Z42", "z42", "Z42", "M_Z42", "m.z42", "m.z42"),
("a", "A", "A", "a", "A", "a", "A", "M_A", "m.a", "m.a", ".m.rule.a"),
("z42", "Z42", "Z42", "z42", "Z42", "z42", "Z42", "M_Z42", "m.z42", "m.z42", ".m.rule.z42"),
] {
assert_eq!(None.apply_to_field(original), original);
assert_eq!(Uppercase.apply_to_field(original), upper);
@ -238,5 +263,6 @@ fn rename_fields() {
assert_eq!(MatrixErrorCase.apply_to_field(original), matrix_error);
assert_eq!(MatrixSnakeCase.apply_to_field(original), m_snake);
assert_eq!(MatrixDottedCase.apply_to_field(original), m_dotted);
assert_eq!(MatrixRuleSnakeCase.apply_to_field(original), m_rule_snake);
}
}