cargo update, vendor pyo3-ffi

.github/workflows/artifact.yaml

@@ -1,7 +1,7 @@
 name: artifact
 on: push
 env:
-  RUST_TOOLCHAIN: "nightly-2024-08-05"
+  RUST_TOOLCHAIN: "nightly-2024-09-13"
   CARGO_UNSTABLE_SPARSE_REGISTRY: "true"
   UNSAFE_PYO3_BUILD_FREE_THREADED: "1"
   UNSAFE_PYO3_SKIP_VERSION_CHECK: "1"
@@ -167,7 +167,7 @@ jobs:
         LDFLAGS: "-Wl,--as-needed"
         RUSTFLAGS: "-C lto=fat -Z mir-opt-level=4 -Z virtual-function-elimination -Z threads=2 -D warnings -C target-feature=-crt-static"
       with:
-        rust-toolchain: nightly-2024-08-05
+        rust-toolchain: nightly-2024-09-13
         rustup-components: rust-src
         target: ${{ matrix.platform.target }}
         manylinux: musllinux_1_2
@@ -263,7 +263,7 @@ jobs:
         RUSTFLAGS: "${{ matrix.target.rustflags }}"
       with:
         target: ${{ matrix.target.target }}
-        rust-toolchain: nightly-2024-08-05
+        rust-toolchain: nightly-2024-09-13
         rustup-components: rust-src
         manylinux: auto
         args: --release --strip --out=dist --features=${{ matrix.target.features }} -i python${{ matrix.python.version }}
@@ -328,7 +328,7 @@ jobs:
 
     - uses: dtolnay/rust-toolchain@master
       with:
-        toolchain: "nightly-2024-08-05"
+        toolchain: "nightly-2024-09-13"
         targets: "aarch64-apple-darwin, x86_64-apple-darwin"
         components: "rust-src"
 
@@ -398,7 +398,7 @@ jobs:
 
     - uses: dtolnay/rust-toolchain@master
       with:
-        toolchain: "nightly-2024-08-05"
+        toolchain: "nightly-2024-09-13"
         targets: "aarch64-apple-darwin, x86_64-apple-darwin"
         components: "rust-src"
 

.github/workflows/debug.yaml

@@ -10,8 +10,8 @@ jobs:
         profile: [
           { rust: "1.72", features: "" },
           { rust: "1.72", features: "--features=yyjson" },
-          { rust: "nightly-2024-08-05", features: "--features=yyjson,unstable-simd"},
-          { rust: "nightly-2024-08-05", features: "--features=avx512,yyjson,unstable-simd"},
+          { rust: "nightly-2024-09-13", features: "--features=yyjson,unstable-simd"},
+          { rust: "nightly-2024-09-13", features: "--features=avx512,yyjson,unstable-simd"},
         ]
         python: [
           { version: '3.13' },

Cargo.toml

@@ -67,7 +67,7 @@ half = { version = "2", default-features = false, features = ["std"] }
 itoa = { version = "1", default-features = false }
 itoap = { version = "1", features = ["std", "simd"] }
 once_cell = { version = "1", default-features = false, features = ["alloc", "race"] }
-pyo3-ffi = { version = "^0.22", default-features = false, features = ["extension-module"]}
+pyo3-ffi = { path = "include/pyo3/pyo3-ffi", default-features = false, features = ["extension-module"]}
 ryu = { version = "1", default-features = false }
 serde = { version = "1", default-features = false }
 serde_json = { version = "1", default-features = false, features = ["std", "float_roundtrip"] }
@@ -78,7 +78,7 @@ xxhash-rust = { version = "^0.8", default-features = false, features = ["xxh3"]
 
 [build-dependencies]
 cc = { version = "1" }
-pyo3-build-config = { version = "^0.22" }
+pyo3-build-config = { path = "include/pyo3/pyo3-build-config" }
 version_check = { version = "0.9" }
 
 [profile.dev]

README.md

@@ -1205,7 +1205,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-2024-08-05` and stable 1.72. It
+The project's own CI tests against `nightly-2024-09-13` and stable 1.72. It
 is prudent to pin the nightly version because that channel can introduce
 breaking changes.
 

build.rs

@@ -20,6 +20,7 @@ fn main() {
     println!("cargo:rustc-check-cfg=cfg(Py_3_13)");
     println!("cargo:rustc-check-cfg=cfg(Py_3_8)");
     println!("cargo:rustc-check-cfg=cfg(Py_3_9)");
+    println!("cargo:rustc-check-cfg=cfg(Py_GIL_DISABLED)");
 
     for cfg in pyo3_build_config::get().build_script_outputs() {
         println!("{cfg}");

ci/azure-pipelines.yml

@@ -1,5 +1,5 @@
 variables:
-  toolchain: nightly-2024-08-05
+  toolchain: nightly-2024-09-13
 
 jobs:
 

include/pyo3/pyo3-build-config/Cargo.toml

@@ -0,0 +1,42 @@
+[package]
+name = "pyo3-build-config"
+version = "0.23.0-dev"
+description = "Build configuration for the PyO3 ecosystem"
+authors = ["PyO3 Project and Contributors <https://github.com/PyO3>"]
+keywords = ["pyo3", "python", "cpython", "ffi"]
+homepage = "https://github.com/pyo3/pyo3"
+repository = "https://github.com/pyo3/pyo3"
+categories = ["api-bindings", "development-tools::ffi"]
+license = "MIT OR Apache-2.0"
+edition = "2021"
+
+[dependencies]
+once_cell = "1"
+python3-dll-a = { version = "0.2.6", optional = true }
+target-lexicon = "0.12.14"
+
+[build-dependencies]
+python3-dll-a = { version = "0.2.6", optional = true }
+target-lexicon = "0.12.14"
+
+[features]
+default = []
+
+# Attempt to resolve a Python interpreter config for building in the build
+# script. If this feature isn't enabled, the build script no-ops.
+resolve-config = []
+
+# This feature is enabled by pyo3 when building an extension module.
+extension-module = []
+
+# These features are enabled by pyo3 when building Stable ABI extension modules.
+abi3 = []
+abi3-py37 = ["abi3-py38"]
+abi3-py38 = ["abi3-py39"]
+abi3-py39 = ["abi3-py310"]
+abi3-py310 = ["abi3-py311"]
+abi3-py311 = ["abi3-py312"]
+abi3-py312 = ["abi3"]
+
+[package.metadata.docs.rs]
+features = ["resolve-config"]

include/pyo3/pyo3-build-config/build.rs

@@ -0,0 +1,58 @@
+// Import some modules from this crate inline to generate the build config.
+// Allow dead code because not all code in the modules is used in this build script.
+
+#[path = "src/impl_.rs"]
+#[allow(dead_code)]
+mod impl_;
+
+#[path = "src/errors.rs"]
+#[allow(dead_code)]
+mod errors;
+
+use std::{env, path::Path};
+
+use errors::{Context, Result};
+use impl_::{make_interpreter_config, InterpreterConfig};
+
+fn configure(interpreter_config: Option<InterpreterConfig>, name: &str) -> Result<bool> {
+    let target = Path::new(&env::var_os("OUT_DIR").unwrap()).join(name);
+    if let Some(config) = interpreter_config {
+        config
+            .to_writer(&mut std::fs::File::create(&target).with_context(|| {
+                format!("failed to write config file at {}", target.display())
+            })?)?;
+        Ok(true)
+    } else {
+        std::fs::File::create(&target)
+            .with_context(|| format!("failed to create new file at {}", target.display()))?;
+        Ok(false)
+    }
+}
+
+fn generate_build_configs() -> Result<()> {
+    // If PYO3_CONFIG_FILE is set, copy it into the crate.
+    let configured = configure(
+        InterpreterConfig::from_pyo3_config_file_env().transpose()?,
+        "pyo3-build-config-file.txt",
+    )?;
+
+    if configured {
+        // Don't bother trying to find an interpreter on the host system
+        // if the user-provided config file is present.
+        configure(None, "pyo3-build-config.txt")?;
+    } else {
+        configure(Some(make_interpreter_config()?), "pyo3-build-config.txt")?;
+    }
+    Ok(())
+}
+
+fn main() {
+    if std::env::var("CARGO_FEATURE_RESOLVE_CONFIG").is_ok() {
+        if let Err(e) = generate_build_configs() {
+            eprintln!("error: {}", e.report());
+            std::process::exit(1)
+        }
+    } else {
+        eprintln!("resolve-config feature not enabled; build script in no-op mode");
+    }
+}