From c9bd9bf00b7049ae9c2e2152e9fe9e6b4604f466 Mon Sep 17 00:00:00 2001
From: Jonas Platte <jplatte+git@posteo.de>
Date: Sat, 22 Oct 2022 00:09:59 +0200
Subject: [PATCH] api: Remove NonAuthRequest traits

---
 crates/ruma-common/src/api.rs                  |  6 ------
 crates/ruma-macros/src/api/request/incoming.rs | 11 -----------
 crates/ruma-macros/src/api/request/outgoing.rs | 11 -----------
 3 files changed, 28 deletions(-)

diff --git a/crates/ruma-common/src/api.rs b/crates/ruma-common/src/api.rs
index b08d09db..743d0d1e 100644
--- a/crates/ruma-common/src/api.rs
+++ b/crates/ruma-common/src/api.rs
@@ -373,12 +373,6 @@ pub trait EndpointError: OutgoingResponse + StdError + Sized + Send + 'static {
     ) -> Result<Self, error::DeserializationError>;
 }
 
-/// Marker trait for requests that don't require authentication, for the client side.
-pub trait OutgoingNonAuthRequest: OutgoingRequest {}
-
-/// Marker trait for requests that don't require authentication, for the server side.
-pub trait IncomingNonAuthRequest: IncomingRequest {}
-
 /// Authentication scheme used by the endpoint.
 #[derive(Copy, Clone, Debug, PartialEq, Eq)]
 #[allow(clippy::exhaustive_enums)]
diff --git a/crates/ruma-macros/src/api/request/incoming.rs b/crates/ruma-macros/src/api/request/incoming.rs
index 8c13c79b..50cefb29 100644
--- a/crates/ruma-macros/src/api/request/incoming.rs
+++ b/crates/ruma-macros/src/api/request/incoming.rs
@@ -3,7 +3,6 @@ use quote::quote;
 use syn::Field;
 
 use super::{Request, RequestField};
-use crate::api::auth_scheme::AuthScheme;
 
 impl Request {
     pub fn expand_incoming(&self, ruma_common: &TokenStream) -> TokenStream {
@@ -175,14 +174,6 @@ impl Request {
             vars(self.body_fields(), quote! { request_body })
         };
 
-        let non_auth_impl = matches!(self.authentication, AuthScheme::None(_)).then(|| {
-            quote! {
-                #[automatically_derived]
-                #[cfg(feature = "server")]
-                impl #ruma_common::api::IncomingNonAuthRequest for #incoming_request_type {}
-            }
-        });
-
         quote! {
             #[automatically_derived]
             #[cfg(feature = "server")]
@@ -222,8 +213,6 @@ impl Request {
                     })
                 }
             }
-
-            #non_auth_impl
         }
     }
 }
diff --git a/crates/ruma-macros/src/api/request/outgoing.rs b/crates/ruma-macros/src/api/request/outgoing.rs
index 52114a13..93ef47aa 100644
--- a/crates/ruma-macros/src/api/request/outgoing.rs
+++ b/crates/ruma-macros/src/api/request/outgoing.rs
@@ -140,15 +140,6 @@ impl Request {
 
         let (impl_generics, ty_generics, where_clause) = self.generics.split_for_impl();
 
-        let non_auth_impl = matches!(self.authentication, AuthScheme::None(_)).then(|| {
-            quote! {
-                #[automatically_derived]
-                #[cfg(feature = "client")]
-                impl #impl_generics #ruma_common::api::OutgoingNonAuthRequest
-                    for Request #ty_generics #where_clause {}
-            }
-        });
-
         quote! {
             #[automatically_derived]
             #[cfg(feature = "client")]
@@ -182,8 +173,6 @@ impl Request {
                     Ok(http_request)
                 }
             }
-
-            #non_auth_impl
         }
     }
 }