diff --git a/crates/ruma-common/tests/api/path_arg_ordering.rs b/crates/ruma-common/tests/api/path_arg_ordering.rs index e3d4cd2c..8cff98dc 100644 --- a/crates/ruma-common/tests/api/path_arg_ordering.rs +++ b/crates/ruma-common/tests/api/path_arg_ordering.rs @@ -1,4 +1,4 @@ -use ruma_common::api::{ruma_api, IncomingRequest}; +use ruma_common::api::{ruma_api, IncomingRequest as _}; ruma_api! { metadata: { diff --git a/crates/ruma-common/tests/api/ui/05-request-only.rs b/crates/ruma-common/tests/api/ui/05-request-only.rs index 12511b10..7cb3e49a 100644 --- a/crates/ruma-common/tests/api/ui/05-request-only.rs +++ b/crates/ruma-common/tests/api/ui/05-request-only.rs @@ -1,10 +1,7 @@ use bytes::BufMut; -use ruma_common::{ - api::{ - error::{FromHttpResponseError, IntoHttpError, MatrixError}, - ruma_api, IncomingResponse, OutgoingResponse, - }, - serde::Incoming, +use ruma_common::api::{ + error::{FromHttpResponseError, IntoHttpError, MatrixError}, + ruma_api, IncomingResponse, OutgoingResponse, }; ruma_api! { @@ -25,7 +22,6 @@ ruma_api! { } } -#[derive(Incoming)] pub struct Response; impl IncomingResponse for Response { diff --git a/crates/ruma-macros/src/serde/incoming.rs b/crates/ruma-macros/src/serde/incoming.rs index d621c771..096ef053 100644 --- a/crates/ruma-macros/src/serde/incoming.rs +++ b/crates/ruma-macros/src/serde/incoming.rs @@ -5,8 +5,8 @@ use syn::{ parse_quote, punctuated::Punctuated, AngleBracketedGenericArguments, Attribute, Data, DeriveInput, GenericArgument, GenericParam, - Generics, Ident, ParenthesizedGenericArguments, Path, PathArguments, Token, Type, TypePath, - TypeReference, TypeSlice, + Generics, Ident, ItemType, ParenthesizedGenericArguments, Path, PathArguments, Token, Type, + TypePath, TypeReference, TypeSlice, }; use crate::util::import_ruma_common; @@ -38,8 +38,25 @@ pub fn expand_derive_incoming(mut ty_def: DeriveInput) -> syn::Result syn::Result