From b7c47c9e706eb158b65b24391031e88340a496c4 Mon Sep 17 00:00:00 2001
From: Jonas Platte <jplatte@matrix.org>
Date: Mon, 31 Oct 2022 09:57:42 +0100
Subject: [PATCH] macros: Always implement IncomingRequest trait on
 IncomingRequest type
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

… rather than the `Request` type, even if `IncomingRequest` is a type
alias for it.

This (only) affects where the implementation is shown in the
documentation.
---
 crates/ruma-macros/src/api/request.rs          | 7 -------
 crates/ruma-macros/src/api/request/incoming.rs | 8 +-------
 2 files changed, 1 insertion(+), 14 deletions(-)

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<Item = (&Field, &Ident)> {
         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;