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

2
yaserde/src/ser/mod.rs
View File

@@ -12,7 +12,7 @@ pub fn to_string<T: YaSerialize>(model: &T) -> Result<String, String> {
Ok(String::from(data)) Ok(String::from(data))
} }
pub fn to_string_with_config<T: YaSerialize>(model: &T, config: &Config) -> Result<String, String> { pub fn to_string_with_config<T: YaSerialize>(model: &T, _config: &Config) -> Result<String, String> {
let buf = Cursor::new(Vec::new()); let buf = Cursor::new(Vec::new());
let cursor = serialize_with_writer(model, buf)?; let cursor = serialize_with_writer(model, buf)?;
let data = str::from_utf8(cursor.get_ref()).expect("Found invalid UTF-8"); let data = str::from_utf8(cursor.get_ref()).expect("Found invalid UTF-8");

6
yaserde_derive/Cargo.toml
View File

@@ -11,9 +11,9 @@ documentation = "https://docs.rs/yaserde"
readme = "../README.md" readme = "../README.md"
[dependencies] [dependencies]
syn = { version = "0.15.22", features = ["visit", "extra-traits"] } syn = { version = "1.0.5", features = ["visit", "extra-traits"] }
proc-macro2 = "0.4.24" proc-macro2 = "1.0.5"
quote = "0.6.10" quote = "1.0.2"
[lib] [lib]
name = "yaserde_derive" name = "yaserde_derive"

4
yaserde_derive/src/attribute.rs
View File

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

7
yaserde_derive/src/field_type.rs
View File

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