diff --git a/crates/ruma-macros/src/api/request.rs b/crates/ruma-macros/src/api/request.rs index 1b393b5f..0bc828cf 100644 --- a/crates/ruma-macros/src/api/request.rs +++ b/crates/ruma-macros/src/api/request.rs @@ -154,13 +154,6 @@ impl Request { self.fields.iter().any(|f| matches!(&f.kind, RequestFieldKind::Query)) } - fn has_lifetimes(&self) -> bool { - !(self.lifetimes.body.is_empty() - && self.lifetimes.path.is_empty() - && self.lifetimes.query.is_empty() - && self.lifetimes.header.is_empty()) - } - fn header_fields(&self) -> impl Iterator { self.fields.iter().filter_map(RequestField::as_header_field) } diff --git a/crates/ruma-macros/src/api/request/incoming.rs b/crates/ruma-macros/src/api/request/incoming.rs index ee909034..ed7737b9 100644 --- a/crates/ruma-macros/src/api/request/incoming.rs +++ b/crates/ruma-macros/src/api/request/incoming.rs @@ -12,12 +12,6 @@ impl Request { let error_ty = &self.error_ty; - let incoming_request_type = if self.has_lifetimes() { - quote! { IncomingRequest } - } else { - quote! { Request } - }; - // FIXME: the rest of the field initializer expansions are gated `cfg(...)` // except this one. If we get errors about missing fields in IncomingRequest for // a path field look here. @@ -179,7 +173,7 @@ impl Request { quote! { #[automatically_derived] #[cfg(feature = "server")] - impl #ruma_common::api::IncomingRequest for #incoming_request_type { + impl #ruma_common::api::IncomingRequest for IncomingRequest { type EndpointError = #error_ty; type OutgoingResponse = Response;