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

Update formatting in quote! invocations

Browse Source
This commit is contained in:
Jonas Platte 2019-11-11 23:06:21 +01:00
parent d6f1926832
commit 68aaa59eda
No known key found for this signature in database
GPG Key ID: 7D261D771D915378
2 changed files with 34 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
ruma-api-macros/src/api/mod.rs
View File

@ -136,7 +136,9 @@ impl ToTokens for Api {
#request_query_init_fields #request_query_init_fields
}; };
url.set_query(Some(&ruma_api::exports::serde_urlencoded::to_string(request_query)?)); url.set_query(Some(&ruma_api::exports::serde_urlencoded::to_string(
request_query,
)?));
} }
} else { } else {
TokenStream::new() TokenStream::new()
@ -161,7 +163,9 @@ impl ToTokens for Api {
quote! { quote! {
let request_body = RequestBody(request.#field_name); let request_body = RequestBody(request.#field_name);
let mut http_request = ruma_api::exports::http::Request::new(ruma_api::exports::serde_json::to_vec(&request_body)?); let mut http_request = ruma_api::exports::http::Request::new(
ruma_api::exports::serde_json::to_vec(&request_body)?,
);
} }
} else if self.request.has_body_fields() { } else if self.request.has_body_fields() {
let request_body_init_fields = self.request.request_body_init_fields(); let request_body_init_fields = self.request.request_body_init_fields();
@ -171,7 +175,9 @@ impl ToTokens for Api {
#request_body_init_fields #request_body_init_fields
}; };
let mut http_request = ruma_api::exports::http::Request::new(ruma_api::exports::serde_json::to_vec(&request_body)?); let mut http_request = ruma_api::exports::http::Request::new(
ruma_api::exports::serde_json::to_vec(&request_body)?,
);
} }
} else { } else {
quote! { quote! {
@ -184,11 +190,15 @@ impl ToTokens for Api {
let field_type = &field.ty; let field_type = &field.ty;
quote! { quote! {
ruma_api::exports::serde_json::from_slice::<#field_type>(http_response.into_body().as_slice())? ruma_api::exports::serde_json::from_slice::<#field_type>(
http_response.into_body().as_slice(),
)?
} }
} else if self.response.has_body_fields() { } else if self.response.has_body_fields() {
quote! { quote! {
ruma_api::exports::serde_json::from_slice::<ResponseBody>(http_response.into_body().as_slice())? ruma_api::exports::serde_json::from_slice::<ResponseBody>(
http_response.into_body().as_slice(),
)?
} }
} else { } else {
quote! { quote! {
@ -218,11 +228,11 @@ impl ToTokens for Api {
let response_doc = format!("Data in the response from the `{}` API endpoint.", name); let response_doc = format!("Data in the response from the `{}` API endpoint.", name);
let api = quote! { let api = quote! {
use ruma_api::Endpoint as _;
use ruma_api::exports::serde::Deserialize as _;
use ruma_api::exports::serde::de::{Error as _, IntoDeserializer as _}; use ruma_api::exports::serde::de::{Error as _, IntoDeserializer as _};
use ruma_api::exports::serde::Deserialize as _;
use ruma_api::Endpoint as _;
use std::convert::{TryInto as _}; use std::convert::TryInto as _;
#[doc = #request_doc] #[doc = #request_doc]
#request_types #request_types
@ -237,7 +247,9 @@ impl ToTokens for Api {
// Use dummy homeserver url which has to be overwritten in // Use dummy homeserver url which has to be overwritten in
// the calling code. Previously (with http::Uri) this was // the calling code. Previously (with http::Uri) this was
// not required, but Url::parse only accepts absolute urls. // not required, but Url::parse only accepts absolute urls.
let mut url = ruma_api::exports::url::Url::parse("http://invalid-host-please-change/").unwrap(); let mut url =
ruma_api::exports::url::Url::parse("http://invalid-host-please-change/")
.unwrap();
{ #set_request_path } { #set_request_path }
{ #set_request_query } { #set_request_query }
@ -260,7 +272,9 @@ impl ToTokens for Api {
type Error = ruma_api::Error; type Error = ruma_api::Error;
#[allow(unused_variables)] #[allow(unused_variables)]
fn try_from(http_response: ruma_api::exports::http::Response<Vec<u8>>) -> Result<Self, Self::Error> { fn try_from(
http_response: ruma_api::exports::http::Response<Vec<u8>>,
) -> Result<Self, Self::Error> {
if http_response.status().is_success() { if http_response.status().is_success() {
#extract_response_headers #extract_response_headers

12
ruma-api-macros/src/api/request.rs
View File

@ -259,7 +259,11 @@ impl ToTokens for Request {
quote! { quote! {
/// Data in the request path. /// Data in the request path.
#[derive(Debug, ruma_api::exports::serde::Deserialize, ruma_api::exports::serde::Serialize)] #[derive(
Debug,
ruma_api::exports::serde::Deserialize,
ruma_api::exports::serde::Serialize,
)]
struct RequestPath { struct RequestPath {
#(#fields),* #(#fields),*
} }
@ -282,7 +286,11 @@ impl ToTokens for Request {
quote! { quote! {
/// Data in the request's query string. /// Data in the request's query string.
#[derive(Debug, ruma_api::exports::serde::Deserialize, ruma_api::exports::serde::Serialize)] #[derive(
Debug,
ruma_api::exports::serde::Deserialize,
ruma_api::exports::serde::Serialize,
)]
struct RequestQuery { struct RequestQuery {
#(#fields),* #(#fields),*
} }