From 1060d63057c6a4d0d965851970e466b7e4bc61c8 Mon Sep 17 00:00:00 2001 From: Devin Ragotzy Date: Thu, 6 Aug 2020 16:53:56 -0400 Subject: [PATCH] Use full type with Outgoing trait for request query deserialization --- ruma-api-macros/src/util.rs | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/ruma-api-macros/src/util.rs b/ruma-api-macros/src/util.rs index 2de19b79..a9c38819 100644 --- a/ruma-api-macros/src/util.rs +++ b/ruma-api-macros/src/util.rs @@ -218,13 +218,8 @@ pub(crate) fn extract_request_query(request: &Request) -> TokenStream { ); } } else if request.has_query_fields() { - let request_query_type = if request.has_query_lifetimes() { - quote! { IncomingRequestQuery } - } else { - quote! { RequestQuery } - }; quote! { - let request_query: #request_query_type = ::ruma_api::try_deserialize!( + let request_query: ::Incoming = ::ruma_api::try_deserialize!( request, ::ruma_api::exports::ruma_serde::urlencoded::from_str( &request.uri().query().unwrap_or("")