chore: change serde_crate to serde

Author: dr-orlovsky

Cargo.toml

@@ -14,4 +14,4 @@ license = "Apache-2.0"
 
 [workspace.dependencies]
 amplify = { version = "4.9.0" }
-serde_crate = { package = "serde", version = "1", features = ["derive"] }
+serde = { package = "serde", version = "1", features = ["derive"] }

rust/Cargo.toml

@@ -16,7 +16,7 @@ exclude = ["derive", "test_helpers"]
 [dependencies]
 amplify = { workspace = true, features = ["proc_attr"] }
 strict_encoding_derive = { version = "2.8.0", path = "derive" }
-serde_crate = { workspace = true, optional = true }
+serde = { workspace = true, optional = true }
 
 [dev-dependencies]
 amplify = { workspace = true, features = ["proc_attr", "hex"] }
@@ -50,7 +50,7 @@ float = [
 ]
 half = [] # TODO: Remove this with major version update
 serde = [
-    "serde_crate",
+    "dep:serde",
     "amplify/serde"
 ]
 

rust/src/ident.rs

@@ -97,23 +97,15 @@ macro_rules! impl_ident_subtype {
 
 #[derive(Wrapper, Clone, Ord, PartialOrd, Eq, PartialEq, Hash, From)]
 #[wrapper(Deref, Display, FromStr)]
-#[cfg_attr(
-    feature = "serde",
-    derive(Serialize, Deserialize),
-    serde(crate = "serde_crate", transparent)
-)]
+#[cfg_attr(feature = "serde", derive(Serialize, Deserialize), serde(transparent))]
 pub struct Ident(RString<AlphaLodash, AlphaNumLodash, 1, IDENT_MAX_LEN>);
 
 impl_ident_type!(Ident);
 impl_strict_newtype!(Ident, STRICT_TYPES_LIB);
 
 #[derive(Wrapper, Clone, Ord, PartialOrd, Eq, PartialEq, Hash, From)]
 #[wrapper(Deref, Display, FromStr)]
-#[cfg_attr(
-    feature = "serde",
-    derive(Serialize, Deserialize),
-    serde(crate = "serde_crate", transparent)
-)]
+#[cfg_attr(feature = "serde", derive(Serialize, Deserialize), serde(transparent))]
 pub struct TypeName(RString<AlphaCapsLodash, AlphaNumLodash, 1, IDENT_MAX_LEN>);
 
 impl_ident_type!(TypeName);
@@ -122,11 +114,7 @@ impl_strict_newtype!(TypeName, STRICT_TYPES_LIB);
 
 #[derive(Wrapper, Clone, Ord, PartialOrd, Eq, PartialEq, Hash, From)]
 #[wrapper(Deref, Display, FromStr)]
-#[cfg_attr(
-    feature = "serde",
-    derive(Serialize, Deserialize),
-    serde(crate = "serde_crate", transparent)
-)]
+#[cfg_attr(feature = "serde", derive(Serialize, Deserialize), serde(transparent))]
 pub struct FieldName(RString<AlphaSmallLodash, AlphaNumLodash, 1, IDENT_MAX_LEN>);
 
 impl_ident_type!(FieldName);
@@ -135,11 +123,7 @@ impl_strict_newtype!(FieldName, STRICT_TYPES_LIB);
 
 #[derive(Wrapper, Clone, Ord, PartialOrd, Eq, PartialEq, Hash, From)]
 #[wrapper(Deref, Display, FromStr)]
-#[cfg_attr(
-    feature = "serde",
-    derive(Serialize, Deserialize),
-    serde(crate = "serde_crate", transparent)
-)]
+#[cfg_attr(feature = "serde", derive(Serialize, Deserialize), serde(transparent))]
 pub struct VariantName(RString<AlphaSmallLodash, AlphaNumLodash, 1, IDENT_MAX_LEN>);
 
 impl_ident_type!(VariantName);
@@ -148,11 +132,7 @@ impl_strict_newtype!(VariantName, STRICT_TYPES_LIB);
 
 #[derive(Wrapper, Clone, Ord, PartialOrd, Eq, PartialEq, Hash, From)]
 #[wrapper(Deref, Display, FromStr)]
-#[cfg_attr(
-    feature = "serde",
-    derive(Serialize, Deserialize),
-    serde(crate = "serde_crate", transparent)
-)]
+#[cfg_attr(feature = "serde", derive(Serialize, Deserialize), serde(transparent))]
 pub struct LibName(RString<AlphaCapsLodash, AlphaNumLodash, 1, IDENT_MAX_LEN>);
 
 impl_ident_type!(LibName);

rust/src/lib.rs

@@ -45,7 +45,7 @@ use strict_encoding_derive as derive;
 extern crate amplify;
 #[cfg(feature = "serde")]
 #[macro_use]
-extern crate serde_crate as serde;
+extern crate serde;
 
 #[macro_use]
 mod macros;

rust/src/primitives.rs

@@ -29,7 +29,7 @@ use amplify::Wrapper;
 use crate::STRICT_TYPES_LIB;
 
 #[derive(Wrapper, Copy, Clone, Ord, PartialOrd, Eq, PartialEq, Hash, Debug, From)]
-#[cfg_attr(feature = "serde", derive(Serialize, Deserialize), serde(crate = "serde_crate"))]
+#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
 pub struct Primitive(u8);
 
 impl Primitive {

rust/src/stl.rs

@@ -73,7 +73,7 @@ pub trait RestrictedCharSet:
 }
 
 #[derive(Clone, Ord, PartialOrd, Eq, PartialEq, Hash)]
-#[cfg_attr(feature = "serde", derive(Serialize), serde(crate = "serde_crate", transparent))]
+#[cfg_attr(feature = "serde", derive(Serialize), serde(transparent))]
 pub struct RString<
     C1: RestrictedCharSet,
     C: RestrictedCharSet = C1,
@@ -222,8 +222,8 @@ impl<C1: RestrictedCharSet, C: RestrictedCharSet, const MIN: usize, const MAX: u
 
 #[cfg(feature = "serde")]
 mod _serde {
-    use serde_crate::de::Error;
-    use serde_crate::{Deserialize, Deserializer};
+    use serde::de::Error;
+    use serde::{Deserialize, Deserializer};
 
     use super::*;
 

rust/src/util.rs

@@ -30,7 +30,7 @@ use crate::{ReadStruct, VariantName, WriteStruct, STRICT_TYPES_LIB};
 
 // TODO: Control that min > max!
 #[derive(Copy, Clone, Eq, PartialEq, Hash, Debug)]
-#[cfg_attr(feature = "serde", derive(Serialize, Deserialize), serde(crate = "serde_crate"))]
+#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
 pub struct Sizing {
     pub min: u64,
     pub max: u64,
@@ -100,8 +100,8 @@ impl_strict_struct!(Variant, STRICT_TYPES_LIB; name, tag);
 mod _serde {
     use std::str::FromStr;
 
-    use serde_crate::ser::SerializeStruct;
-    use serde_crate::{Deserialize, Deserializer, Serialize, Serializer};
+    use serde::ser::SerializeStruct;
+    use serde::{Deserialize, Deserializer, Serialize, Serializer};
 
     use super::*;
 
@@ -148,11 +148,7 @@ mod _serde {
                     ))),
                 }
             } else {
-                #[cfg_attr(
-                    feature = "serde",
-                    derive(Deserialize),
-                    serde(crate = "serde_crate", rename = "Variant")
-                )]
+                #[cfg_attr(feature = "serde", derive(Deserialize), serde(rename = "Variant"))]
                 struct VariantFields {
                     name: VariantName,
                     tag: u8,