script, lint misc

requirements.txt

@@ -1,8 +1,12 @@
+-r bench/requirements.txt
+-r integration/requirements.txt
+-r test/requirements.txt
 autoflake
 black
 isort
 maturin
 mypy
--r test/requirements.txt
--r bench/requirements.txt
--r integration/requirements.txt
+types-python-dateutil
+types-pytz
+types-simplejson
+types-ujson

graph → script/graph

@@ -7,8 +7,8 @@ import json
 import os
 import sys
 
-from tabulate import tabulate
 import matplotlib.pyplot as plt
+from tabulate import tabulate
 
 LIBRARIES = ("orjson", "ujson", "rapidjson", "simplejson", "json")
 

lint → script/lint

@@ -2,7 +2,10 @@
 
 set -eou pipefail
 
+to_lint="./bench/*.py ./orjson.pyi ./test/*.py script/pydataclass script/pymem
+script/pysort script/pynumpy script/pynonstr script/pycorrectness script/graph"
+
 autoflake --in-place --recursive --remove-all-unused-imports --ignore-init-module-imports .
-isort ./bench/*.py ./orjson.pyi ./test/*.py pydataclass pymem pysort pynumpy pynonstr pycorrectness
-black ./bench/*.py ./orjson.pyi ./test/*.py pydataclass pymem pysort pynumpy pynonstr pycorrectness
+isort ${to_lint}
+black ${to_lint}
 mypy --ignore-missing-imports ./bench/*.py ./orjson.pyi ./test/*.py

pyindent → script/pyindent

@@ -4,17 +4,18 @@
 import io
 import json
 import lzma
-import sys
 import os
+import sys
 from pathlib import Path
 from timeit import timeit
 
-import orjson
+import rapidjson
 import simplejson
 import ujson
-import rapidjson
 from tabulate import tabulate
 
+import orjson
+
 os.sched_setaffinity(os.getpid(), {0, 1})
 
 
@@ -29,6 +30,7 @@ def read_fixture_obj(filename):
         contents = path.read_bytes()
     return orjson.loads(contents)
 
+
 filename = sys.argv[1] if len(sys.argv) >= 1 else ""
 
 data = read_fixture_obj(f"{filename}.json.xz")
@@ -43,61 +45,65 @@ output_in_kib_pretty = len(orjson.dumps(data, option=orjson.OPT_INDENT_2)) / 102
 # minimum 2s runtime for orjson compact
 ITERATIONS = int(2 / (timeit(lambda: orjson.dumps(data), number=20) / 20))
 
-print(f"{output_in_kib_compact:,.0f}KiB compact, {output_in_kib_pretty:,.0f}KiB pretty, {ITERATIONS} iterations")
+print(
+    f"{output_in_kib_compact:,.0f}KiB compact, {output_in_kib_pretty:,.0f}KiB pretty, {ITERATIONS} iterations"
+)
+
 
 def per_iter_latency(val):
     if val is None:
         return None
     return (val * 1000) / ITERATIONS
 
+
 def test_correctness(serialized):
     return orjson.loads(serialized) == data
 
+
 table = []
 for lib_name in LIBRARIES:
     print(f"{lib_name}...")
     if lib_name == "json":
         time_compact = timeit(
-            lambda: json.dumps(data).encode("utf-8"), number=ITERATIONS,
+            lambda: json.dumps(data).encode("utf-8"),
+            number=ITERATIONS,
         )
         time_pretty = timeit(
-            lambda: json.dumps(data, indent=2).encode("utf-8"), number=ITERATIONS,
-        )
-        correct = test_correctness(
-            json.dumps(data, indent=2).encode("utf-8")
+            lambda: json.dumps(data, indent=2).encode("utf-8"),
+            number=ITERATIONS,
         )
+        correct = test_correctness(json.dumps(data, indent=2).encode("utf-8"))
     elif lib_name == "simplejson":
         time_compact = timeit(
-            lambda: simplejson.dumps(data).encode("utf-8"), number=ITERATIONS,
+            lambda: simplejson.dumps(data).encode("utf-8"),
+            number=ITERATIONS,
         )
         time_pretty = timeit(
-            lambda: simplejson.dumps(data, indent=2).encode("utf-8"), number=ITERATIONS,
-        )
-        correct = test_correctness(
-            simplejson.dumps(data, indent=2).encode("utf-8")
+            lambda: simplejson.dumps(data, indent=2).encode("utf-8"),
+            number=ITERATIONS,
         )
+        correct = test_correctness(simplejson.dumps(data, indent=2).encode("utf-8"))
     elif lib_name == "ujson":
         time_compact = timeit(
-            lambda: ujson.dumps(data).encode("utf-8"), number=ITERATIONS,
+            lambda: ujson.dumps(data).encode("utf-8"),
+            number=ITERATIONS,
         )
         time_pretty = timeit(
-            lambda: ujson.dumps(data, indent=2).encode("utf-8"), number=ITERATIONS,
-        )
-        correct = test_correctness(
-            ujson.dumps(data, indent=2).encode("utf-8")
+            lambda: ujson.dumps(data, indent=2).encode("utf-8"),
+            number=ITERATIONS,
         )
+        correct = test_correctness(ujson.dumps(data, indent=2).encode("utf-8"))
     elif lib_name == "rapidjson":
         time_compact = timeit(lambda: rapidjson.dumps(data), number=ITERATIONS)
         time_pretty = None
         correct = False
     elif lib_name == "orjson":
         time_compact = timeit(lambda: orjson.dumps(data), number=ITERATIONS)
         time_pretty = timeit(
-            lambda: orjson.dumps(data, None, orjson.OPT_INDENT_2), number=ITERATIONS,
-        )
-        correct = test_correctness(
-            orjson.dumps(data, None, orjson.OPT_INDENT_2)
+            lambda: orjson.dumps(data, None, orjson.OPT_INDENT_2),
+            number=ITERATIONS,
         )
+        correct = test_correctness(orjson.dumps(data, None, orjson.OPT_INDENT_2))
         orjson_time_pretty = per_iter_latency(time_pretty)
     else:
         raise NotImplementedError

src/deserialize/deserializer.rs

@@ -197,7 +197,7 @@ impl<'de> Visitor<'de> for JsonValue {
                 }
                 Ok(nonnull!(ptr))
             }
-            Err(err) => std::result::Result::Err(err),
+            Err(err) => Result::Err(err),
         }
     }
 

src/serialize/numpy.rs

@@ -317,7 +317,7 @@ impl<'p> Serialize for NumpyArray {
 
 #[repr(transparent)]
 struct DataTypeF32 {
-    pub obj: f32,
+    obj: f32,
 }
 
 impl<'p> Serialize for DataTypeF32 {
@@ -331,7 +331,7 @@ impl<'p> Serialize for DataTypeF32 {
 
 #[repr(transparent)]
 pub struct DataTypeF64 {
-    pub obj: f64,
+    obj: f64,
 }
 
 impl<'p> Serialize for DataTypeF64 {
@@ -345,7 +345,7 @@ impl<'p> Serialize for DataTypeF64 {
 
 #[repr(transparent)]
 pub struct DataTypeI8 {
-    pub obj: i8,
+    obj: i8,
 }
 
 impl<'p> Serialize for DataTypeI8 {
@@ -359,7 +359,7 @@ impl<'p> Serialize for DataTypeI8 {
 
 #[repr(transparent)]
 pub struct DataTypeI32 {
-    pub obj: i32,
+    obj: i32,
 }
 
 impl<'p> Serialize for DataTypeI32 {
@@ -373,7 +373,7 @@ impl<'p> Serialize for DataTypeI32 {
 
 #[repr(transparent)]
 pub struct DataTypeI64 {
-    pub obj: i64,
+    obj: i64,
 }
 
 impl<'p> Serialize for DataTypeI64 {
@@ -387,7 +387,7 @@ impl<'p> Serialize for DataTypeI64 {
 
 #[repr(transparent)]
 pub struct DataTypeU8 {
-    pub obj: u8,
+    obj: u8,
 }
 
 impl<'p> Serialize for DataTypeU8 {
@@ -401,7 +401,7 @@ impl<'p> Serialize for DataTypeU8 {
 
 #[repr(transparent)]
 pub struct DataTypeU32 {
-    pub obj: u32,
+    obj: u32,
 }
 
 impl<'p> Serialize for DataTypeU32 {
@@ -415,7 +415,7 @@ impl<'p> Serialize for DataTypeU32 {
 
 #[repr(transparent)]
 pub struct DataTypeU64 {
-    pub obj: u64,
+    obj: u64,
 }
 
 impl<'p> Serialize for DataTypeU64 {
@@ -429,7 +429,7 @@ impl<'p> Serialize for DataTypeU64 {
 
 #[repr(transparent)]
 pub struct DataTypeBOOL {
-    pub obj: u8,
+    obj: u8,
 }
 
 impl<'p> Serialize for DataTypeBOOL {
@@ -442,8 +442,8 @@ impl<'p> Serialize for DataTypeBOOL {
 }
 
 pub struct NumpyScalar {
-    pub ptr: *mut pyo3::ffi::PyObject,
-    pub opts: Opt,
+    ptr: *mut pyo3::ffi::PyObject,
+    opts: Opt,
 }
 
 impl NumpyScalar {
@@ -495,9 +495,9 @@ impl<'p> Serialize for NumpyScalar {
 
 #[repr(C)]
 pub struct NumpyInt8 {
-    pub ob_refcnt: Py_ssize_t,
-    pub ob_type: *mut PyTypeObject,
-    pub value: i8,
+    ob_refcnt: Py_ssize_t,
+    ob_type: *mut PyTypeObject,
+    value: i8,
 }
 
 impl<'p> Serialize for NumpyInt8 {
@@ -511,9 +511,9 @@ impl<'p> Serialize for NumpyInt8 {
 
 #[repr(C)]
 pub struct NumpyInt32 {
-    pub ob_refcnt: Py_ssize_t,
-    pub ob_type: *mut PyTypeObject,
-    pub value: i32,
+    ob_refcnt: Py_ssize_t,
+    ob_type: *mut PyTypeObject,
+    value: i32,
 }
 
 impl<'p> Serialize for NumpyInt32 {
@@ -527,9 +527,9 @@ impl<'p> Serialize for NumpyInt32 {
 
 #[repr(C)]
 pub struct NumpyInt64 {
-    pub ob_refcnt: Py_ssize_t,
-    pub ob_type: *mut PyTypeObject,
-    pub value: i64,
+    ob_refcnt: Py_ssize_t,
+    ob_type: *mut PyTypeObject,
+    value: i64,
 }
 
 impl<'p> Serialize for NumpyInt64 {
@@ -543,9 +543,9 @@ impl<'p> Serialize for NumpyInt64 {
 
 #[repr(C)]
 pub struct NumpyUint8 {
-    pub ob_refcnt: Py_ssize_t,
-    pub ob_type: *mut PyTypeObject,
-    pub value: u8,
+    ob_refcnt: Py_ssize_t,
+    ob_type: *mut PyTypeObject,
+    value: u8,
 }
 
 impl<'p> Serialize for NumpyUint8 {
@@ -559,9 +559,9 @@ impl<'p> Serialize for NumpyUint8 {
 
 #[repr(C)]
 pub struct NumpyUint32 {
-    pub ob_refcnt: Py_ssize_t,
-    pub ob_type: *mut PyTypeObject,
-    pub value: u32,
+    ob_refcnt: Py_ssize_t,
+    ob_type: *mut PyTypeObject,
+    value: u32,
 }
 
 impl<'p> Serialize for NumpyUint32 {
@@ -575,9 +575,9 @@ impl<'p> Serialize for NumpyUint32 {
 
 #[repr(C)]
 pub struct NumpyUint64 {
-    pub ob_refcnt: Py_ssize_t,
-    pub ob_type: *mut PyTypeObject,
-    pub value: u64,
+    ob_refcnt: Py_ssize_t,
+    ob_type: *mut PyTypeObject,
+    value: u64,
 }
 
 impl<'p> Serialize for NumpyUint64 {
@@ -591,9 +591,9 @@ impl<'p> Serialize for NumpyUint64 {
 
 #[repr(C)]
 pub struct NumpyFloat32 {
-    pub ob_refcnt: Py_ssize_t,
-    pub ob_type: *mut PyTypeObject,
-    pub value: f32,
+    ob_refcnt: Py_ssize_t,
+    ob_type: *mut PyTypeObject,
+    value: f32,
 }
 
 impl<'p> Serialize for NumpyFloat32 {
@@ -607,9 +607,9 @@ impl<'p> Serialize for NumpyFloat32 {
 
 #[repr(C)]
 pub struct NumpyFloat64 {
-    pub ob_refcnt: Py_ssize_t,
-    pub ob_type: *mut PyTypeObject,
-    pub value: f64,
+    ob_refcnt: Py_ssize_t,
+    ob_type: *mut PyTypeObject,
+    value: f64,
 }
 
 impl<'p> Serialize for NumpyFloat64 {
@@ -623,9 +623,9 @@ impl<'p> Serialize for NumpyFloat64 {
 
 #[repr(C)]
 pub struct NumpyBool {
-    pub ob_refcnt: Py_ssize_t,
-    pub ob_type: *mut PyTypeObject,
-    pub value: bool,
+    ob_refcnt: Py_ssize_t,
+    ob_type: *mut PyTypeObject,
+    value: bool,
 }
 
 impl<'p> Serialize for NumpyBool {
@@ -794,9 +794,9 @@ impl NumpyDatetimeUnit {
 
 #[repr(C)]
 pub struct NumpyDatetime64 {
-    pub ob_refcnt: Py_ssize_t,
-    pub ob_type: *mut PyTypeObject,
-    pub value: i64,
+    ob_refcnt: Py_ssize_t,
+    ob_type: *mut PyTypeObject,
+    value: i64,
 }
 
 macro_rules! forward_inner {