chris/ruwuma
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

api: Remove NonAuthRequest traits

Browse Source
This commit is contained in:
Jonas Platte 2022-10-22 00:09:59 +02:00
parent 1989e0350d
commit c9bd9bf00b
No known key found for this signature in database
GPG Key ID: 7D261D771D915378
3 changed files with 0 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
crates/ruma-common/src/api.rs
View File

@ -373,12 +373,6 @@ pub trait EndpointError: OutgoingResponse + StdError + Sized + Send + 'static {
) -> Result<Self, error::DeserializationError>; ) -> 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. /// Authentication scheme used by the endpoint.
#[derive(Copy, Clone, Debug, PartialEq, Eq)] #[derive(Copy, Clone, Debug, PartialEq, Eq)]
#[allow(clippy::exhaustive_enums)] #[allow(clippy::exhaustive_enums)]

11
crates/ruma-macros/src/api/request/incoming.rs
View File

@ -3,7 +3,6 @@ use quote::quote;
use syn::Field; use syn::Field;
use super::{Request, RequestField}; use super::{Request, RequestField};
use crate::api::auth_scheme::AuthScheme;
impl Request { impl Request {
pub fn expand_incoming(&self, ruma_common: &TokenStream) -> TokenStream { pub fn expand_incoming(&self, ruma_common: &TokenStream) -> TokenStream {
@ -175,14 +174,6 @@ impl Request {
vars(self.body_fields(), quote! { request_body }) 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! { quote! {
#[automatically_derived] #[automatically_derived]
#[cfg(feature = "server")] #[cfg(feature = "server")]
@ -222,8 +213,6 @@ impl Request {
}) })
} }
} }
#non_auth_impl
} }
} }
} }

11
crates/ruma-macros/src/api/request/outgoing.rs
View File

@ -140,15 +140,6 @@ impl Request {
let (impl_generics, ty_generics, where_clause) = self.generics.split_for_impl(); 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! { quote! {
#[automatically_derived] #[automatically_derived]
#[cfg(feature = "client")] #[cfg(feature = "client")]
@ -182,8 +173,6 @@ impl Request {
Ok(http_request) Ok(http_request)
} }
} }
#non_auth_impl
} }
} }
} }