format code

.travis.yml

@@ -1,9 +1,10 @@
 language: rust
 rust:
-  - 1.23.0
-  - 1.24.0
-  - 1.25.0
   - 1.26.0
+  - 1.27.0
+  - 1.28.0
+  - 1.29.0
+  - 1.30.0
   - stable
   - beta
   - nightly

yaserde/src/de/mod.rs

@@ -1,6 +1,6 @@
 use std::io::Read;
-use xml::reader::{EventReader, ParserConfig, XmlEvent};
 use xml::name::OwnedName;
+use xml::reader::{EventReader, ParserConfig, XmlEvent};
 use YaDeserialize;
 
 pub fn from_str<T: YaDeserialize>(s: &str) -> Result<T, String> {

yaserde/src/ser/mod.rs

@@ -1,8 +1,8 @@
-use std::str;
 use std::io::{Cursor, Write};
-use xml::{EmitterConfig, EventWriter};
+use std::str;
 use xml;
 use xml::writer::XmlEvent;
+use xml::{EmitterConfig, EventWriter};
 use YaSerialize;
 
 pub fn to_string<T: YaSerialize>(model: &T) -> Result<String, String> {

yaserde/tests/der_namespace.rs

@@ -6,8 +6,8 @@ extern crate yaserde;
 extern crate yaserde_derive;
 
 use std::io::Read;
-use yaserde::YaDeserialize;
 use yaserde::de::from_str;
+use yaserde::YaDeserialize;
 
 macro_rules! convert_and_validate {
   ($content: expr, $struct: tt, $model: expr) => {
@@ -19,7 +19,11 @@ macro_rules! convert_and_validate {
 #[test]
 fn de_struct_namespace() {
   #[derive(YaDeserialize, PartialEq, Debug)]
-  #[yaserde(root = "book", prefix = "ns", namespace = "ns: http://www.sample.com/ns/domain")]
+  #[yaserde(
+    root = "book",
+    prefix = "ns",
+    namespace = "ns: http://www.sample.com/ns/domain"
+  )]
   pub struct Book {
     #[yaserde(prefix = "ns")]
     author: String,
@@ -45,7 +49,11 @@ fn de_struct_namespace() {
 #[test]
 fn de_enum_namespace() {
   #[derive(YaDeserialize, PartialEq, Debug)]
-  #[yaserde(root = "root", prefix = "ns", namespace = "ns: http://www.sample.com/ns/domain")]
+  #[yaserde(
+    root = "root",
+    prefix = "ns",
+    namespace = "ns: http://www.sample.com/ns/domain"
+  )]
   pub enum XmlStruct {
     #[yaserde(prefix = "ns")]
     Item,

yaserde/tests/der_option.rs

@@ -6,8 +6,8 @@ extern crate yaserde;
 extern crate yaserde_derive;
 
 use std::io::Read;
-use yaserde::YaDeserialize;
 use yaserde::de::from_str;
+use yaserde::YaDeserialize;
 
 macro_rules! convert_and_validate {
   ($type: ty, $value: expr, $content: expr) => {{
@@ -20,7 +20,8 @@ macro_rules! convert_and_validate {
     let model = Data { item: $value };
 
     let source = if let Some(content) = $content {
-      String::from("<?xml version=\"1.0\" encoding=\"utf-8\"?><data><item>") + content
+      String::from("<?xml version=\"1.0\" encoding=\"utf-8\"?><data><item>")
+        + content
         + "</item></data>"
     } else {
       String::from("<?xml version=\"1.0\" encoding=\"utf-8\"?><data />")
@@ -43,7 +44,8 @@ macro_rules! convert_and_validate_for_attribute {
     let model = Data { item: $value };
 
     let source = if let Some(content) = $content {
-      String::from("<?xml version=\"1.0\" encoding=\"utf-8\"?><data item=\"") + content
+      String::from("<?xml version=\"1.0\" encoding=\"utf-8\"?><data item=\"")
+        + content
         + "\"></data>"
     } else {
       String::from("<?xml version=\"1.0\" encoding=\"utf-8\"?><data />")

yaserde/tests/der_type.rs

@@ -6,8 +6,8 @@ extern crate yaserde;
 extern crate yaserde_derive;
 
 use std::io::Read;
-use yaserde::YaDeserialize;
 use yaserde::de::from_str;
+use yaserde::YaDeserialize;
 
 macro_rules! convert_and_validate {
   ($type:ty, $value:expr, $content:expr) => {{
@@ -19,7 +19,8 @@ macro_rules! convert_and_validate {
 
     let model = Data { item: $value };
 
-    let content = String::from("<?xml version=\"1.0\" encoding=\"utf-8\"?><data><item>") + $content
+    let content = String::from("<?xml version=\"1.0\" encoding=\"utf-8\"?><data><item>")
+      + $content
       + "</item></data>";
 
     let loaded: Result<Data, String> = from_str(&content);

yaserde/tests/deserializer.rs

@@ -6,8 +6,8 @@ extern crate yaserde;
 extern crate yaserde_derive;
 
 use std::io::Read;
-use yaserde::YaDeserialize;
 use yaserde::de::from_str;
+use yaserde::YaDeserialize;
 
 macro_rules! convert_and_validate {
   ($content: expr, $struct: tt, $model: expr) => {

yaserde/tests/errors.rs

@@ -6,8 +6,8 @@ extern crate yaserde;
 extern crate yaserde_derive;
 
 use std::io::Read;
-use yaserde::YaDeserialize;
 use yaserde::de::from_str;
+use yaserde::YaDeserialize;
 
 #[test]
 fn de_no_content() {

yaserde/tests/se_namespace.rs

@@ -6,8 +6,8 @@ extern crate yaserde;
 extern crate yaserde_derive;
 
 use std::io::Write;
-use yaserde::YaSerialize;
 use yaserde::ser::to_string;
+use yaserde::YaSerialize;
 
 macro_rules! convert_and_validate {
   ($model:expr, $content:expr) => {
@@ -19,7 +19,11 @@ macro_rules! convert_and_validate {
 #[test]
 fn ser_struct_namespace() {
   #[derive(YaSerialize, PartialEq, Debug)]
-  #[yaserde(root = "root", prefix = "ns", namespace = "ns: http://www.sample.com/ns/domain")]
+  #[yaserde(
+    root = "root",
+    prefix = "ns",
+    namespace = "ns: http://www.sample.com/ns/domain"
+  )]
   pub struct XmlStruct {
     #[yaserde(prefix = "ns")]
     item: String,
@@ -36,7 +40,11 @@ fn ser_struct_namespace() {
 #[test]
 fn ser_enum_namespace() {
   #[derive(YaSerialize, PartialEq, Debug)]
-  #[yaserde(root = "root", prefix = "ns", namespace = "ns: http://www.sample.com/ns/domain")]
+  #[yaserde(
+    root = "root",
+    prefix = "ns",
+    namespace = "ns: http://www.sample.com/ns/domain"
+  )]
   pub enum XmlStruct {
     #[yaserde(prefix = "ns")]
     Item,
@@ -51,8 +59,11 @@ fn ser_enum_namespace() {
 #[test]
 fn ser_struct_multi_namespace() {
   #[derive(YaSerialize, PartialEq, Debug)]
-  #[yaserde(root = "root", namespace = "ns1: http://www.sample.com/ns/domain1",
+  #[yaserde(
-            namespace = "ns2: http://www.sample.com/ns/domain2")]
+    root = "root",
+    namespace = "ns1: http://www.sample.com/ns/domain1",
+    namespace = "ns2: http://www.sample.com/ns/domain2"
+  )]
   pub struct XmlStruct {
     #[yaserde(prefix = "ns1")]
     item_1: String,
@@ -72,8 +83,11 @@ fn ser_struct_multi_namespace() {
 #[test]
 fn ser_enum_multi_namespace() {
   #[derive(YaSerialize, PartialEq, Debug)]
-  #[yaserde(root = "root", namespace = "ns1: http://www.sample.com/ns/domain1",
+  #[yaserde(
-            namespace = "ns2: http://www.sample.com/ns/domain2")]
+    root = "root",
+    namespace = "ns1: http://www.sample.com/ns/domain1",
+    namespace = "ns2: http://www.sample.com/ns/domain2"
+  )]
   pub enum XmlStruct {
     #[yaserde(prefix = "ns1")]
     Item1,
@@ -92,8 +106,11 @@ fn ser_enum_multi_namespace() {
 #[test]
 fn ser_struct_attribute_namespace() {
   #[derive(YaSerialize, PartialEq, Debug)]
-  #[yaserde(root = "root", namespace = "ns1: http://www.sample.com/ns/domain1",
+  #[yaserde(
-            namespace = "ns2: http://www.sample.com/ns/domain2")]
+    root = "root",
+    namespace = "ns1: http://www.sample.com/ns/domain1",
+    namespace = "ns2: http://www.sample.com/ns/domain2"
+  )]
   pub struct XmlStruct {
     #[yaserde(prefix = "ns1")]
     item_1: String,
@@ -113,8 +130,11 @@ fn ser_struct_attribute_namespace() {
 #[test]
 fn ser_struct_default_namespace() {
   #[derive(YaSerialize, PartialEq, Debug)]
-  #[yaserde(root = "tt", namespace = "http://www.w3.org/ns/ttml",
+  #[yaserde(
-            namespace = "ttm: http://www.w3.org/ns/ttml#metadata")]
+    root = "tt",
+    namespace = "http://www.w3.org/ns/ttml",
+    namespace = "ttm: http://www.w3.org/ns/ttml#metadata"
+  )]
   pub struct XmlStruct {
     item: String,
   }

yaserde/tests/se_option.rs

@@ -6,8 +6,8 @@ extern crate yaserde;
 extern crate yaserde_derive;
 
 use std::io::Write;
-use yaserde::YaSerialize;
 use yaserde::ser::to_string;
+use yaserde::YaSerialize;
 
 macro_rules! convert_and_validate {
   ($type: ty, $value: expr, $content: expr) => {{

yaserde/tests/se_type.rs

@@ -6,8 +6,8 @@ extern crate yaserde;
 extern crate yaserde_derive;
 
 use std::io::Write;
-use yaserde::YaSerialize;
 use yaserde::ser::to_string;
+use yaserde::YaSerialize;
 
 macro_rules! convert_and_validate {
   ($type: ty, $value: expr, $content: expr) => {{
@@ -22,7 +22,8 @@ macro_rules! convert_and_validate {
     let content = if $content == "" {
       String::from("<?xml version=\"1.0\" encoding=\"utf-8\"?><data />")
     } else {
-        String::from("<?xml version=\"1.0\" encoding=\"utf-8\"?><data><item>") + $content
+      String::from("<?xml version=\"1.0\" encoding=\"utf-8\"?><data><item>")
+        + $content
         + "</item></data>"
     };
     assert_eq!(data, Ok(content));

yaserde/tests/serializer.rs

@@ -6,8 +6,8 @@ extern crate yaserde;
 extern crate yaserde_derive;
 
 use std::io::Write;
-use yaserde::YaSerialize;
 use yaserde::ser::to_string;
+use yaserde::YaSerialize;
 
 macro_rules! convert_and_validate {
   ($model: expr, $content: expr) => {

yaserde_derive/src/attribute.rs

@@ -1,6 +1,6 @@
-use proc_macro2::TokenTree;
-use proc_macro2::Delimiter;
 use proc_macro2::token_stream::IntoIter;
+use proc_macro2::Delimiter;
+use proc_macro2::TokenTree;
 use std::collections::BTreeMap;
 use syn::Attribute;
 

yaserde_derive/src/de/expand_enum.rs

@@ -1,11 +1,11 @@
 use attribute::*;
 use field_type::*;
+use proc_macro2::{Span, TokenStream};
 use quote::TokenStreamExt;
 use std::collections::BTreeMap;
+use syn::DataEnum;
 use syn::Fields;
 use syn::Ident;
-use syn::DataEnum;
-use proc_macro2::{Span, TokenStream};
 
 pub fn parse(
   data_enum: &DataEnum,

yaserde_derive/src/de/expand_struct.rs

@@ -1,10 +1,10 @@
 use attribute::*;
 use field_type::*;
+use proc_macro2::{Span, TokenStream};
 use quote::TokenStreamExt;
 use std::collections::BTreeMap;
-use syn::Ident;
 use syn::DataStruct;
-use proc_macro2::{Span, TokenStream};
+use syn::Ident;
 
 pub fn parse(
   data_struct: &DataStruct,

yaserde_derive/src/field_type.rs

@@ -36,20 +36,15 @@ impl FieldType {
       "u64" => Some(FieldType::FieldTypeU64),
       "f32" => Some(FieldType::FieldTypeF32),
       "f64" => Some(FieldType::FieldTypeF64),
-      "Option" => get_sub_type(t).map(|data_type| {
+      "Option" => get_sub_type(t).map(|data_type| FieldType::FieldTypeOption {
-        FieldType::FieldTypeOption {
         data_type: Box::new(FieldType::from_ident(&data_type).unwrap()),
-        }
       }),
-      "Vec" => get_sub_type(t).map(|data_type| {
+      "Vec" => get_sub_type(t).map(|data_type| FieldType::FieldTypeVec {
-        FieldType::FieldTypeVec {
         data_type: Box::new(FieldType::from_ident(&data_type).unwrap()),
-        }
       }),
-      _struct_name => {
+      _struct_name => Some(FieldType::FieldTypeStruct {
-        Some(FieldType::FieldTypeStruct {
         struct_name: t.ident.clone(),
-      })},
+      }),
     }
   }
 }
@@ -62,11 +57,9 @@ pub fn get_field_type(field: &syn::Field) -> Option<FieldType> {
       }
       match path.path.segments.first() {
         Some(Pair::End(t)) => FieldType::from_ident(t),
-        _ => {
+        _ => None,
-          None
+      }
-        },
     }
-    },
     _ => None,
   }
 }

yaserde_derive/src/lib.rs

@@ -7,8 +7,8 @@ extern crate quote;
 extern crate syn;
 
 mod attribute;
-mod field_type;
 mod de;
+mod field_type;
 mod ser;
 
 use proc_macro::TokenStream;

yaserde_derive/src/ser/expand_enum.rs

@@ -1,11 +1,11 @@
 use attribute::*;
 use field_type::*;
+use proc_macro2::{Span, TokenStream};
 use quote::TokenStreamExt;
 use std::collections::BTreeMap;
+use syn::DataEnum;
 use syn::Fields;
 use syn::Ident;
-use syn::DataEnum;
-use proc_macro2::{Span, TokenStream};
 
 pub fn serialize(
   data_enum: &DataEnum,

yaserde_derive/src/ser/expand_struct.rs

@@ -1,11 +1,11 @@
 use attribute::*;
 use field_type::*;
+use proc_macro2::{Span, TokenStream};
 use quote::TokenStreamExt;
 use std::collections::BTreeMap;
-use syn::Ident;
-use syn::DataStruct;
-use proc_macro2::{Span, TokenStream};
 use std::string::ToString;
+use syn::DataStruct;
+use syn::Ident;
 
 pub fn serialize(
   data_struct: &DataStruct,
@@ -93,8 +93,7 @@ pub fn serialize(
                   struct_start_event
                 };
             }),
-            Some(&FieldType::FieldTypeVec{..}) => {
+            Some(&FieldType::FieldTypeVec { .. }) => Some(quote!{
-              Some(quote!{
               for item in &self.#label {
                 let start_event = XmlEvent::start_element(#label_name);
                 let _ret = writer.write(start_event);
@@ -105,8 +104,7 @@ pub fn serialize(
                 let end_event = XmlEvent::end_element();
                 let _ret = writer.write(end_event);
               }
-              })
+            }),
-            }
             _ => None,
           }
         }
@@ -265,8 +263,7 @@ pub fn serialize(
             _ => None,
           }
         }
-        Some(FieldType::FieldTypeStruct { .. }) => {
+        Some(FieldType::FieldTypeStruct { .. }) => Some(quote!{
-          Some(quote!{
           writer.set_skip_start_end(false);
           match self.#label.serialize(writer) {
             Ok(()) => {},
@@ -274,8 +271,7 @@ pub fn serialize(
               return Err(msg);
             },
           };
-          })
+        }),
-        },
         Some(FieldType::FieldTypeVec { data_type }) => {
           let dt = Box::into_raw(data_type);
           match unsafe { dt.as_ref() } {
@@ -344,7 +340,7 @@ pub fn serialize(
               unimplemented!();
             }
           }
-        },
+        }
         None => None,
       }
     })