MSRV 1.85, edition 2024, stdarch_x86_avx512 fix

ijl · ijl · commit 3de9324511a7 · 2025-08-12T14:14:28.000Z
diff --git a/.github/workflows/artifact.yaml b/.github/workflows/artifact.yaml
@@ -4,7 +4,7 @@ env:
   CARGO_UNSTABLE_SPARSE_REGISTRY: "true"
   FORCE_COLOR: "1"
   PIP_DISABLE_PIP_VERSION_CHECK: "1"
-  RUST_TOOLCHAIN: "nightly-2025-04-15"
+  RUST_TOOLCHAIN: "nightly-2025-08-10"
   UNSAFE_PYO3_BUILD_FREE_THREADED: "1"
   UNSAFE_PYO3_SKIP_VERSION_CHECK: "1"
   UV_LINK_MODE: "copy"
@@ -16,7 +16,7 @@ jobs:
     strategy:
       fail-fast: false
     env:
-      RUST_TOOLCHAIN: "1.82" # MSRV
+      RUST_TOOLCHAIN: "1.85" # MSRV
     steps:
 
     - uses: actions/setup-python@v5
diff --git a/.github/workflows/unusual.yaml b/.github/workflows/unusual.yaml
@@ -12,8 +12,8 @@ jobs:
       fail-fast: false
       matrix:
         profile: [
-          { rust: "1.82", features: "" }, # MSRV
-          { rust: "nightly-2025-04-15", features: "--features=generic_simd" },
+          { rust: "1.85", features: "" }, # MSRV
+          { rust: "nightly-2025-08-10", features: "--features=generic_simd" },
         ]
         python: [
           { version: '3.13' },
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -5,7 +5,7 @@ authors = ["ijl <ijl@mailbox.org>"]
 description = "Fast, correct Python JSON library supporting dataclasses, datetimes, and numpy"
 edition = "2021"
 resolver = "2"
-rust-version = "1.82"
+rust-version = "1.85"
 license = "Apache-2.0 OR MIT"
 readme = "README.md"
 keywords = ["fast", "json", "dataclass", "dataclasses", "datetime", "rfc", "8259", "3339"]
@@ -60,7 +60,7 @@ serde = { version = "1", default-features = false }
 serde_json = { version = "1", default-features = false, features = ["std", "float_roundtrip"] }
 simdutf8 = { version = "0.1", default-features = false, features = ["std", "public_imp", "aarch64_neon"] }
 smallvec = { version = "^1.11", default-features = false, features = ["union", "write"] }
-unwinding = { version = "=0.2.5", default-features = false, features = ["unwinder"], optional = true }
+unwinding = { version = "=0.2.8", default-features = false, features = ["unwinder"], optional = true }
 uuid = { version = "1", default-features = false }
 xxhash-rust = { version = "^0.8", default-features = false, features = ["xxh3"] }
 
diff --git a/README.md b/README.md
@@ -1083,7 +1083,7 @@ It benefits from also having a C build environment to compile a faster
 deserialization backend. See this project's `manylinux_2_28` builds for an
 example using clang and LTO.
 
-The project's own CI tests against `nightly-2025-04-15` and stable 1.82. It
+The project's own CI tests against `nightly-2025-08-10` and stable 1.82. It
 is prudent to pin the nightly version because that channel can introduce
 breaking changes. There is a significant performance benefit to using
 nightly.
diff --git a/src/ffi/compat.rs b/src/ffi/compat.rs
@@ -23,30 +23,32 @@ pub(crate) const _Py_IMMORTAL_REFCNT: pyo3_ffi::Py_ssize_t = {
 #[inline(always)]
 #[allow(non_snake_case)]
 pub(crate) unsafe fn _Py_IsImmortal(op: *mut pyo3_ffi::PyObject) -> core::ffi::c_int {
-    #[cfg(all(target_pointer_width = "64", not(Py_GIL_DISABLED)))]
-    {
-        (((*op).ob_refcnt.ob_refcnt as pyo3_ffi::PY_INT32_T) < 0) as core::ffi::c_int
-    }
-
-    #[cfg(all(target_pointer_width = "32", not(Py_GIL_DISABLED)))]
-    {
-        #[cfg(not(Py_3_14))]
+    unsafe {
+        #[cfg(all(target_pointer_width = "64", not(Py_GIL_DISABLED)))]
         {
-            ((*op).ob_refcnt.ob_refcnt == _Py_IMMORTAL_REFCNT) as core::ffi::c_int
+            (((*op).ob_refcnt.ob_refcnt as pyo3_ffi::PY_INT32_T) < 0) as core::ffi::c_int
         }
 
-        #[cfg(Py_3_14)]
+        #[cfg(all(target_pointer_width = "32", not(Py_GIL_DISABLED)))]
         {
-            ((*op).ob_refcnt.ob_refcnt >= _Py_IMMORTAL_MINIMUM_REFCNT) as core::ffi::c_int
+            #[cfg(not(Py_3_14))]
+            {
+                ((*op).ob_refcnt.ob_refcnt == _Py_IMMORTAL_REFCNT) as core::ffi::c_int
+            }
+
+            #[cfg(Py_3_14)]
+            {
+                ((*op).ob_refcnt.ob_refcnt >= _Py_IMMORTAL_MINIMUM_REFCNT) as core::ffi::c_int
+            }
         }
-    }
 
-    #[cfg(Py_GIL_DISABLED)]
-    {
-        ((*op)
-            .ob_ref_local
-            .load(std::sync::atomic::Ordering::Relaxed)
-            == _Py_IMMORTAL_REFCNT_LOCAL) as core::ffi::c_int
+        #[cfg(Py_GIL_DISABLED)]
+        {
+            ((*op)
+                .ob_ref_local
+                .load(std::sync::atomic::Ordering::Relaxed)
+                == _Py_IMMORTAL_REFCNT_LOCAL) as core::ffi::c_int
+        }
     }
 }
 
diff --git a/src/lib.rs b/src/lib.rs
@@ -1,6 +1,5 @@
 // SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
-#![cfg_attr(feature = "avx512", feature(stdarch_x86_avx512, avx512_target_feature))] // MSRV 1.89
 #![cfg_attr(feature = "intrinsics", feature(core_intrinsics))]
 #![cfg_attr(feature = "optimize", feature(optimize_attribute))]
 #![cfg_attr(feature = "generic_simd", feature(portable_simd))]
