Deduplicate atomic_impl macro calls

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

Hide file tree

Showing 2 changed files with 4 additions and 34 deletions.
diff --git a/serde/src/de/impls.rs b/serde/src/de/impls.rs
@@ -2677,7 +2677,7 @@ macro_rules! atomic_impl {
     };
 }
 
-#[cfg(all(feature = "std", no_target_has_atomic, not(no_std_atomic)))]
+#[cfg(all(feature = "std", not(no_std_atomic)))]
 atomic_impl! {
     AtomicBool "8"
     AtomicI8 "8"
@@ -2690,27 +2690,12 @@ atomic_impl! {
     AtomicUsize "ptr"
 }
 
-#[cfg(all(feature = "std", no_target_has_atomic, not(no_std_atomic64)))]
+#[cfg(all(feature = "std", not(no_std_atomic64)))]
 atomic_impl! {
     AtomicI64 "64"
     AtomicU64 "64"
 }
 
-#[cfg(all(feature = "std", not(no_target_has_atomic)))]
-atomic_impl! {
-    AtomicBool "8"
-    AtomicI8 "8"
-    AtomicI16 "16"
-    AtomicI32 "32"
-    AtomicI64 "64"
-    AtomicIsize "ptr"
-    AtomicU8 "8"
-    AtomicU16 "16"
-    AtomicU32 "32"
-    AtomicU64 "64"
-    AtomicUsize "ptr"
-}
-
 #[cfg(feature = "std")]
 struct FromStrVisitor<T> {
     expecting: &'static str,

diff --git a/serde/src/ser/impls.rs b/serde/src/ser/impls.rs
@@ -963,7 +963,7 @@ macro_rules! atomic_impl {
     }
 }
 
-#[cfg(all(feature = "std", no_target_has_atomic, not(no_std_atomic)))]
+#[cfg(all(feature = "std", not(no_std_atomic)))]
 atomic_impl! {
     AtomicBool "8"
     AtomicI8 "8"
@@ -976,23 +976,8 @@ atomic_impl! {
     AtomicUsize "ptr"
 }
 
-#[cfg(all(feature = "std", no_target_has_atomic, not(no_std_atomic64)))]
+#[cfg(all(feature = "std", not(no_std_atomic64)))]
 atomic_impl! {
     AtomicI64 "64"
     AtomicU64 "64"
 }
-
-#[cfg(all(feature = "std", not(no_target_has_atomic)))]
-atomic_impl! {
-    AtomicBool "8"
-    AtomicI8 "8"
-    AtomicI16 "16"
-    AtomicI32 "32"
-    AtomicI64 "64"
-    AtomicIsize "ptr"
-    AtomicU8 "8"
-    AtomicU16 "16"
-    AtomicU32 "32"
-    AtomicU64 "64"
-    AtomicUsize "ptr"
-}