Deduplicate atomic_impl macro implementations

serde-rs · Dec 12, 2022 · 7440e56 · 7440e56
1 parent 0d79306
commit 7440e56
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 37 deletions.
diff --git a/serde/src/de/impls.rs b/serde/src/de/impls.rs
@@ -2660,27 +2660,11 @@ where
     }
 }
 
-#[cfg(all(feature = "std", no_target_has_atomic, not(no_std_atomic)))]
-macro_rules! atomic_impl {
-    ($($ty:ident $size:expr)*) => {
-        $(
-            impl<'de> Deserialize<'de> for $ty {
-                fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
-                where
-                    D: Deserializer<'de>,
-                {
-                    Deserialize::deserialize(deserializer).map(Self::new)
-                }
-            }
-        )*
-    };
-}
-
-#[cfg(all(feature = "std", not(no_target_has_atomic)))]
+#[cfg(all(feature = "std", not(no_std_atomic)))]
 macro_rules! atomic_impl {
     ($($ty:ident $size:expr)*) => {
         $(
-            #[cfg(target_has_atomic = $size)]
+            #[cfg(any(no_target_has_atomic, target_has_atomic = $size))]
             impl<'de> Deserialize<'de> for $ty {
                 fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
                 where

diff --git a/serde/src/ser/impls.rs b/serde/src/ser/impls.rs
@@ -945,28 +945,11 @@ where
 
 ////////////////////////////////////////////////////////////////////////////////
 
-#[cfg(all(feature = "std", no_target_has_atomic, not(no_std_atomic)))]
-macro_rules! atomic_impl {
-    ($($ty:ident $size:expr)*) => {
-        $(
-            impl Serialize for $ty {
-                fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
-                where
-                    S: Serializer,
-                {
-                    // Matches the atomic ordering used in libcore for the Debug impl
-                    self.load(Ordering::Relaxed).serialize(serializer)
-                }
-            }
-        )*
-    }
-}
-
-#[cfg(all(feature = "std", not(no_target_has_atomic)))]
+#[cfg(all(feature = "std", not(no_std_atomic)))]
 macro_rules! atomic_impl {
     ($($ty:ident $size:expr)*) => {
         $(
-            #[cfg(target_has_atomic = $size)]
+            #[cfg(any(no_target_has_atomic, target_has_atomic = $size))]
             impl Serialize for $ty {
                 fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
                 where