From e05fdf84fd5c147716e6336d95e432b4201e21a8 Mon Sep 17 00:00:00 2001
From: Jake Waksbaum <jake.waksbaum@gmail.com>
Date: Fri, 29 May 2020 00:01:14 -0400
Subject: [PATCH] Replace serde/strum renames with rename_all

Instead of applying a `#[serde(rename = "foo")]` or `#[strum(serialize =
"foo")]` to each field of a struct or variants of an enum, apply the
appropriate `#[serde(rename_all = "style")]` or `#[strum(serialize_all =
"style")]` to the struct/enum.

In addition, in the places where the `lowercase` style is used and all
the fields/variants are a single word, replace that with `snake_case`,
since that seems to be the default everywhere with multi-word
fields/variants.
---
 src/call.rs                  |  4 ++--
 src/key/verification.rs      | 18 ++++++++----------
 src/presence.rs              |  8 ++------
 src/room/message/feedback.rs |  4 ++--
 src/room_key_request.rs      |  4 ++--
 5 files changed, 16 insertions(+), 22 deletions(-)

diff --git a/src/call.rs b/src/call.rs
index e916b08b..0a43b418 100644
--- a/src/call.rs
+++ b/src/call.rs
@@ -24,8 +24,8 @@ pub struct SessionDescription {
 /// The type of VoIP session description.
 #[derive(Clone, Copy, Debug, Display, EnumString, PartialEq, Deserialize, Serialize)]
 #[non_exhaustive]
-#[serde(rename_all = "lowercase")]
-#[strum(serialize_all = "lowercase")]
+#[serde(rename_all = "snake_case")]
+#[strum(serialize_all = "snake_case")]
 pub enum SessionDescriptionType {
     /// An answer.
     Answer,
diff --git a/src/key/verification.rs b/src/key/verification.rs
index 8173029a..67d13116 100644
--- a/src/key/verification.rs
+++ b/src/key/verification.rs
@@ -14,42 +14,40 @@ pub mod start;
 
 /// A hash algorithm.
 #[derive(Clone, Copy, Debug, Display, EnumString, Serialize, PartialEq, Deserialize)]
+#[serde(rename_all = "snake_case")]
+#[strum(serialize_all = "snake_case")]
 pub enum HashAlgorithm {
     /// The SHA256 hash algorithm.
-    #[serde(rename = "sha256")]
-    #[strum(serialize = "sha256")]
     Sha256,
 }
 
 /// A key agreement protocol.
 #[derive(Clone, Copy, Debug, Display, EnumString, Serialize, PartialEq, Deserialize)]
+#[serde(rename_all = "snake_case")]
+#[strum(serialize_all = "snake_case")]
 pub enum KeyAgreementProtocol {
     /// The [Curve25519](https://cr.yp.to/ecdh.html) key agreement protocol.
-    #[serde(rename = "curve25519")]
-    #[strum(serialize = "curve25519")]
     Curve25519,
 }
 
 /// A message authentication code algorithm.
 #[derive(Clone, Copy, Debug, Display, EnumString, Serialize, PartialEq, Deserialize)]
+#[serde(rename_all = "kebab-case")]
+#[strum(serialize_all = "kebab-case")]
 pub enum MessageAuthenticationCode {
     /// The HKDF-HMAC-SHA256 MAC.
-    #[serde(rename = "hkdf-hmac-sha256")]
-    #[strum(serialize = "hkdf-hmac-sha256")]
     HkdfHmacSha256,
 }
 
 /// A Short Authentication String method.
 #[derive(Clone, Copy, Debug, Display, EnumString, Serialize, PartialEq, Deserialize)]
+#[serde(rename_all = "snake_case")]
+#[strum(serialize_all = "snake_case")]
 pub enum ShortAuthenticationString {
     /// The decimal method.
-    #[serde(rename = "decimal")]
-    #[strum(serialize = "decimal")]
     Decimal,
 
     /// The emoji method.
-    #[serde(rename = "emoji")]
-    #[strum(serialize = "emoji")]
     Emoji,
 }
 
diff --git a/src/presence.rs b/src/presence.rs
index 4af7473e..1737b9a7 100644
--- a/src/presence.rs
+++ b/src/presence.rs
@@ -44,20 +44,16 @@ ruma_event! {
 
 /// A description of a user's connectivity and availability for chat.
 #[derive(Clone, Copy, Debug, Display, EnumString, PartialEq, Deserialize, Serialize)]
+#[serde(rename_all = "snake_case")]
+#[strum(serialize_all = "snake_case")]
 pub enum PresenceState {
     /// Disconnected from the service.
-    #[serde(rename = "offline")]
-    #[strum(serialize = "offline")]
     Offline,
 
     /// Connected to the service.
-    #[serde(rename = "online")]
-    #[strum(serialize = "online")]
     Online,
 
     /// Connected to the service but not available for chat.
-    #[serde(rename = "unavailable")]
-    #[strum(serialize = "unavailable")]
     Unavailable,
 }
 
diff --git a/src/room/message/feedback.rs b/src/room/message/feedback.rs
index df303a2e..73495ee9 100644
--- a/src/room/message/feedback.rs
+++ b/src/room/message/feedback.rs
@@ -26,8 +26,8 @@ ruma_event! {
 
 /// A type of feedback.
 #[derive(Clone, Copy, Debug, Display, EnumString, PartialEq, Deserialize, Serialize)]
-#[serde(rename_all = "lowercase")]
-#[strum(serialize_all = "lowercase")]
+#[serde(rename_all = "snake_case")]
+#[strum(serialize_all = "snake_case")]
 pub enum FeedbackType {
     /// Sent when a message is received.
     Delivered,
diff --git a/src/room_key_request.rs b/src/room_key_request.rs
index 491c80d4..2c223416 100644
--- a/src/room_key_request.rs
+++ b/src/room_key_request.rs
@@ -37,10 +37,10 @@ ruma_event! {
 
 /// A new key request or a cancellation of a previous request.
 #[derive(Clone, Copy, Debug, Display, EnumString, PartialEq, Deserialize, Serialize)]
+#[serde(rename_all = "snake_case")]
+#[strum(serialize_all = "snake_case")]
 pub enum Action {
     /// Request a key.
-    #[serde(rename = "request")]
-    #[strum(serialize = "request")]
     Request,
 
     /// Cancel a request for a key.