Update serde derives. (#56)

Since the crate is using Rust edition 2018, we can use the macros directly without a `macro_use`. The recommended way to use `serde_derive` now is to use the `derive` feature on the `serde` crate.
ixmilia · Mar 6, 2024 · b9613ed · b9613ed
1 parent 83a03de
commit b9613ed
Show file tree

Hide file tree

Showing 26 changed files with 152 additions and 143 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -15,7 +15,7 @@ edition = "2018"
 targets = []
 
 [features]
-serialize = ["serde", "serde_derive"]
+serialize = ["serde"]
 
 [dependencies]
 byteorder = "1.3.4"
@@ -25,8 +25,7 @@ enum_primitive = "0.1.1"
 image = "0.24"
 itertools = "0.11"
 num = "0.4"
-serde = { version = "1.*.*", optional = true }
-serde_derive = { version = "1.*.*", optional = true }
+serde = { version = "1.0", features = ["derive"], optional = true }
 uuid = { version = "1.3.3", features = ["serde", "v4"] }
 
 [build-dependencies]

diff --git a/build/entity_generator.rs b/build/entity_generator.rs
@@ -66,7 +66,9 @@ fn generate_base_entity(fun: &mut String, element: &Element) {
         panic!("Expected first entity to be 'Entity'.");
     }
     fun.push_str("#[derive(Debug, Clone)]\n");
-    fun.push_str("#[cfg_attr(feature = \"serialize\", derive(Serialize, Deserialize))]\n");
+    fun.push_str(
+        "#[cfg_attr(feature = \"serialize\", derive(serde::Serialize, serde::Deserialize))]\n",
+    );
     fun.push_str("pub struct EntityCommon {\n");
     for c in &entity.children {
         let t = if allow_multiples(c) {
@@ -107,7 +109,9 @@ fn generate_base_entity(fun: &mut String, element: &Element) {
     fun.push('\n');
 
     fun.push_str("#[derive(Debug, Clone)]\n");
-    fun.push_str("#[cfg_attr(feature = \"serialize\", derive(Serialize, Deserialize))]\n");
+    fun.push_str(
+        "#[cfg_attr(feature = \"serialize\", derive(serde::Serialize, serde::Deserialize))]\n",
+    );
     fun.push_str("pub struct Entity {\n");
     fun.push_str("    pub common: EntityCommon,\n");
     fun.push_str("    pub specific: EntityType,\n");
@@ -209,7 +213,9 @@ fn generate_base_entity(fun: &mut String, element: &Element) {
 
 fn generate_entity_types(fun: &mut String, element: &Element) {
     fun.push_str("#[derive(Clone, Debug, PartialEq)]\n");
-    fun.push_str("#[cfg_attr(feature = \"serialize\", derive(Serialize, Deserialize))]\n");
+    fun.push_str(
+        "#[cfg_attr(feature = \"serialize\", derive(serde::Serialize, serde::Deserialize))]\n",
+    );
     fun.push_str("pub enum EntityType {\n");
     for c in &element.children {
         if c.name != "Entity" {
@@ -231,7 +237,7 @@ fn generate_entity_types(fun: &mut String, element: &Element) {
         if name(c) != "Entity" {
             // definition
             fun.push_str("#[derive(Clone, Debug, PartialEq)]\n");
-            fun.push_str("#[cfg_attr(feature = \"serialize\", derive(Serialize, Deserialize))]\n");
+            fun.push_str("#[cfg_attr(feature = \"serialize\", derive(serde::Serialize, serde::Deserialize))]\n");
             fun.push_str(&format!("pub struct {typ} {{\n", typ = name(c)));
             if base_class(c) == "DimensionBase" {
                 fun.push_str("    pub dimension_base: DimensionBase,\n");

diff --git a/build/header_generator.rs b/build/header_generator.rs
@@ -60,7 +60,9 @@ use self::uuid::Uuid;
 fn generate_struct(fun: &mut String, element: &Element) {
     let mut seen_fields = HashSet::new();
     fun.push_str("/// Contains common properties for the DXF file.\n");
-    fun.push_str("#[cfg_attr(feature = \"serialize\", derive(Serialize, Deserialize))]\n");
+    fun.push_str(
+        "#[cfg_attr(feature = \"serialize\", derive(serde::Serialize, serde::Deserialize))]\n",
+    );
     fun.push_str("pub struct Header {\n");
     for v in &element.children {
         let field_name = field(v);

diff --git a/build/object_generator.rs b/build/object_generator.rs
@@ -73,7 +73,9 @@ fn generate_base_object(fun: &mut String, element: &Element) {
         panic!("Expected first object to be 'Object'.");
     }
     fun.push_str("#[derive(Clone, Debug)]\n");
-    fun.push_str("#[cfg_attr(feature = \"serialize\", derive(Serialize, Deserialize))]\n");
+    fun.push_str(
+        "#[cfg_attr(feature = \"serialize\", derive(serde::Serialize, serde::Deserialize))]\n",
+    );
     fun.push_str("pub struct ObjectCommon {\n");
     for c in &object.children {
         let t = if allow_multiples(c) {
@@ -114,7 +116,9 @@ fn generate_base_object(fun: &mut String, element: &Element) {
     fun.push('\n');
 
     fun.push_str("#[derive(Clone, Debug)]\n");
-    fun.push_str("#[cfg_attr(feature = \"serialize\", derive(Serialize, Deserialize))]\n");
+    fun.push_str(
+        "#[cfg_attr(feature = \"serialize\", derive(serde::Serialize, serde::Deserialize))]\n",
+    );
     fun.push_str("pub struct Object {\n");
     fun.push_str("    pub common: ObjectCommon,\n");
     fun.push_str("    pub specific: ObjectType,\n");
@@ -219,7 +223,9 @@ fn generate_base_object(fun: &mut String, element: &Element) {
 fn generate_object_types(fun: &mut String, element: &Element) {
     fun.push_str("#[allow(clippy::large_enum_variant)]\n");
     fun.push_str("#[derive(Clone, Debug, PartialEq)]\n");
-    fun.push_str("#[cfg_attr(feature = \"serialize\", derive(Serialize, Deserialize))]\n");
+    fun.push_str(
+        "#[cfg_attr(feature = \"serialize\", derive(serde::Serialize, serde::Deserialize))]\n",
+    );
     fun.push_str("pub enum ObjectType {\n");
     for c in &element.children {
         if c.name != "Object" {
@@ -241,7 +247,7 @@ fn generate_object_types(fun: &mut String, element: &Element) {
         if name(c) != "Object" {
             // definition
             fun.push_str("#[derive(Clone, Debug, PartialEq)]\n");
-            fun.push_str("#[cfg_attr(feature = \"serialize\", derive(Serialize, Deserialize))]\n");
+            fun.push_str("#[cfg_attr(feature = \"serialize\", derive(serde::Serialize, serde::Deserialize))]\n");
             fun.push_str(&format!("pub struct {typ} {{\n", typ = name(c)));
             for f in &c.children {
                 let t = if allow_multiples(f) {

diff --git a/build/table_generator.rs b/build/table_generator.rs
@@ -57,7 +57,9 @@ fn generate_table_items(fun: &mut String, element: &Element) {
         let mut seen_fields = HashSet::new();
         let table_item = &table.children[0];
         fun.push_str("#[derive(Debug)]\n");
-        fun.push_str("#[cfg_attr(feature = \"serialize\", derive(Serialize, Deserialize))]\n");
+        fun.push_str(
+            "#[cfg_attr(feature = \"serialize\", derive(serde::Serialize, serde::Deserialize))]\n",
+        );
         fun.push_str(&format!("pub struct {name} {{\n", name = name(table_item)));
         fun.push_str("    pub name: String,\n");
         fun.push_str("    pub handle: Handle,\n");

diff --git a/src/block.rs b/src/block.rs
@@ -13,7 +13,7 @@ use crate::x_data;
 
 /// A block is a collection of entities.
 #[derive(Debug, Clone)]
-#[cfg_attr(feature = "serialize", derive(Serialize, Deserialize))]
+#[cfg_attr(feature = "serialize", derive(serde::Serialize, serde::Deserialize))]
 pub struct Block {
     /// The block's handle.
     pub handle: Handle,

diff --git a/src/class.rs b/src/class.rs
@@ -6,7 +6,7 @@ use crate::helper_functions::*;
 
 /// Represents an application-defined class whose instances are `Block`s, `Entity`s, and `Object`s.
 #[derive(Clone)]
-#[cfg_attr(feature = "serialize", derive(Serialize, Deserialize))]
+#[cfg_attr(feature = "serialize", derive(serde::Serialize, serde::Deserialize))]
 pub struct Class {
     /// Class DXF record name.
     pub record_name: String,

diff --git a/src/code_pair.rs b/src/code_pair.rs
@@ -12,7 +12,7 @@ use crate::helper_functions::parse_hex_string;
 /// The basic primitive of a DXF file; a code indicating the type of the data contained, and the
 /// data itself.
 #[derive(Clone)]
-#[cfg_attr(feature = "serialize", derive(Serialize, Deserialize))]
+#[cfg_attr(feature = "serialize", derive(serde::Serialize, serde::Deserialize))]
 pub struct CodePair {
     pub code: i32,
     pub value: CodePairValue,

diff --git a/src/code_pair_value.rs b/src/code_pair_value.rs
@@ -4,7 +4,7 @@ use std::fmt::{Debug, Display, Formatter};
 
 /// Contains the data portion of a `CodePair`.
 #[derive(PartialEq)]
-#[cfg_attr(feature = "serialize", derive(Serialize, Deserialize))]
+#[cfg_attr(feature = "serialize", derive(serde::Serialize, serde::Deserialize))]
 pub enum CodePairValue {
     Boolean(i16),
     Integer(i32),

diff --git a/src/color.rs b/src/color.rs
@@ -2,7 +2,7 @@ use crate::tables::Layer;
 
 /// Represents an indexed color.
 #[derive(Clone, Debug, Default, PartialEq)]
-#[cfg_attr(feature = "serialize", derive(Serialize, Deserialize))]
+#[cfg_attr(feature = "serialize", derive(serde::Serialize, serde::Deserialize))]
 pub struct Color {
     raw_value: i16,
 }

diff --git a/src/data_table_value.rs b/src/data_table_value.rs
@@ -1,7 +1,7 @@
 use crate::{Handle, Point};
 
 #[derive(Clone, Debug, PartialEq)]
-#[cfg_attr(feature = "serialize", derive(Serialize, Deserialize))]
+#[cfg_attr(feature = "serialize", derive(serde::Serialize, serde::Deserialize))]
 pub enum DataTableValue {
     Boolean(bool),
     Integer(i32),

diff --git a/src/drawing.rs b/src/drawing.rs
@@ -39,7 +39,7 @@ use std::path::Path;
 pub(crate) const AUTO_REPLACE_HANDLE: Handle = Handle(0xFFFF_FFFF_FFFF_FFFF);
 
 /// Represents a DXF drawing.
-#[cfg_attr(feature = "serialize", derive(Serialize, Deserialize))]
+#[cfg_attr(feature = "serialize", derive(serde::Serialize, serde::Deserialize))]
 pub struct Drawing {
     /// The drawing's header.  Contains various drawing-specific values and settings.
     pub header: Header,

diff --git a/src/entity.rs b/src/entity.rs
@@ -118,7 +118,7 @@ impl Line {
 //------------------------------------------------------------------------------
 /// Represents a single vertex of a `LwPolyline`.
 #[derive(Clone, Copy, Debug, Default, PartialEq)]
-#[cfg_attr(feature = "serialize", derive(Serialize, Deserialize))]
+#[cfg_attr(feature = "serialize", derive(serde::Serialize, serde::Deserialize))]
 pub struct LwPolylineVertex {
     pub x: f64,
     pub y: f64,