msrd0/deprecated-gotham-restful
1
0
Fork 0
mirror of https://gitlab.com/msrd0/gotham-restful.git synced 2025-02-22 20:52:27 +00:00
Code Issues Releases Activity Actions

don't use syn::token module

Browse source
This commit is contained in:
Dominic 2020-05-03 23:25:48 +02:00
parent da30f34d97
commit 5e5e3aaf9d
Signed by: msrd0
GPG key ID: DCC8C247452E98F9
5 changed files with 25 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
gotham_restful_derive/src/from_body.rs
View file

@ -3,17 +3,15 @@ use proc_macro2::TokenStream as TokenStream2;
use quote::{format_ident, quote};
use std::cmp::min;
use syn::{
punctuated::Punctuated,
parse_macro_input,
spanned::Spanned,
token::Comma,
Data,
DeriveInput,
Error,
Field,
Fields,
Ident,
Type,
parse_macro_input
Type
};
pub fn expand_from_body(tokens : TokenStream) -> TokenStream
@ -31,13 +29,17 @@ struct ParsedFields
impl ParsedFields
{
fn from_named(fields : Punctuated<Field, Comma>) -> Result<Self, Error>
fn from_named<I>(fields : I) -> Result<Self, Error>
where
I : Iterator<Item = Field>
{
let fields = fields.into_iter().map(|field| (field.ident.unwrap(), field.ty)).collect();
let fields = fields.map(|field| (field.ident.unwrap(), field.ty)).collect();
Ok(Self { fields, named: true })
}
fn from_unnamed(fields : Punctuated<Field, Comma>) -> Result<Self, Error>
fn from_unnamed<I>(fields : I) -> Result<Self, Error>
where
I : Iterator<Item = Field>
{
let fields = fields.into_iter().enumerate().map(|(i, field)| (format_ident!("arg{}", i), field.ty)).collect();
Ok(Self { fields, named: false })
@ -63,8 +65,8 @@ fn expand(tokens : TokenStream) -> Result<TokenStream2, Error>
}.map_err(|span| Error::new(span, "#[derive(FromBody)] only works for enums"))?;
let fields = match strukt.fields {
Fields::Named(named) => ParsedFields::from_named(named.named)?,
Fields::Unnamed(unnamed) => ParsedFields::from_unnamed(unnamed.unnamed)?,
Fields::Named(named) => ParsedFields::from_named(named.named.into_iter())?,
Fields::Unnamed(unnamed) => ParsedFields::from_unnamed(unnamed.unnamed.into_iter())?,
Fields::Unit => ParsedFields::from_unit()?
};

4
gotham_restful_derive/src/method.rs
View file

@ -4,6 +4,7 @@ use proc_macro::TokenStream;
use proc_macro2::{Ident, Span, TokenStream as TokenStream2};
use quote::{format_ident, quote};
use syn::{
parse_macro_input,
spanned::Spanned,
Attribute,
AttributeArgs,
@ -16,8 +17,7 @@ use syn::{
NestedMeta,
PatType,
ReturnType,
Type,
parse_macro_input
Type
};
use std::str::FromStr;

4
gotham_restful_derive/src/openapi_type.rs
View file

@ -3,6 +3,7 @@ use proc_macro::TokenStream;
use proc_macro2::TokenStream as TokenStream2;
use quote::quote;
use syn::{
parse_macro_input,
spanned::Spanned,
Attribute,
AttributeArgs,
@ -19,8 +20,7 @@ use syn::{
Lit,
Meta,
NestedMeta,
Variant,
parse_macro_input
Variant
};
pub fn expand(tokens : TokenStream) -> TokenStream

10
gotham_restful_derive/src/request_body.rs
View file

@ -4,19 +4,19 @@ use proc_macro2::TokenStream as TokenStream2;
use quote::quote;
use std::iter;
use syn::{
parenthesized,
parse_macro_input,
parse::{Parse, ParseStream, Result as SynResult},
punctuated::Punctuated,
token::Comma,
DeriveInput,
Error,
Generics,
Ident,
Path,
parenthesized,
parse_macro_input
Token
};
struct MimeList(Punctuated<Path, Comma>);
struct MimeList(Punctuated<Path, Token![,]>);
impl Parse for MimeList
{
@ -24,7 +24,7 @@ impl Parse for MimeList
{
let content;
let _paren = parenthesized!(content in input);
let list : Punctuated<Path, Comma> = Punctuated::parse_separated_nonempty(&content)?;
let list = Punctuated::parse_separated_nonempty(&content)?;
Ok(Self(list))
}
}

10
gotham_restful_derive/src/resource.rs
View file

@ -6,18 +6,18 @@ use proc_macro::TokenStream;
use proc_macro2::TokenStream as TokenStream2;
use quote::quote;
use syn::{
parenthesized,
parse_macro_input,
parse::{Parse, ParseStream},
punctuated::Punctuated,
token::Comma,
DeriveInput,
Error,
Ident,
parenthesized,
parse_macro_input
Token
};
use std::{iter, str::FromStr};
struct MethodList(Punctuated<Ident, Comma>);
struct MethodList(Punctuated<Ident, Token![,]>);
impl Parse for MethodList
{
@ -25,7 +25,7 @@ impl Parse for MethodList
{
let content;
let _paren = parenthesized!(content in input);
let list : Punctuated<Ident, Comma> = Punctuated::parse_separated_nonempty(&content)?;
let list = Punctuated::parse_separated_nonempty(&content)?;
Ok(Self(list))
}
}