cargo update, build and tooling misc

.github/workflows/linux.yaml

@@ -64,7 +64,7 @@ jobs:
       CC: "clang"
       CFLAGS: "-O2 -fno-plt -flto=thin"
       LDFLAGS: "-O2 -flto=thin -fuse-ld=lld -Wl,--as-needed"
-      RUSTFLAGS: "-C linker=clang -C link-arg=-fuse-ld=lld"
+      RUSTFLAGS: "-C linker=clang -C linker-plugin-lto -C link-arg=-fuse-ld=lld"
       CARGO_UNSTABLE_SPARSE_REGISTRY: "true"
     container:
       image: quay.io/pypa/manylinux_2_28_x86_64:latest

ci/azure-macos.yml

@@ -26,7 +26,7 @@ steps:
     maturin build --release --strip --features=no-panic,yyjson --interpreter $(interpreter) --target=universal2-apple-darwin
   env:
     CC: "clang"
-    LDFLAGS: "-O2 -flto=thin -fuse-ld=lld -Wl,--as-needed"
+    LDFLAGS: "-O2 -flto=thin -Wl,--as-needed"
     CFLAGS: "-O2 -fno-plt -flto=thin"
     CFLAGS_x86_64_apple_darwin: "-O2 -fno-plt -flto=thin -march=x86-64-v2 -mtune=generic"
     CFLAGS_aarch64_apple_darwin: "-O2 -fno-plt -flto=thin -mcpu=apple-m1 -mtune=generic"

ci/config.toml

@@ -4,11 +4,17 @@ build-std-features = ["panic_immediate_abort"]
 
 [target.x86_64-apple-darwin]
 linker = "clang"
-rustflags = ["-C", "target-cpu=x86-64-v2", "-Z", "tune-cpu=generic"]
+rustflags = [
+    "-C", "linker-plugin-lto",
+    "-C", "target-cpu=x86-64-v2",
+]
 
 [target.aarch64-apple-darwin]
 linker = "clang"
-rustflags = ["-C", "target-cpu=apple-m1"]
+rustflags = [
+    "-C", "linker-plugin-lto",
+    "-C", "target-cpu=apple-m1",
+]
 
 [target.armv7-unknown-linux-gnueabihf]
 rustflags = ["-C", "opt-level=s"]

integration/wsgi.py

@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
-from datetime import datetime
+from datetime import datetime, timezone
 from uuid import uuid4
 
 from flask import Flask
@@ -9,7 +9,7 @@
 
 app = Flask(__name__)
 
-NOW = datetime.utcnow()
+NOW = datetime.now(timezone.utc)
 
 
 @app.route("/")

pyproject.toml

@@ -39,20 +39,21 @@ include = [
     { format = "sdist", path = "include/**/*" },
 ]
 
-
-[tool.black]
-line-length = 88
-target-version = ["py38"]
-include = ".pyi?$"
-
 [tool.ruff]
 line-length = 88
 target-version = "py38"
 
+select = [
+    "I",
+]
+
 ignore = [
     "E501", # line too long
     "F601", # Dictionary key literal ... repeated
 ]
 
+[tool.ruff.lint.isort]
+known-first-party = ["orjson"]
+
 [tool.mypy]
 python_version = "3.8"

requirements.txt

@@ -1,9 +1,6 @@
 -r bench/requirements.txt
 -r integration/requirements.txt
 -r test/requirements.txt
-autoflake
-black
-isort
 maturin
 mypy
 ruff

script/develop

@@ -5,7 +5,7 @@ rm -f target/wheels/*
 export CC="clang"
 export CFLAGS="-O2 -fno-plt -flto=thin"
 export LDFLAGS="${CFLAGS} -fuse-ld=lld -Wl,--as-needed"
-export RUSTFLAGS="-C linker=clang -C link-arg=-fuse-ld=lld"
+export RUSTFLAGS="-C linker=clang -C linker-plugin-lto -C link-arg=-fuse-ld=lld"
 
 maturin build "$@"
 

script/lint

@@ -6,8 +6,6 @@ to_lint="./bench/*.py ./pysrc/orjson/__init__.pyi ./test/*.py script/pydataclass
 script/pysort script/pynumpy script/pynonstr script/pycorrectness script/graph integration/init
 integration/wsgi.py integration/typestubs.py integration/thread"
 
-autoflake --in-place --recursive --remove-all-unused-imports --ignore-init-module-imports .
-isort ${to_lint}
 ruff ${to_lint} --fix
-black ${to_lint}
+ruff format ${to_lint}
 mypy --ignore-missing-imports --check-untyped-defs ./bench/*.py ./pysrc/orjson/__init__.pyi ./test/*.py

script/pynumpy

@@ -39,9 +39,7 @@ elif kind == "int32":
 elif kind == "uint8":
     array = numpy.random.randint(((2**8) - 1), size=(100000, 100), dtype=numpy.uint8)
 elif kind == "uint16":
-    array = numpy.random.randint(
-        ((2**16) - 1), size=(100000, 100), dtype=numpy.uint16
-    )
+    array = numpy.random.randint(((2**16) - 1), size=(100000, 100), dtype=numpy.uint16)
 else:
     print("usage: pynumpy (bool|int16|int32|float64|int8|uint8|uint16)")
     sys.exit(1)

src/deserialize/yyjson.rs

@@ -164,10 +164,7 @@ fn parse_yy_object(elem: *mut yyjson_val) -> NonNull<pyo3_ffi::PyObject> {
             return nonnull!(ffi!(PyDict_New()));
         }
         let mut key = unsafe_yyjson_get_first(elem);
-        #[cfg(not(Py_3_13))]
         let dict = ffi!(_PyDict_NewPresized(len as isize));
-        #[cfg(Py_3_13)]
-        let dict = ffi!(PyDict_New());
         for _ in 0..=len - 1 {
             let val = key.add(1);
             let key_str = str_from_slice!((*key).uni.str_ as *const u8, unsafe_yyjson_get_len(key));

src/typeref.rs

@@ -236,11 +236,9 @@ unsafe fn look_up_json_exc() -> *mut PyObject {
 
 #[cold]
 #[cfg_attr(feature = "optimize", optimize(size))]
-unsafe fn look_up_numpy_type(numpy_module: *mut PyObject, np_type: &str) -> *mut PyTypeObject {
-    let mod_dict = PyObject_GenericGetDict(numpy_module, null_mut());
-    let ptr = PyMapping_GetItemString(mod_dict, np_type.as_ptr() as *const c_char);
+unsafe fn look_up_numpy_type(numpy_module_dict: *mut PyObject, np_type: &str) -> *mut PyTypeObject {
+    let ptr = PyMapping_GetItemString(numpy_module_dict, np_type.as_ptr() as *const c_char);
     Py_XDECREF(ptr);
-    Py_XDECREF(mod_dict);
     ptr as *mut PyTypeObject
 }
 
@@ -253,21 +251,23 @@ pub fn load_numpy_types() -> Box<Option<NonNull<NumpyTypes>>> {
             PyErr_Clear();
             return Box::new(None);
         }
+        let numpy_module_dict = PyObject_GenericGetDict(numpy, null_mut());
         let types = Box::new(NumpyTypes {
-            array: look_up_numpy_type(numpy, "ndarray\0"),
-            float32: look_up_numpy_type(numpy, "float32\0"),
-            float64: look_up_numpy_type(numpy, "float64\0"),
-            int8: look_up_numpy_type(numpy, "int8\0"),
-            int16: look_up_numpy_type(numpy, "int16\0"),
-            int32: look_up_numpy_type(numpy, "int32\0"),
-            int64: look_up_numpy_type(numpy, "int64\0"),
-            uint16: look_up_numpy_type(numpy, "uint16\0"),
-            uint32: look_up_numpy_type(numpy, "uint32\0"),
-            uint64: look_up_numpy_type(numpy, "uint64\0"),
-            uint8: look_up_numpy_type(numpy, "uint8\0"),
-            bool_: look_up_numpy_type(numpy, "bool_\0"),
-            datetime64: look_up_numpy_type(numpy, "datetime64\0"),
+            array: look_up_numpy_type(numpy_module_dict, "ndarray\0"),
+            float32: look_up_numpy_type(numpy_module_dict, "float32\0"),
+            float64: look_up_numpy_type(numpy_module_dict, "float64\0"),
+            int8: look_up_numpy_type(numpy_module_dict, "int8\0"),
+            int16: look_up_numpy_type(numpy_module_dict, "int16\0"),
+            int32: look_up_numpy_type(numpy_module_dict, "int32\0"),
+            int64: look_up_numpy_type(numpy_module_dict, "int64\0"),
+            uint16: look_up_numpy_type(numpy_module_dict, "uint16\0"),
+            uint32: look_up_numpy_type(numpy_module_dict, "uint32\0"),
+            uint64: look_up_numpy_type(numpy_module_dict, "uint64\0"),
+            uint8: look_up_numpy_type(numpy_module_dict, "uint8\0"),
+            bool_: look_up_numpy_type(numpy_module_dict, "bool_\0"),
+            datetime64: look_up_numpy_type(numpy_module_dict, "datetime64\0"),
         });
+        Py_XDECREF(numpy_module_dict);
         Py_XDECREF(numpy);
         Box::new(Some(nonnull!(Box::<NumpyTypes>::into_raw(types))))
     }