Release 1.0.96

conservatively limit atomic features

serde/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "serde"
-version = "1.0.95" # remember to update html_root_url
+version = "1.0.96" # remember to update html_root_url
 authors = ["Erick Tryzelaar <erick.tryzelaar@gmail.com>", "David Tolnay <dtolnay@gmail.com>"]
 license = "MIT OR Apache-2.0"
 description = "A generic serialization/deserialization framework"

serde/build.rs

@@ -70,7 +70,22 @@ fn main() {
     }
 
     if minor >= 34 {
-        println!("cargo:rustc-cfg=std_integer_atomics");
+        // Whitelist of archs that support std::sync::atomic module. Ideally we
+        // would use #[cfg(target_has_atomic = "...")] but it is not stable yet.
+        // Instead this is based on rustc's src/librustc_target/spec/*.rs.
+        let has_atomic64 = target.starts_with("x86_64")
+            || target.starts_with("i686")
+            || target.starts_with("aarch64")
+            || target.starts_with("powerpc64")
+            || target.starts_with("sparc64")
+            || target.starts_with("mips64el");
+        let has_atomic32 = has_atomic64 || emscripten;
+        if has_atomic64 {
+            println!("cargo:rustc-cfg=std_atomic64");
+        }
+        if has_atomic32 {
+            println!("cargo:rustc-cfg=std_atomic");
+        }
     }
 }
 

serde/src/de/impls.rs

@@ -2546,7 +2546,7 @@ where
     }
 }
 
-#[cfg(all(feature = "std", std_integer_atomics))]
+#[cfg(all(feature = "std", std_atomic))]
 macro_rules! atomic_impl {
     ($($ty:ident)*) => {
         $(
@@ -2562,14 +2562,14 @@ macro_rules! atomic_impl {
     };
 }
 
-#[cfg(all(feature = "std", std_integer_atomics))]
+#[cfg(all(feature = "std", std_atomic))]
 atomic_impl! {
     AtomicBool
     AtomicI8 AtomicI16 AtomicI32 AtomicIsize
     AtomicU8 AtomicU16 AtomicU32 AtomicUsize
 }
 
-#[cfg(all(feature = "std", std_integer_atomics, not(target_os = "emscripten")))]
+#[cfg(all(feature = "std", std_atomic64))]
 atomic_impl! {
     AtomicI64 AtomicU64
 }

serde/src/lib.rs

@@ -73,7 +73,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 // Serde types in rustdoc of other crates get linked to here.
-#![doc(html_root_url = "https://docs.rs/serde/1.0.95")]
+#![doc(html_root_url = "https://docs.rs/serde/1.0.96")]
 // Support using Serde without the standard library!
 #![cfg_attr(not(feature = "std"), no_std)]
 // Unstable functionality only if the user asks for it. For tracking and
@@ -212,12 +212,12 @@ mod lib {
     #[cfg(range_inclusive)]
     pub use self::core::ops::RangeInclusive;
 
-    #[cfg(all(feature = "std", std_integer_atomics))]
+    #[cfg(all(feature = "std", std_atomic))]
     pub use std::sync::atomic::{
         AtomicBool, AtomicI16, AtomicI32, AtomicI8, AtomicIsize, AtomicU16, AtomicU32, AtomicU8,
         AtomicUsize, Ordering,
     };
-    #[cfg(all(feature = "std", std_integer_atomics, not(target_os = "emscripten")))]
+    #[cfg(all(feature = "std", std_atomic64))]
     pub use std::sync::atomic::{AtomicI64, AtomicU64};
 
     #[cfg(any(core_duration, feature = "std"))]

serde/src/ser/impls.rs

@@ -842,7 +842,7 @@ where
 
 ////////////////////////////////////////////////////////////////////////////////
 
-#[cfg(all(feature = "std", std_integer_atomics))]
+#[cfg(all(feature = "std", std_atomic))]
 macro_rules! atomic_impl {
     ($($ty:ident)*) => {
         $(
@@ -858,14 +858,14 @@ macro_rules! atomic_impl {
     }
 }
 
-#[cfg(all(feature = "std", std_integer_atomics))]
+#[cfg(all(feature = "std", std_atomic))]
 atomic_impl! {
     AtomicBool
     AtomicI8 AtomicI16 AtomicI32 AtomicIsize
     AtomicU8 AtomicU16 AtomicU32 AtomicUsize
 }
 
-#[cfg(all(feature = "std", std_integer_atomics, not(target_os = "emscripten")))]
+#[cfg(all(feature = "std", std_atomic64))]
 atomic_impl! {
     AtomicI64 AtomicU64
 }

serde_derive/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "serde_derive"
-version = "1.0.95" # remember to update html_root_url
+version = "1.0.96" # remember to update html_root_url
 authors = ["Erick Tryzelaar <erick.tryzelaar@gmail.com>", "David Tolnay <dtolnay@gmail.com>"]
 license = "MIT OR Apache-2.0"
 description = "Macros 1.1 implementation of #[derive(Serialize, Deserialize)]"

serde_derive/src/lib.rs

@@ -13,7 +13,7 @@
 //!
 //! [https://serde.rs/derive.html]: https://serde.rs/derive.html
 
-#![doc(html_root_url = "https://docs.rs/serde_derive/1.0.95")]
+#![doc(html_root_url = "https://docs.rs/serde_derive/1.0.96")]
 #![allow(unknown_lints, bare_trait_objects)]
 #![cfg_attr(feature = "cargo-clippy", allow(renamed_and_removed_lints))]
 #![cfg_attr(feature = "cargo-clippy", deny(clippy, clippy_pedantic))]

serde_test/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "serde_test"
-version = "1.0.95" # remember to update html_root_url
+version = "1.0.96" # remember to update html_root_url
 authors = ["Erick Tryzelaar <erick.tryzelaar@gmail.com>", "David Tolnay <dtolnay@gmail.com>"]
 license = "MIT OR Apache-2.0"
 description = "Token De/Serializer for testing De/Serialize implementations"

serde_test/src/lib.rs

@@ -144,7 +144,7 @@
 //! # }
 //! ```
 
-#![doc(html_root_url = "https://docs.rs/serde_test/1.0.95")]
+#![doc(html_root_url = "https://docs.rs/serde_test/1.0.96")]
 #![cfg_attr(feature = "cargo-clippy", allow(renamed_and_removed_lints))]
 #![cfg_attr(feature = "cargo-clippy", deny(clippy, clippy_pedantic))]
 // Ignored clippy lints

test_suite/tests/test_de.rs

@@ -17,7 +17,7 @@ use std::sync::atomic::{
 use std::sync::{Arc, Weak as ArcWeak};
 use std::time::{Duration, UNIX_EPOCH};
 
-#[cfg(not(target_os = "emscripten"))]
+#[cfg(target_arch = "x86_64")]
 use std::sync::atomic::{AtomicI64, AtomicU64};
 
 use fnv::FnvHasher;
@@ -1181,7 +1181,7 @@ fn test_atomics() {
     test(AtomicU32::load, 131072u32, Token::U32(131072u32));
     test(AtomicUsize::load, 131072usize, Token::U32(131072));
 
-    #[cfg(not(target_os = "emscripten"))]
+    #[cfg(target_arch = "x86_64")]
     {
         test(AtomicI64::load, -8589934592, Token::I64(-8589934592));
         test(AtomicU64::load, 8589934592u64, Token::U64(8589934592));

test_suite/tests/test_ser.rs

@@ -19,7 +19,7 @@ use std::time::{Duration, UNIX_EPOCH};
 
 #[cfg(unix)]
 use std::str;
-#[cfg(not(target_os = "emscripten"))]
+#[cfg(target_arch = "x86_64")]
 use std::sync::atomic::{AtomicI64, AtomicU64};
 
 use fnv::FnvHasher;
@@ -504,7 +504,7 @@ declare_tests! {
     }
 }
 
-#[cfg(not(target_os = "emscripten"))]
+#[cfg(target_arch = "x86_64")]
 declare_tests! {
     test_atomic64 {
         AtomicI64::new(-4295032832i64) => &[Token::I64(-4295032832i64)],