Stop special-casing zero fields in macro code

crates/ruma-api-macros/src/api/request.rs

@@ -142,13 +142,6 @@ impl Request {
         );
         let struct_attributes = &self.attributes;
 
-        let request_def = if self.fields.is_empty() {
-            quote!(;)
-        } else {
-            let fields = self.fields.iter().map(|request_field| request_field.field());
-            quote! { { #(#fields),* } }
-        };
-
         let request_body_struct =
             if let Some(body_field) = self.fields.iter().find(|f| f.is_newtype_body()) {
                 let field = Field { ident: None, colon_token: None, ..body_field.field().clone() };
@@ -232,6 +225,8 @@ impl Request {
         };
 
         let lifetimes = self.combine_lifetimes();
+        let fields = self.fields.iter().map(|request_field| request_field.field());
+
         let outgoing_request_impl = self.expand_outgoing(metadata, error_ty, &lifetimes, ruma_api);
         let incoming_request_impl = self.expand_incoming(metadata, error_ty, ruma_api);
 
@@ -241,7 +236,9 @@ impl Request {
             #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
             #[incoming_derive(!Deserialize)]
             #( #struct_attributes )*
-            pub struct Request #lifetimes #request_def
+            pub struct Request #lifetimes {
+                #(#fields),*
+            }
 
             #request_body_struct
             #request_query_struct

crates/ruma-api-macros/src/api/response.rs

@@ -52,22 +52,11 @@ impl Response {
             format!("Data in the response from the `{}` API endpoint.", metadata.name.value());
         let struct_attributes = &self.attributes;
 
-        let response_def = if self.fields.is_empty() {
-            quote!(;)
-        } else {
-            let fields = self.fields.iter().map(|response_field| response_field.field());
-            quote! { { #(#fields),* } }
-        };
-
         let def = if let Some(body_field) = self.fields.iter().find(|f| f.is_newtype_body()) {
             let field = Field { ident: None, colon_token: None, ..body_field.field().clone() };
-
             quote! { (#field); }
         } else if self.has_body_fields() {
-            let fields = self.fields.iter().filter(|f| f.is_body());
+            let fields = self.fields.iter().filter(|f| f.is_body()).map(ResponseField::field);
-
-            let fields = fields.map(ResponseField::field);
-
             quote! { { #(#fields),* } }
         } else {
             quote! { {} }
@@ -91,6 +80,8 @@ impl Response {
             quote! { #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)] }
         };
 
+        let fields = self.fields.iter().map(|response_field| response_field.field());
+
         let outgoing_response_impl = self.expand_outgoing(ruma_api);
         let incoming_response_impl = self.expand_incoming(error_ty, ruma_api);
 
@@ -100,7 +91,9 @@ impl Response {
             #non_exhaustive_attr
             #[incoming_derive(!Deserialize)]
             #( #struct_attributes )*
-            pub struct Response #response_def
+            pub struct Response {
+                #(#fields),*
+            }
 
             #response_body_struct
 

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

@@ -92,7 +92,7 @@ impl IncomingRequest {
 impl Response {
     /// Creates an empty `Response`.
     pub fn new() -> Self {
-        Self
+        Self {}
     }
 }
 

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

@@ -33,6 +33,6 @@ impl<'a> Request<'a> {
 impl Response {
     /// Create an empty `Response`.
     pub fn new() -> Self {
-        Self
+        Self {}
     }
 }

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

@@ -33,6 +33,6 @@ impl<'a> Request<'a> {
 impl Response {
     /// Creates an empty `Response`.
     pub fn new() -> Self {
-        Self
+        Self {}
     }
 }

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

@@ -42,6 +42,6 @@ impl<'a> Request<'a> {
 impl Response {
     /// Creates an empty `Response`.
     pub fn new() -> Self {
-        Self
+        Self {}
     }
 }

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

@@ -48,6 +48,6 @@ impl<'a> Request<'a> {
 impl Response {
     /// Creates an empty `Response`.
     pub fn new() -> Self {
-        Self
+        Self {}
     }
 }

crates/ruma-client-api/src/r0/account/change_password.rs

@@ -49,6 +49,6 @@ impl<'a> Request<'a> {
 impl Response {
     /// Creates an empty `Response`.
     pub fn new() -> Self {
-        Self
+        Self {}
     }
 }

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

@@ -27,7 +27,7 @@ ruma_api! {
 impl Request {
     /// Creates an empty `Request`.
     pub fn new() -> Self {
-        Self
+        Self {}
     }
 }
 

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

@@ -38,6 +38,6 @@ impl<'a> Request<'a> {
 impl Response {
     /// Creates an empty `Response`.
     pub fn new() -> Self {
-        Self
+        Self {}
     }
 }

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

@@ -35,6 +35,6 @@ impl<'a> Request<'a> {
 impl Response {
     /// Creates an empty `Response`.
     pub fn new() -> Self {
-        Self
+        Self {}
     }
 }

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

@@ -44,6 +44,6 @@ impl<'a> Request<'a> {
 impl Response {
     /// Creates an empty `Response`.
     pub fn new() -> Self {
-        Self
+        Self {}
     }
 }

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

@@ -34,6 +34,6 @@ impl<'a> Request<'a> {
 impl Response {
     /// Creates an empty `Response`.
     pub fn new() -> Self {
-        Self
+        Self {}
     }
 }

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

@@ -40,7 +40,7 @@ ruma_api! {
 impl Request {
     /// Creates an empty `Request`.
     pub fn new() -> Self {
-        Self
+        Self {}
     }
 }
 

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

@@ -40,6 +40,6 @@ impl<'a> Request<'a> {
 impl Response {
     /// Creates an empty `Response`.
     pub fn new() -> Self {
-        Self
+        Self {}
     }
 }

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

@@ -28,7 +28,7 @@ ruma_api! {
 impl Request {
     /// Creates an empty `Request`.
     pub fn new() -> Self {
-        Self
+        Self {}
     }
 }
 

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

@@ -50,6 +50,6 @@ impl<'a> Request<'a> {
 impl Response {
     /// Creates an empty `Response`.
     pub fn new() -> Self {
-        Self
+        Self {}
     }
 }

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

@@ -59,6 +59,6 @@ impl<'a> Request<'a> {
 impl Response {
     /// Creates an empty `Response`.
     pub fn new() -> Self {
-        Self
+        Self {}
     }
 }

crates/ruma-client-api/src/r0/contact/get_contacts.rs

@@ -29,7 +29,7 @@ ruma_api! {
 impl Request {
     /// Creates an empty `Request`.
     pub fn new() -> Self {
-        Self
+        Self {}
     }
 }
 

crates/ruma-client-api/src/r0/contact/request_contact_verification_token.rs

@@ -64,6 +64,6 @@ impl<'a> Request<'a> {
 impl Response {
     /// Creates an empty `Response`.
     pub fn new() -> Self {
-        Self
+        Self {}
     }
 }

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

@@ -41,6 +41,6 @@ impl<'a> Request<'a> {
 impl Response {
     /// Creates an empty `Response`.
     pub fn new() -> Self {
-        Self
+        Self {}
     }
 }

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

@@ -40,6 +40,6 @@ impl<'a> Request<'a> {
 impl Response {
     /// Creates an empty `Response`.
     pub fn new() -> Self {
-        Self
+        Self {}
     }
 }

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

@@ -28,7 +28,7 @@ ruma_api! {
 impl Request {
     /// Creates an empty `Request`.
     pub fn new() -> Self {
-        Self
+        Self {}
     }
 }
 

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

@@ -40,6 +40,6 @@ impl<'a> Request<'a> {
 impl Response {
     /// Creates an empty `Response`.
     pub fn new() -> Self {
-        Self
+        Self {}
     }
 }

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

@@ -40,6 +40,6 @@ impl<'a> Request<'a> {
 impl Response {
     /// Creates an empty `Response`.
     pub fn new() -> Self {
-        Self
+        Self {}
     }
 }

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

@@ -40,6 +40,6 @@ impl Request {
 impl Response {
     /// Creates an empty `Response`.
     pub fn new() -> Self {
-        Self
+        Self {}
     }
 }

crates/ruma-client-api/src/r0/keys/upload_signing_keys.rs

@@ -54,6 +54,6 @@ impl Request<'_> {
 impl Response {
     /// Creates an empty `Response`.
     pub fn new() -> Self {
-        Self
+        Self {}
     }
 }

crates/ruma-client-api/src/r0/media/get_media_config.rs

@@ -28,7 +28,7 @@ ruma_api! {
 impl Request {
     /// Creates an empty `Request`.
     pub fn new() -> Self {
-        Self
+        Self {}
     }
 }
 

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

@@ -42,6 +42,6 @@ impl<'a> Request<'a> {
 impl Response {
     /// Creates an empty `Response`.
     pub fn new() -> Self {
-        Self
+        Self {}
     }
 }

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

@@ -35,6 +35,6 @@ impl<'a> Request<'a> {
 impl Response {
     /// Creates an empty `Response`.
     pub fn new() -> Self {
-        Self
+        Self {}
     }
 }

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

@@ -50,7 +50,7 @@ impl<'a> Request<'a> {
 impl Response {
     /// Creates an empty `Response`.
     pub fn new() -> Self {
-        Self
+        Self {}
     }
 }
 

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

@@ -28,7 +28,7 @@ ruma_api! {
 impl Request {
     /// Creates an empty `Request`.
     pub fn new() -> Self {
-        Self
+        Self {}
     }
 }
 

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

@@ -42,6 +42,6 @@ impl<'a> Request<'a> {
 impl Response {
     /// Creates an empty `Response`.
     pub fn new() -> Self {
-        Self
+        Self {}
     }
 }

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

@@ -35,6 +35,6 @@ impl<'a> Request<'a> {
 impl Response {
     /// Creates an empty `Response`.
     pub fn new() -> Self {
-        Self
+        Self {}
     }
 }

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

@@ -38,6 +38,6 @@ impl<'a> Request<'a> {
 impl Response {
     /// Creates an empty `Response`.
     pub fn new() -> Self {
-        Self
+        Self {}
     }
 }

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

@@ -43,6 +43,6 @@ impl<'a> Request<'a> {
 impl Response {
     /// Creates an empty `Response`.
     pub fn new() -> Self {
-        Self
+        Self {}
     }
 }

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

@@ -70,7 +70,7 @@ impl<'a> Request<'a> {
 impl Response {
     /// Creates an empty `Response`.
     pub fn new() -> Self {
-        Self
+        Self {}
     }
 }
 

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

@@ -39,6 +39,6 @@ impl<'a> Request<'a> {
 impl Response {
     /// Creates an empty `Response`.
     pub fn new() -> Self {
-        Self
+        Self {}
     }
 }

crates/ruma-client-api/src/r0/push/delete_pushrule.rs

@@ -44,6 +44,6 @@ impl<'a> Request<'a> {
 impl Response {
     /// Creates an empty `Response`.
     pub fn new() -> Self {
-        Self
+        Self {}
     }
 }

crates/ruma-client-api/src/r0/push/get_pushers.rs

@@ -29,7 +29,7 @@ ruma_api! {
 impl Request {
     /// Creates an empty `Request`.
     pub fn new() -> Self {
-        Self
+        Self {}
     }
 }
 

crates/ruma-client-api/src/r0/push/get_pushrules_all.rs

@@ -27,7 +27,7 @@ ruma_api! {
 impl Request {
     /// Creates an empty `Request`.
     pub fn new() -> Self {
-        Self
+        Self {}
     }
 }
 

crates/ruma-client-api/src/r0/push/get_pushrules_global_scope.rs

@@ -28,7 +28,7 @@ ruma_api! {
 impl Request {
     /// Creates an empty `Request`.
     pub fn new() -> Self {
-        Self
+        Self {}
     }
 }
 

crates/ruma-client-api/src/r0/push/set_pusher.rs

@@ -43,7 +43,7 @@ impl Request {
 impl Response {
     /// Creates an empty `Response`.
     pub fn new() -> Self {
-        Self
+        Self {}
     }
 }
 

crates/ruma-client-api/src/r0/push/set_pushrule.rs

@@ -77,6 +77,6 @@ impl<'a> Request<'a> {
 impl Response {
     /// Creates an empty `Response`.
     pub fn new() -> Self {
-        Self
+        Self {}
     }
 }

crates/ruma-client-api/src/r0/push/set_pushrule_actions.rs

@@ -48,6 +48,6 @@ impl<'a> Request<'a> {
 impl Response {
     /// Creates an empty `Response`.
     pub fn new() -> Self {
-        Self
+        Self {}
     }
 }

crates/ruma-client-api/src/r0/push/set_pushrule_enabled.rs

@@ -57,6 +57,6 @@ impl<'a> Request<'a> {
 impl Response {
     /// Creates an empty `Response`.
     pub fn new() -> Self {
-        Self
+        Self {}
     }
 }

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

@@ -47,6 +47,6 @@ impl<'a> Request<'a> {
 impl Response {
     /// Creates an empty `Response`.
     pub fn new() -> Self {
-        Self
+        Self {}
     }
 }

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

@@ -44,6 +44,6 @@ impl<'a> Request<'a> {
 impl Response {
     /// Creates an empty `Response`.
     pub fn new() -> Self {
-        Self
+        Self {}
     }
 }

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

@@ -46,6 +46,6 @@ impl<'a> Request<'a> {
 impl Response {
     /// Creates an empty `Response`.
     pub fn new() -> Self {
-        Self
+        Self {}
     }
 }

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

@@ -36,7 +36,7 @@ ruma_api! {
 impl Request {
     /// Creates an empty `Request`.
     pub fn new() -> Self {
-        Self
+        Self {}
     }
 }
 

crates/ruma-client-api/src/r0/session/logout.rs

@@ -24,13 +24,13 @@ ruma_api! {
 impl Request {
     /// Creates an empty `Request`.
     pub fn new() -> Self {
-        Self
+        Self {}
     }
 }
 
 impl Response {
     /// Creates an empty `Response`.
     pub fn new() -> Self {
-        Self
+        Self {}
     }
 }

crates/ruma-client-api/src/r0/session/logout_all.rs

@@ -24,13 +24,13 @@ ruma_api! {
 impl Request {
     /// Creates an empty `Request`.
     pub fn new() -> Self {
-        Self
+        Self {}
     }
 }
 
 impl Response {
     /// Creates an empty `Response`.
     pub fn new() -> Self {
-        Self
+        Self {}
     }
 }

crates/ruma-client-api/src/r0/tag/create_tag.rs

@@ -48,6 +48,6 @@ impl<'a> Request<'a> {
 impl Response {
     /// Creates an empty `Response`.
     pub fn new() -> Self {
-        Self
+        Self {}
     }
 }

crates/ruma-client-api/src/r0/tag/delete_tag.rs

@@ -43,6 +43,6 @@ impl<'a> Request<'a> {
 impl Response {
     /// Creates an empty `Response`.
     pub fn new() -> Self {
-        Self
+        Self {}
     }
 }

crates/ruma-client-api/src/r0/thirdparty/get_protocols.rs

@@ -30,7 +30,7 @@ ruma_api! {
 impl Request {
     /// Creates an empty `Request`.
     pub fn new() -> Self {
-        Self
+        Self {}
     }
 }
 

crates/ruma-client-api/src/r0/to_device/send_event_to_device.rs

@@ -50,7 +50,7 @@ impl<'a> Request<'a> {
 impl Response {
     /// Creates an empty `Response`.
     pub fn new() -> Self {
-        Self
+        Self {}
     }
 }
 

crates/ruma-client-api/src/r0/typing/create_typing_event.rs

@@ -46,7 +46,7 @@ impl<'a> Request<'a> {
 impl Response {
     /// Creates an empty `Response`.
     pub fn new() -> Self {
-        Self
+        Self {}
     }
 }
 

crates/ruma-client-api/src/r0/voip/get_turn_server_info.rs

@@ -38,7 +38,7 @@ ruma_api! {
 impl Request {
     /// Creates an empty `Request`.
     pub fn new() -> Self {
-        Self
+        Self {}
     }
 }
 

crates/ruma-client-api/src/unversioned/discover_homeserver.rs

@@ -32,7 +32,7 @@ ruma_api! {
 impl Request {
     /// Creates an empty `Request`.
     pub fn new() -> Self {
-        Self
+        Self {}
     }
 }
 

crates/ruma-client-api/src/unversioned/get_supported_versions.rs

@@ -32,7 +32,7 @@ ruma_api! {
 impl Request {
     /// Creates an empty `Request`.
     pub fn new() -> Self {
-        Self
+        Self {}
     }
 }
 

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

@@ -173,23 +173,15 @@ pub fn expand_event_content(
         };
         let redaction_struct_fields = kept_redacted_fields.iter().flat_map(|f| &f.ident);
 
-        // redacted_fields allows one to declare an empty redacted event without braces,
+        // Used in `EventContent::redacted` which only returns zero sized types (unit structs).
-        // otherwise `RedactedWhateverEventContent {}` is needed.
+        let redacted_return = if kept_redacted_fields.is_empty() {
-        // The redacted_return is used in `EventContent::redacted` which only returns
+            quote! { Ok(#redacted_ident {}) }
-        // zero sized types (unit structs).
-        let (redacted_fields, redacted_return) = if kept_redacted_fields.is_empty() {
-            (quote! { ; }, quote! { Ok(#redacted_ident {}) })
         } else {
-            (
+            quote! {
-                quote! {
+                Err(#serde::de::Error::custom(
-                    { #( #kept_redacted_fields, )* }
+                    format!("this redacted event has fields that cannot be constructed")
-                },
+                ))
-                quote! {
+            }
-                    Err(#serde::de::Error::custom(
-                        format!("this redacted event has fields that cannot be constructed")
-                    ))
-                },
-            )
         };
 
         let has_deserialize_fields = if kept_redacted_fields.is_empty() {
@@ -210,7 +202,7 @@ pub fn expand_event_content(
                 impl #redacted_ident {
                     #[doc = #doc]
                     pub fn new() -> Self {
-                        Self
+                        Self {}
                     }
                 }
             }
@@ -252,7 +244,9 @@ pub fn expand_event_content(
             #[doc = #doc]
             #[derive(Clone, Debug, #serde::Deserialize, #serde::Serialize)]
             #[cfg_attr(not(feature = "unstable-exhaustive-types"), non_exhaustive)]
-            pub struct #redacted_ident #redacted_fields
+            pub struct #redacted_ident {
+                #( #kept_redacted_fields, )*
+            }
 
             #initializer
 

crates/ruma-events/src/dummy.rs

@@ -27,7 +27,7 @@ pub struct DummyToDeviceEventContent;
 impl DummyToDeviceEventContent {
     /// Create a new `DummyToDeviceEventContent`.
     pub fn new() -> Self {
-        Self
+        Self {}
     }
 }
 

crates/ruma-federation-api/src/discovery/discover_homeserver.rs

@@ -26,7 +26,7 @@ ruma_api! {
 impl Request {
     /// Creates an empty `Request`.
     pub fn new() -> Self {
-        Self
+        Self {}
     }
 }
 

crates/ruma-federation-api/src/discovery/get_server_keys/v2.rs

@@ -27,7 +27,7 @@ ruma_api! {
 impl Request {
     /// Creates an empty `Request`.
     pub fn new() -> Self {
-        Self
+        Self {}
     }
 }
 

crates/ruma-federation-api/src/discovery/get_server_version/v1.rs

@@ -27,7 +27,7 @@ ruma_api! {
 impl Request {
     /// Creates an empty `Request`.
     pub fn new() -> Self {
-        Self
+        Self {}
     }
 }
 

crates/ruma-federation-api/src/membership/create_leave_event/v2.rs

@@ -45,7 +45,7 @@ impl<'a> Request<'a> {
 impl Response {
     /// Creates an empty `Response`.
     pub fn new() -> Self {
-        Self
+        Self {}
     }
 }
 

crates/ruma-federation-api/src/thirdparty/exchange_invite/v1.rs

@@ -52,6 +52,6 @@ impl<'a> Request<'a> {
 impl Response {
     /// Creates a new `Response`.
     pub fn new() -> Self {
-        Self
+        Self {}
     }
 }

crates/ruma-identity-service-api/src/authentication/get_account_information/v2.rs

@@ -25,7 +25,7 @@ ruma_api! {
 impl Request {
     /// Creates an empty `Request`.
     pub fn new() -> Self {
-        Self
+        Self {}
     }
 }
 

crates/ruma-identity-service-api/src/authentication/logout/v2.rs

@@ -22,13 +22,13 @@ ruma_api! {
 impl Request {
     /// Creates an empty `Request`.
     pub fn new() -> Self {
-        Self
+        Self {}
     }
 }
 
 impl Response {
     /// Creates an empty `Response`.
     pub fn new() -> Self {
-        Self
+        Self {}
     }
 }

crates/ruma-identity-service-api/src/tos/accept_terms_of_service/v2.rs

@@ -33,6 +33,6 @@ impl Request {
 impl Response {
     /// Creates an empty `Response`.
     pub fn new() -> Self {
-        Self
+        Self {}
     }
 }

crates/ruma-identity-service-api/src/tos/get_terms_of_service/v2.rs

@@ -29,7 +29,7 @@ ruma_api! {
 impl Request {
     /// Creates an empty `Request`.
     pub fn new() -> Self {
-        Self
+        Self {}
     }
 }