Skip to content

Commit 9249dab

Browse files
committed
Deduplicate atomic_impl macro calls
1 parent 7440e56 commit 9249dab

2 files changed

Lines changed: 4 additions & 34 deletions

File tree

‎serde/src/de/impls.rs‎

Lines changed: 2 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -2677,7 +2677,7 @@ macro_rules! atomic_impl {
26772677
};
26782678
}
26792679

2680-
#[cfg(all(feature = "std", no_target_has_atomic, not(no_std_atomic)))]
2680+
#[cfg(all(feature = "std", not(no_std_atomic)))]
26812681
atomic_impl! {
26822682
AtomicBool "8"
26832683
AtomicI8 "8"
@@ -2690,27 +2690,12 @@ atomic_impl! {
26902690
AtomicUsize "ptr"
26912691
}
26922692

2693-
#[cfg(all(feature = "std", no_target_has_atomic, not(no_std_atomic64)))]
2693+
#[cfg(all(feature = "std", not(no_std_atomic64)))]
26942694
atomic_impl! {
26952695
AtomicI64 "64"
26962696
AtomicU64 "64"
26972697
}
26982698

2699-
#[cfg(all(feature = "std", not(no_target_has_atomic)))]
2700-
atomic_impl! {
2701-
AtomicBool "8"
2702-
AtomicI8 "8"
2703-
AtomicI16 "16"
2704-
AtomicI32 "32"
2705-
AtomicI64 "64"
2706-
AtomicIsize "ptr"
2707-
AtomicU8 "8"
2708-
AtomicU16 "16"
2709-
AtomicU32 "32"
2710-
AtomicU64 "64"
2711-
AtomicUsize "ptr"
2712-
}
2713-
27142699
#[cfg(feature = "std")]
27152700
struct FromStrVisitor<T> {
27162701
expecting: &'static str,

‎serde/src/ser/impls.rs‎

Lines changed: 2 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -963,7 +963,7 @@ macro_rules! atomic_impl {
963963
}
964964
}
965965

966-
#[cfg(all(feature = "std", no_target_has_atomic, not(no_std_atomic)))]
966+
#[cfg(all(feature = "std", not(no_std_atomic)))]
967967
atomic_impl! {
968968
AtomicBool "8"
969969
AtomicI8 "8"
@@ -976,23 +976,8 @@ atomic_impl! {
976976
AtomicUsize "ptr"
977977
}
978978

979-
#[cfg(all(feature = "std", no_target_has_atomic, not(no_std_atomic64)))]
979+
#[cfg(all(feature = "std", not(no_std_atomic64)))]
980980
atomic_impl! {
981981
AtomicI64 "64"
982982
AtomicU64 "64"
983983
}
984-
985-
#[cfg(all(feature = "std", not(no_target_has_atomic)))]
986-
atomic_impl! {
987-
AtomicBool "8"
988-
AtomicI8 "8"
989-
AtomicI16 "16"
990-
AtomicI32 "32"
991-
AtomicI64 "64"
992-
AtomicIsize "ptr"
993-
AtomicU8 "8"
994-
AtomicU16 "16"
995-
AtomicU32 "32"
996-
AtomicU64 "64"
997-
AtomicUsize "ptr"
998-
}

0 commit comments

Comments
 (0)