Merge branch 'develop'

Signed-off-by: Toralf Wittner <tw@dtex.org>

Author: twittner

CHANGELOG.md

@@ -7,6 +7,11 @@
 
 # minicbor
 
+## `2.1.2`
+
+- Replaces `build.rs` with `target_has_atomic`. See pull request
+  [#47](https://github.com/twittner/minicbor/pull/47) by @dtolnay for details.
+
 ## `2.1.1`
 
 - Depends on `minicbor-derive-0.18.2`.

minicbor/Cargo.toml

@@ -1,14 +1,13 @@
 [package]
 name          = "minicbor"
-version       = "2.1.1"
+version       = "2.1.2"
 authors       = ["Toralf Wittner <tw@dtex.org>"]
 license       = "BlueOak-1.0.0"
 edition       = "2024"
 description   = "A small CBOR codec suitable for no_std environments."
 repository    = "https://github.com/twittner/minicbor"
 keywords      = ["cbor", "minicbor", "serialization", "encoding", "no_std"]
 categories    = ["encoding"]
-build         = "build.rs"
 
 [package.metadata.docs.rs]
 features = ["std", "derive", "half"]

minicbor/build.rs

@@ -373,7 +373,13 @@ decode_nonzero! {
     core::num::NonZeroIsize,  "unexpected 0 when decoding a `NonZeroIsize`"
 }
 
-#[cfg(any(atomic32, atomic64))]
+#[cfg(any(
+    target_has_atomic = "8",
+    target_has_atomic = "16",
+    target_has_atomic = "32",
+    target_has_atomic = "64",
+    target_has_atomic = "ptr",
+))]
 macro_rules! decode_atomic {
     ($($t:ty)*) => {
         $(
@@ -386,31 +392,34 @@ macro_rules! decode_atomic {
     }
 }
 
-#[cfg(atomic32)]
+#[cfg(target_has_atomic = "8")]
 decode_atomic! {
     core::sync::atomic::AtomicBool
     core::sync::atomic::AtomicU8
-    core::sync::atomic::AtomicU16
-    core::sync::atomic::AtomicU32
-    core::sync::atomic::AtomicUsize
     core::sync::atomic::AtomicI8
-    core::sync::atomic::AtomicI16
-    core::sync::atomic::AtomicI32
-    core::sync::atomic::AtomicIsize
 }
 
-#[cfg(atomic64)]
+#[cfg(target_has_atomic = "16")]
 decode_atomic! {
-    core::sync::atomic::AtomicBool
-    core::sync::atomic::AtomicU8
     core::sync::atomic::AtomicU16
-    core::sync::atomic::AtomicU32
-    core::sync::atomic::AtomicU64
-    core::sync::atomic::AtomicUsize
-    core::sync::atomic::AtomicI8
     core::sync::atomic::AtomicI16
+}
+
+#[cfg(target_has_atomic = "32")]
+decode_atomic! {
+    core::sync::atomic::AtomicU32
     core::sync::atomic::AtomicI32
+}
+
+#[cfg(target_has_atomic = "64")]
+decode_atomic! {
+    core::sync::atomic::AtomicU64
     core::sync::atomic::AtomicI64
+}
+
+#[cfg(target_has_atomic = "ptr")]
+decode_atomic! {
+    core::sync::atomic::AtomicUsize
     core::sync::atomic::AtomicIsize
 }
 

minicbor/src/decode.rs

@@ -622,7 +622,13 @@ encode_nonzero! {
     core::num::NonZeroIsize
 }
 
-#[cfg(any(atomic32, atomic64))]
+#[cfg(any(
+    target_has_atomic = "8",
+    target_has_atomic = "16",
+    target_has_atomic = "32",
+    target_has_atomic = "64",
+    target_has_atomic = "ptr",
+))]
 macro_rules! encode_atomic {
     ($($t:ty)*) => {
         $(
@@ -642,31 +648,34 @@ macro_rules! encode_atomic {
     }
 }
 
-#[cfg(atomic32)]
+#[cfg(target_has_atomic = "8")]
 encode_atomic! {
     core::sync::atomic::AtomicBool
     core::sync::atomic::AtomicU8
-    core::sync::atomic::AtomicU16
-    core::sync::atomic::AtomicU32
-    core::sync::atomic::AtomicUsize
     core::sync::atomic::AtomicI8
-    core::sync::atomic::AtomicI16
-    core::sync::atomic::AtomicI32
-    core::sync::atomic::AtomicIsize
 }
 
-#[cfg(atomic64)]
+#[cfg(target_has_atomic = "16")]
 encode_atomic! {
-    core::sync::atomic::AtomicBool
-    core::sync::atomic::AtomicU8
     core::sync::atomic::AtomicU16
-    core::sync::atomic::AtomicU32
-    core::sync::atomic::AtomicU64
-    core::sync::atomic::AtomicUsize
-    core::sync::atomic::AtomicI8
     core::sync::atomic::AtomicI16
+}
+
+#[cfg(target_has_atomic = "32")]
+encode_atomic! {
+    core::sync::atomic::AtomicU32
     core::sync::atomic::AtomicI32
+}
+
+#[cfg(target_has_atomic = "64")]
+encode_atomic! {
+    core::sync::atomic::AtomicU64
     core::sync::atomic::AtomicI64
+}
+
+#[cfg(target_has_atomic = "ptr")]
+encode_atomic! {
+    core::sync::atomic::AtomicUsize
     core::sync::atomic::AtomicIsize
 }