feat: use syn 2.0

media-io · Nov 5, 2024 · dbf9e03 · dbf9e03
1 parent ae66b1e
commit dbf9e03
Show file tree

Hide file tree

Showing 24 changed files with 270 additions and 447 deletions.
diff --git a/README.md b/README.md
@@ -1,13 +1,8 @@
-# yaserde &emsp; [![Build Status]][travis] [![Latest Version]][crates.io] [![Coverage Status]][coveralls]
+# yaserde &emsp; [![Latest Version]][crates.io]
 
-[Build Status]: https://travis-ci.com/media-io/yaserde.svg?branch=master
-[travis]: https://travis-ci.com/media-io/yaserde
 [Latest Version]: https://img.shields.io/crates/v/yaserde.svg
 [crates.io]: https://crates.io/crates/yaserde
 
-[Coverage Status]: https://coveralls.io/repos/github/media-io/yaserde/badge.svg?branch=master
-[coveralls]: https://coveralls.io/github/media-io/yaserde?branch=master
-
 **Yet Another Serializer/Deserializer specialized for XML**
 
 ## Goal

diff --git a/examples/src/lib.rs b/examples/src/lib.rs
@@ -1,6 +1,7 @@
-mod bbigras_namespace;
-mod boscop;
-mod generic;
-mod ln_dom;
-mod same_element_different_namespaces;
-mod svd;
+// mod bbigras_namespace;
+// mod boscop;
+// mod generic;
+// mod ln_dom;
+// mod same_element_different_namespaces;
+// mod svd;
+//
diff --git a/yaserde/src/lib.rs b/yaserde/src/lib.rs
@@ -19,19 +19,17 @@
 //! #[derive(PartialEq, Debug, YaSerialize)]
 //! #[yaserde(rename = "device")]
 //! struct Device {
-//!   #[yaserde(attribute)]
+//!   #[yaserde(attribute = true)]
 //!   schemaversion: String,
-//!   #[yaserde(attribute)]
+//!   #[yaserde(attribute = true)]
 //!   xmlns: String,
-//!   #[yaserde(attribute)]
+//!   #[yaserde(attribute = true)]
 //!   xsnonamespaceschemalocation: String,
-//!   #[yaserde(child)]
 //!   attributes: DeviceAttributes
 //! }
 //!
 //! #[derive(PartialEq, Debug, YaSerialize)]
 //! struct DeviceAttributes {
-//!   #[yaserde(child)]
 //!   vendor: String,
 //! }
 //!```
@@ -297,7 +295,7 @@ macro_rules! test_for_attribute_type {
     #[derive(Debug, PartialEq, YaDeserialize, YaSerialize)]
     #[yaserde(rename = "data")]
     pub struct Data {
-      #[yaserde(attribute)]
+      #[yaserde(attribute = true)]
       item: $type,
     }
     let model = Data { item: $value };

diff --git a/yaserde/tests/default.rs b/yaserde/tests/default.rs
@@ -101,7 +101,7 @@ fn default_attribute_string() {
   #[derive(Debug, PartialEq, YaDeserialize, YaSerialize)]
   #[yaserde(rename = "base")]
   pub struct XmlStruct {
-    #[yaserde(attribute, default = "default_string")]
+    #[yaserde(attribute = true, default = "default_string")]
     background: String,
   }
 
@@ -128,7 +128,7 @@ fn module_inclusion() {
     #[derive(Debug, PartialEq, YaDeserialize, YaSerialize)]
     #[yaserde(rename = "module")]
     pub struct Module {
-      #[yaserde(attribute)]
+      #[yaserde(attribute = true)]
       pub color: String,
     }
   }

diff --git a/yaserde/tests/deserializer.rs b/yaserde/tests/deserializer.rs
@@ -25,7 +25,7 @@ fn de_basic() {
   init();
 
   #[derive(YaDeserialize, PartialEq, Debug)]
-  #[yaserde(root = "book")]
+  #[yaserde(rename = "book")]
   pub struct Book {
     author: String,
     title: String,
@@ -59,9 +59,9 @@ fn de_keyword() {
   init();
 
   #[derive(YaDeserialize, PartialEq, Debug)]
-  #[yaserde(root = "book")]
+  #[yaserde(rename = "book")]
   pub struct Book {
-    #[yaserde(attribute, rename = "ref")]
+    #[yaserde(attribute = true, rename = "ref")]
     pub r#ref: String,
   }
 
@@ -80,7 +80,7 @@ fn de_dash_param() {
   init();
 
   #[derive(YaDeserialize, PartialEq, Debug)]
-  #[yaserde(root = "book")]
+  #[yaserde(rename = "book")]
   pub struct Book {
     #[yaserde(rename = "author-release")]
     author: String,
@@ -123,7 +123,7 @@ fn de_multiple_segments() {
   }
 
   #[derive(YaDeserialize, PartialEq, Debug)]
-  #[yaserde(root = "book")]
+  #[yaserde(rename = "book")]
   pub struct Book {
     author: String,
     title: String,
@@ -160,7 +160,7 @@ fn de_list_of_items() {
   init();
 
   #[derive(YaDeserialize, PartialEq, Debug)]
-  #[yaserde(root = "library")]
+  #[yaserde(rename = "library")]
   pub struct Library {
     books: Vec<String>,
   }
@@ -175,7 +175,7 @@ fn de_list_of_items() {
   );
 
   #[derive(YaDeserialize, PartialEq, Debug)]
-  #[yaserde(root = "libraries")]
+  #[yaserde(rename = "libraries")]
   pub struct Libraries {
     library: Vec<Library>,
   }
@@ -202,17 +202,17 @@ fn de_attributes() {
   init();
 
   #[derive(YaDeserialize, PartialEq, Debug)]
-  #[yaserde(root = "base")]
+  #[yaserde(rename = "base")]
   pub struct XmlStruct {
-    #[yaserde(attribute)]
+    #[yaserde(attribute = true)]
     item: String,
     sub: SubStruct,
   }
 
   #[derive(YaDeserialize, PartialEq, Debug)]
-  #[yaserde(root = "sub")]
+  #[yaserde(rename = "sub")]
   pub struct SubStruct {
-    #[yaserde(attribute)]
+    #[yaserde(attribute = true)]
     subitem: String,
   }
 
@@ -268,9 +268,9 @@ fn de_attributes_custom_deserializer() {
 
   #[derive(YaDeserialize, PartialEq, Debug)]
   pub struct Struct {
-    #[yaserde(attribute)]
+    #[yaserde(attribute = true)]
     attr_option_string: Option<String>,
-    #[yaserde(attribute)]
+    #[yaserde(attribute = true)]
     attr_option_struct: Option<other_mod::Attributes>,
   }
 
@@ -312,9 +312,9 @@ fn de_attributes_complex() {
 
   #[derive(YaDeserialize, PartialEq, Debug)]
   pub struct Struct {
-    #[yaserde(attribute)]
+    #[yaserde(attribute = true)]
     attr_option_string: Option<String>,
-    #[yaserde(attribute)]
+    #[yaserde(attribute = true)]
     attr_option_enum: Option<other_mod::AttrEnum>,
   }
 
@@ -343,7 +343,7 @@ fn de_attributes_with_same_name_field() {
 
   #[derive(YaDeserialize, PartialEq, Debug)]
   pub struct Struct {
-    #[yaserde(attribute, rename = "content")]
+    #[yaserde(attribute = true, rename = "content")]
     attribute: Option<String>,
     content: Option<String>,
   }
@@ -381,9 +381,9 @@ fn de_rename() {
   init();
 
   #[derive(YaDeserialize, PartialEq, Debug)]
-  #[yaserde(root = "base")]
+  #[yaserde(rename = "base")]
   pub struct XmlStruct {
-    #[yaserde(attribute, rename = "Item")]
+    #[yaserde(attribute = true, rename = "Item")]
     item: String,
     #[yaserde(rename = "sub")]
     sub_struct: SubStruct,
@@ -392,9 +392,9 @@ fn de_rename() {
   }
 
   #[derive(YaDeserialize, PartialEq, Debug)]
-  #[yaserde(root = "sub")]
+  #[yaserde(rename = "sub")]
   pub struct SubStruct {
-    #[yaserde(attribute, rename = "sub_item")]
+    #[yaserde(attribute = true, rename = "sub_item")]
     subitem: String,
   }
 
@@ -417,20 +417,20 @@ fn de_text_content_with_attributes() {
   init();
 
   #[derive(YaDeserialize, PartialEq, Debug)]
-  #[yaserde(root = "base")]
+  #[yaserde(rename = "base")]
   pub struct XmlStruct {
-    #[yaserde(attribute, rename = "Item")]
+    #[yaserde(attribute = true, rename = "Item")]
     item: String,
     #[yaserde(rename = "sub")]
     sub_struct: SubStruct,
   }
 
   #[derive(YaDeserialize, PartialEq, Debug)]
-  #[yaserde(root = "sub")]
+  #[yaserde(rename = "sub")]
   pub struct SubStruct {
-    #[yaserde(attribute, rename = "sub_item")]
+    #[yaserde(attribute = true, rename = "sub_item")]
     subitem: String,
-    #[yaserde(text)]
+    #[yaserde(text = true)]
     text: String,
   }
 
@@ -454,7 +454,7 @@ fn de_text_attribute_on_optional_string() {
   #[derive(YaDeserialize, PartialEq, Debug)]
   #[yaserde(rename = "base")]
   pub struct XmlStruct {
-    #[yaserde(text)]
+    #[yaserde(text = true)]
     text: Option<String>,
   }
 
@@ -474,19 +474,19 @@ fn de_enum() {
   init();
 
   #[derive(YaDeserialize, PartialEq, Debug)]
-  #[yaserde(root = "base")]
+  #[yaserde(rename = "base")]
   pub struct XmlStruct {
     background: Color,
   }
 
   #[derive(YaDeserialize, PartialEq, Debug)]
-  #[yaserde(root = "base")]
+  #[yaserde(rename = "base")]
   pub struct Colors {
     items: Vec<Color>,
   }
 
   #[derive(Default, YaDeserialize, PartialEq, Debug)]
-  #[yaserde(root = "color")]
+  #[yaserde(rename = "color")]
   pub enum Color {
     #[default]
     White,
@@ -525,14 +525,14 @@ fn de_attribute_enum() {
   init();
 
   #[derive(YaDeserialize, PartialEq, Debug)]
-  #[yaserde(root = "base")]
+  #[yaserde(rename = "base")]
   pub struct XmlStruct {
-    #[yaserde(attribute)]
+    #[yaserde(attribute = true)]
     background: Color,
   }
 
   #[derive(Default, YaDeserialize, PartialEq, Debug)]
-  #[yaserde(root = "color")]
+  #[yaserde(rename = "color")]
   pub enum Color {
     #[default]
     White,
@@ -770,7 +770,7 @@ fn de_name_issue_21() {
   init();
 
   #[derive(YaDeserialize, PartialEq, Debug)]
-  #[yaserde(root = "book")]
+  #[yaserde(rename = "book")]
   pub struct Book {
     name: String,
   }
@@ -906,7 +906,7 @@ fn de_subitem_issue_12_attributes() {
 
   #[derive(PartialEq, Debug, YaDeserialize)]
   pub struct Struct {
-    #[yaserde(attribute)]
+    #[yaserde(attribute = true)]
     id: i32,
   }
 
@@ -927,13 +927,13 @@ fn de_subitem_issue_12_attributes_with_sub() {
 
   #[derive(PartialEq, Debug, YaDeserialize)]
   pub struct SubStruct {
-    #[yaserde(attribute)]
+    #[yaserde(attribute = true)]
     id: i32,
   }
 
   #[derive(PartialEq, Debug, YaDeserialize)]
   pub struct Struct {
-    #[yaserde(attribute)]
+    #[yaserde(attribute = true)]
     id: i32,
     sub1: SubStruct,
     sub2: SubStruct,
@@ -1082,11 +1082,11 @@ fn de_attribute_sequence() {
 
   #[derive(Debug, PartialEq, YaDeserialize)]
   pub struct Outer {
-    #[yaserde(attribute, rename = "seq1")]
+    #[yaserde(attribute = true, rename = "seq1")]
     seq1: Vec<i32>,
-    #[yaserde(child, attribute, rename = "seq2")]
+    #[yaserde(attribute = true, rename = "seq2")]
     seq2: Vec<Inner>,
-    #[yaserde(attribute, rename = "seq3")]
+    #[yaserde(attribute = true, rename = "seq3")]
     seq3: Vec<String>,
   }
 
@@ -1109,7 +1109,7 @@ fn de_nested_macro_rules() {
     ($type:ty) => {
       #[derive(PartialEq, Debug, YaDeserialize)]
       pub struct Outer {
-        #[yaserde(attribute)]
+        #[yaserde(attribute = true)]
         pub inner: Option<$type>,
       }
     };