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

Merge pull request #17 from ruma/quote-refactor

Browse Source 
Remove remaining uses of quote::TokenStreamExt
This commit is contained in:
Jimmy Cuadra 2019-04-26 15:14:21 -07:00 committed by GitHub
commit 8761081f26
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/api/mod.rs
View File

@ -1,5 +1,5 @@
use proc_macro2::{Span, TokenStream}; use proc_macro2::{Span, TokenStream};
use quote::{quote, ToTokens, TokenStreamExt}; use quote::{quote, ToTokens};
use syn::{ use syn::{
braced, braced,
parse::{Parse, ParseStream, Result}, parse::{Parse, ParseStream, Result},
@ -325,7 +325,7 @@ impl ToTokens for Api {
} }
}; };
tokens.append_all(quote! { let api = quote! {
#[allow(unused_imports)] #[allow(unused_imports)]
use ::futures::{Future as _Future, IntoFuture as _IntoFuture, Stream as _Stream}; use ::futures::{Future as _Future, IntoFuture as _IntoFuture, Stream as _Stream};
use ::ruma_api::Endpoint as _RumaApiEndpoint; use ::ruma_api::Endpoint as _RumaApiEndpoint;
@ -459,7 +459,9 @@ impl ToTokens for Api {
requires_authentication: #requires_authentication, requires_authentication: #requires_authentication,
}; };
} }
}); };
api.to_tokens(tokens);
} }
} }

8
src/api/request.rs
View File

@ -1,5 +1,5 @@
use proc_macro2::{Span, TokenStream}; use proc_macro2::{Span, TokenStream};
use quote::{quote, quote_spanned, ToTokens, TokenStreamExt}; use quote::{quote, quote_spanned, ToTokens};
use syn::{spanned::Spanned, Field, Ident, Lit, Meta, NestedMeta}; use syn::{spanned::Spanned, Field, Ident, Lit, Meta, NestedMeta};
use crate::api::strip_serde_attrs; use crate::api::strip_serde_attrs;
@ -333,13 +333,15 @@ impl ToTokens for Request {
TokenStream::new() TokenStream::new()
}; };
tokens.append_all(quote! { let request = quote! {
#request_struct_header #request_struct_header
#request_struct_body #request_struct_body
#request_body_struct #request_body_struct
#request_path_struct #request_path_struct
#request_query_struct #request_query_struct
}); };
request.to_tokens(tokens);
} }
} }

8
src/api/response.rs
View File

@ -1,5 +1,5 @@
use proc_macro2::{Span, TokenStream}; use proc_macro2::{Span, TokenStream};
use quote::{quote, quote_spanned, ToTokens, TokenStreamExt}; use quote::{quote, quote_spanned, ToTokens};
use syn::{spanned::Spanned, Field, Ident, Lit, Meta, NestedMeta}; use syn::{spanned::Spanned, Field, Ident, Lit, Meta, NestedMeta};
use crate::api::strip_serde_attrs; use crate::api::strip_serde_attrs;
@ -281,11 +281,13 @@ impl ToTokens for Response {
TokenStream::new() TokenStream::new()
}; };
tokens.append_all(quote! { let response = quote! {
#response_struct_header #response_struct_header
#response_struct_body #response_struct_body
#response_body_struct #response_body_struct
}); };
response.to_tokens(tokens);
} }
} }