NationTech/yaserde
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update dependencies with 1.0 releases

Browse Source
This commit is contained in:
Marc-Antoine Arnaud
2019-10-08 09:04:00 +02:00
parent 64122a9e64
commit dd5ca6df6b
4 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
yaserde_derive/src/attribute.rs
View File

@@ -40,7 +40,7 @@ impl YaSerdeAttribute {
let mut text = false;
for attr in attrs.iter() {
let mut attr_iter = attr.clone().tts.into_iter();
let mut attr_iter = attr.clone().tokens.into_iter();
if let Some(token) = attr_iter.next() {
if let TokenTree::Group(group) = token {
if group.delimiter() == Delimiter::Parenthesis {
@@ -146,7 +146,7 @@ fn parse_attributes() {
leading_colon: None,
segments: punctuated,
},
tts: TokenStream::from_str("(attribute)").unwrap(),
tokens: TokenStream::from_str("(attribute)").unwrap(),
}];
let attrs = YaSerdeAttribute::parse(&attributes);

7
yaserde_derive/src/field_type.rs
View File

@@ -1,5 +1,4 @@
use syn;
use syn::punctuated::Pair;
use syn::Type::Path;
#[derive(Debug)]
@@ -56,7 +55,7 @@ pub fn get_field_type(field: &syn::Field) -> Option<FieldType> {
return None;
}
match path.path.segments.first() {
Some(Pair::End(t)) => FieldType::from_ident(t),
Some(path_segment) => FieldType::from_ident(path_segment),
_ => None,
}
}
@@ -66,10 +65,10 @@ pub fn get_field_type(field: &syn::Field) -> Option<FieldType> {
fn get_sub_type(t: &syn::PathSegment) -> Option<syn::PathSegment> {
if let syn::PathArguments::AngleBracketed(ref args) = t.arguments {
if let Some(Pair::End(tt)) = args.args.first() {
if let Some(tt) = args.args.first() {
if let syn::GenericArgument::Type(ref argument) = *tt {
if let Path(ref path2) = *argument {
if let Some(Pair::End(ttt)) = path2.path.segments.first() {
if let Some(ttt) = path2.path.segments.first() {
return Some(ttt.clone());
}
}