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

macros: Remove unnecessary type distinction

Browse Source
This commit is contained in:
Jonas Platte 2022-10-31 10:00:50 +01:00
parent b7c47c9e70
commit af97ddaa58
No known key found for this signature in database
GPG Key ID: AAA7A61F696C3E0C
1 changed files with 5 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -55,16 +55,11 @@ impl Request {
quote! { request_query }, quote! { request_query },
); );
let request_query_ty = if self.lifetimes.query.is_empty() {
quote! { RequestQuery }
} else {
quote! { IncomingRequestQuery }
};
let parse = quote! { let parse = quote! {
let request_query: #request_query_ty = #ruma_common::serde::urlencoded::from_str( let request_query: IncomingRequestQuery =
&request.uri().query().unwrap_or("") #ruma_common::serde::urlencoded::from_str(
)?; &request.uri().query().unwrap_or("")
)?;
#decls #decls
}; };
@ -135,14 +130,8 @@ impl Request {
}; };
let extract_body = self.has_body_fields().then(|| { let extract_body = self.has_body_fields().then(|| {
let request_body_ty = if self.lifetimes.body.is_empty() {
quote! { RequestBody }
} else {
quote! { IncomingRequestBody }
};
quote! { quote! {
let request_body: #request_body_ty = { let request_body: IncomingRequestBody = {
let body = ::std::convert::AsRef::<[::std::primitive::u8]>::as_ref( let body = ::std::convert::AsRef::<[::std::primitive::u8]>::as_ref(
request.body(), request.body(),
); );