ormsgpack 1.8.0__tar.gz → 1.9.1__tar.gz

{ormsgpack-1.8.0 → ormsgpack-1.9.1}/CHANGELOG.md

@@ -1,5 +1,19 @@
 # Changelog
 
+## 1.9.1 28/03/2025
+
+### Changed
+
+- Add musllinux wheels [#366](/../../issues/366)
+
+## 1.9.0 23/03/2025
+
+### Changed
+
+- Add `packb` option `OPT_PASSTHROUGH_ENUM` to enable passthrough of Enum objects by [hinthornw](https://github.com/hinthornw) in [#361](/../../pull/361)
+- Add PyInstaller hook [#354](/../../issues/354)
+- Update dependencies
+
 ## 1.8.0 22/02/2025
 
 ### Fixed

{ormsgpack-1.8.0 → ormsgpack-1.9.1}/Cargo.lock

@@ -40,9 +40,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
 [[package]]
 name = "chrono"
-version = "0.4.39"
+version = "0.4.40"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e36cc9d416881d2e24f9a963be5fb1cd90966419ac844274161d10488b3e825"
+checksum = "1a7964611d71df112cb1730f2ee67324fcf4d0fc6606acbbe9bfe06df124637c"
 dependencies = [
  "num-traits",
 ]
@@ -55,9 +55,9 @@ checksum = "43da5946c66ffcc7745f48db692ffbb10a83bfe0afd96235c5c2a4fb23994929"
 
 [[package]]
 name = "half"
-version = "2.4.1"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6dd08c532ae367adf81c312a4580bc67f1d0fe8bc9c460520283f4c0ff277888"
+checksum = "7db2ff139bba50379da6aa0766b52fdcb62cb5b263009b09ed58ba604e14bbd1"
 dependencies = [
  "cfg-if",
  "crunchy",
@@ -65,15 +65,15 @@ dependencies = [
 
 [[package]]
 name = "itoa"
-version = "1.0.14"
+version = "1.0.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d75a2a4b1b190afb6f5425f10f6a8f959d2ea0b9c2b1d79553551850539e4674"
+checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c"
 
 [[package]]
 name = "libc"
-version = "0.2.169"
+version = "0.2.171"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a"
+checksum = "c19937216e9d3aa9956d9bb8dfc0b0c8beb6058fc4f7a4dc4d850edf86a237d6"
 
 [[package]]
 name = "memoffset"
@@ -95,13 +95,13 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.20.3"
+version = "1.21.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "945462a4b81e43c4e3ba96bd7b49d834c6f61198356aa858733bc4acf3cbe62e"
+checksum = "d75b0bedcc4fe52caa0e03d9f1151a323e4aa5e2d78ba3580400cd3c9e2bc4bc"
 
 [[package]]
 name = "ormsgpack"
-version = "1.8.0"
+version = "1.9.1"
 dependencies = [
  "ahash",
  "bytecount",
@@ -112,39 +112,32 @@ dependencies = [
  "once_cell",
  "pyo3",
  "pyo3-build-config",
- "rmp",
  "serde",
  "serde_bytes",
  "simdutf8",
  "smallvec",
 ]
 
-[[package]]
-name = "paste"
-version = "1.0.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a"
-
 [[package]]
 name = "portable-atomic"
-version = "1.10.0"
+version = "1.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "280dc24453071f1b63954171985a0b0d30058d287960968b9b2aca264c8d4ee6"
+checksum = "350e9b48cbc6b0e028b0473b114454c6316e57336ee184ceab6e53f72c178b3e"
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.93"
+version = "1.0.94"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "60946a68e5f9d28b0dc1c21bb8a97ee7d018a8b322fa57838ba31cc878e22d99"
+checksum = "a31971752e70b8b2686d7e46ec17fb38dad4051d94024c88df49b667caea9c84"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "pyo3"
-version = "0.23.4"
+version = "0.24.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57fe09249128b3173d092de9523eaa75136bf7ba85e0d69eca241c7939c933cc"
+checksum = "7f1c6c3591120564d64db2261bec5f910ae454f01def849b9c22835a84695e86"
 dependencies = [
  "cfg-if",
  "libc",
@@ -157,9 +150,9 @@ dependencies = [
 
 [[package]]
 name = "pyo3-build-config"
-version = "0.23.4"
+version = "0.24.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1cd3927b5a78757a0d71aa9dff669f903b1eb64b54142a9bd9f757f8fde65fd7"
+checksum = "e9b6c2b34cf71427ea37c7001aefbaeb85886a074795e35f161f5aecc7620a7a"
 dependencies = [
  "once_cell",
  "target-lexicon",
@@ -167,9 +160,9 @@ dependencies = [
 
 [[package]]
 name = "pyo3-ffi"
-version = "0.23.4"
+version = "0.24.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dab6bb2102bd8f991e7749f130a70d05dd557613e39ed2deeee8e9ca0c4d548d"
+checksum = "5507651906a46432cdda02cd02dd0319f6064f1374c9147c45b978621d2c3a9c"
 dependencies = [
  "libc",
  "pyo3-build-config",
@@ -177,47 +170,36 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.38"
+version = "1.0.40"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e4dccaaaf89514f546c693ddc140f729f958c247918a13380cccc6078391acc"
+checksum = "1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d"
 dependencies = [
  "proc-macro2",
 ]
 
-[[package]]
-name = "rmp"
-version = "0.8.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "228ed7c16fa39782c3b3468e974aec2795e9089153cd08ee2e9aefb3613334c4"
-dependencies = [
- "byteorder",
- "num-traits",
- "paste",
-]
-
 [[package]]
 name = "serde"
-version = "1.0.218"
+version = "1.0.219"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8dfc9d19bdbf6d17e22319da49161d5d0108e4188e8b680aef6299eed22df60"
+checksum = "5f0e2c6ed6606019b4e29e69dbaba95b11854410e5347d525002456dbbb786b6"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_bytes"
-version = "0.11.15"
+version = "0.11.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "387cc504cb06bb40a96c8e04e951fe01854cf6bc921053c954e4a606d9675c6a"
+checksum = "8437fd221bde2d4ca316d61b90e337e9e702b3820b87d63caa9ba6c02bd06d96"
 dependencies = [
  "serde",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.218"
+version = "1.0.219"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f09503e191f4e797cb8aac08e9a4a4695c5edf6a2e70e376d961ddd5c969f82b"
+checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -238,9 +220,9 @@ checksum = "7fcf8323ef1faaee30a44a340193b1ac6814fd9b7b4e88e9d4519a3e4abe1cfd"
 
 [[package]]
 name = "syn"
-version = "2.0.98"
+version = "2.0.100"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "36147f1a48ae0ec2b5b3bc5b537d267457555a10dc06f3dbc8cb11ba3006d3b1"
+checksum = "b09a44accad81e1ba1cd74a32461ba89dee89095ba17b32f5d03683b1b1fc2a0"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -249,15 +231,15 @@ dependencies = [
 
 [[package]]
 name = "target-lexicon"
-version = "0.12.16"
+version = "0.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1"
+checksum = "e502f78cdbb8ba4718f566c418c52bc729126ffd16baee5baa718cf25dd5a69a"
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.17"
+version = "1.0.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "00e2473a93778eb0bad35909dff6a10d28e63f792f16ed15e404fca9d5eeedbe"
+checksum = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512"
 
 [[package]]
 name = "version_check"

{ormsgpack-1.8.0 → ormsgpack-1.9.1}/Cargo.toml

@@ -1,13 +1,13 @@
 [package]
 name = "ormsgpack"
-version = "1.8.0"
+version = "1.9.1"
 authors = [
     "Aviram Hassan <aviramyhassan@gmail.com>",
     "Emanuele Giaquinta <emanuele.giaquinta@gmail.com>",
 ]
 description = "Fast, correct Python msgpack library supporting dataclasses, datetimes, and numpy"
 edition = "2021"
-rust-version = "1.70"
+rust-version = "1.81"
 license = "Apache-2.0 OR MIT"
 repository = "https://github.com/aviramha/ormsgpack"
 homepage = "https://github.com/aviramha/ormsgpack"
@@ -40,19 +40,18 @@ unstable-simd = [
 ahash = { version = "0.8", default-features = false }
 bytecount = { version = "^0.6.7", default-features = false, features = ["runtime-dispatch-simd"] }
 byteorder = { version = "1.5.0", default-features = false, features = ["std"] }
-chrono = { version = "0.4.39", default-features = false }
+chrono = { version = "0.4.40", default-features = false }
 half = { version = "2.4.1", default-features = false }
 itoa = { version = "1", default-features = false }
 once_cell = { version = "1", default-features = false, features = ["race"] }
-pyo3 = { version = "^0.23.4", default-features = false, features = ["extension-module"] }
-rmp = { version = "^0.8.14", default-features = false, features = ["std"] }
+pyo3 = { version = "^0.24.0", default-features = false, features = ["extension-module"] }
 serde = { version = "1", default-features = false }
-serde_bytes = { version = "0.11.15", default-features = false, features = ["std"] }
+serde_bytes = { version = "0.11.16", default-features = false, features = ["std"] }
 simdutf8 = { version = "0.1.5", default-features = false, features = ["std"] }
 smallvec = { version = "^1.13", default-features = false, features = ["union", "write"] }
 
 [build-dependencies]
-pyo3-build-config = { version = "^0.23.3" }
+pyo3-build-config = { version = "^0.24.0" }
 
 [profile.release]
 codegen-units = 1

{ormsgpack-1.8.0 → ormsgpack-1.9.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ormsgpack
-Version: 1.8.0
+Version: 1.9.1
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: Apache Software License
@@ -371,6 +371,10 @@ TypeError: Type is not msgpack serializable: datetime.datetime
 b'\x81\xaacreated_at\xbdThu, 01 Jan 1970 00:00:00 GMT'
 ```
 
+##### `OPT_PASSTHROUGH_ENUM`
+
+Enable passthrough of `enum.Enum` instances to `default`.
+
 ##### `OPT_PASSTHROUGH_SUBCLASS`
 
 Enable passthrough of subclasses of `str`, `int`, `dict` and `list` to
@@ -894,7 +898,7 @@ level above this.
 
 ## Packaging
 
-To package ormsgpack requires [Rust](https://www.rust-lang.org/) 1.70
+To package ormsgpack requires [Rust](https://www.rust-lang.org/) 1.81
 or newer and the [maturin](https://github.com/PyO3/maturin) build
 tool. The default feature `unstable-simd` enables the usage of SIMD
 operations and requires nightly Rust. The recommended build command

{ormsgpack-1.8.0 → ormsgpack-1.9.1}/README.md

@@ -339,6 +339,10 @@ TypeError: Type is not msgpack serializable: datetime.datetime
 b'\x81\xaacreated_at\xbdThu, 01 Jan 1970 00:00:00 GMT'
 ```
 
+##### `OPT_PASSTHROUGH_ENUM`
+
+Enable passthrough of `enum.Enum` instances to `default`.
+
 ##### `OPT_PASSTHROUGH_SUBCLASS`
 
 Enable passthrough of subclasses of `str`, `int`, `dict` and `list` to
@@ -862,7 +866,7 @@ level above this.
 
 ## Packaging
 
-To package ormsgpack requires [Rust](https://www.rust-lang.org/) 1.70
+To package ormsgpack requires [Rust](https://www.rust-lang.org/) 1.81
 or newer and the [maturin](https://github.com/PyO3/maturin) build
 tool. The default feature `unstable-simd` enables the usage of SIMD
 operations and requires nightly Rust. The recommended build command

{ormsgpack-1.8.0 → ormsgpack-1.9.1}/pyproject.toml

@@ -28,7 +28,8 @@ dev = [
     "msgpack",
     "mypy",
     "numpy; platform_machine != 'armv7l'",
-    "pendulum; platform_machine != 'armv7l' and python_version < '3.13'",
+    # importing pendulum makes python crash on alpine
+    # "pendulum; platform_machine != 'armv7l' and python_version < '3.13'",
     "pydantic",
     "pytest",
     "pytest-benchmark",
@@ -52,11 +53,12 @@ exclude = "benchmarks"
 strict = true
 
 [[tool.mypy.overrides]]
-module = ["msgpack"]
+module = ["msgpack", "pendulum"]
 ignore_missing_imports = true
 
 [tool.ruff]
 line-length = 88
+src = ["python"]
 target-version = "py39"
 
 [tool.ruff.lint]
@@ -74,3 +76,6 @@ ignore = [
 
 [tool.ruff.lint.isort]
 known-first-party = ["ormsgpack"]
+
+[project.entry-points.pyinstaller40]
+hook-dirs = "ormsgpack._pyinstaller:get_hook_dirs"

{ormsgpack-1.8.0 → ormsgpack-1.9.1}/python/ormsgpack/__init__.py

@@ -7,6 +7,7 @@ from .ormsgpack import (
     OPT_PASSTHROUGH_BIG_INT,
     OPT_PASSTHROUGH_DATACLASS,
     OPT_PASSTHROUGH_DATETIME,
+    OPT_PASSTHROUGH_ENUM,
     OPT_PASSTHROUGH_SUBCLASS,
     OPT_PASSTHROUGH_TUPLE,
     OPT_PASSTHROUGH_UUID,
@@ -35,6 +36,7 @@ __all__ = (
     "OPT_PASSTHROUGH_BIG_INT",
     "OPT_PASSTHROUGH_DATACLASS",
     "OPT_PASSTHROUGH_DATETIME",
+    "OPT_PASSTHROUGH_ENUM",
     "OPT_PASSTHROUGH_SUBCLASS",
     "OPT_PASSTHROUGH_TUPLE",
     "OPT_PASSTHROUGH_UUID",

{ormsgpack-1.8.0 → ormsgpack-1.9.1}/python/ormsgpack/__init__.pyi

@@ -24,6 +24,7 @@ OPT_OMIT_MICROSECONDS: int
 OPT_PASSTHROUGH_BIG_INT: int
 OPT_PASSTHROUGH_DATACLASS: int
 OPT_PASSTHROUGH_DATETIME: int
+OPT_PASSTHROUGH_ENUM: int
 OPT_PASSTHROUGH_SUBCLASS: int
 OPT_PASSTHROUGH_TUPLE: int
 OPT_PASSTHROUGH_UUID: int

ormsgpack-1.9.1/python/ormsgpack/_pyinstaller/__init__.py

@@ -0,0 +1,7 @@
+# SPDX-License-Identifier: (Apache-2.0 OR MIT)
+
+import os
+
+
+def get_hook_dirs() -> list[str]:
+    return [os.path.dirname(__file__)]

ormsgpack-1.9.1/python/ormsgpack/_pyinstaller/hook-ormsgpack.py

@@ -0,0 +1,7 @@
+# SPDX-License-Identifier: (Apache-2.0 OR MIT)
+
+hiddenimports = [
+    "dataclasses",
+    "enum",
+    "uuid",
+]

{ormsgpack-1.8.0 → ormsgpack-1.9.1}/src/deserialize/deserializer.rs

@@ -4,11 +4,11 @@ use crate::deserialize::cache::*;
 use crate::deserialize::DeserializeError;
 use crate::exc::*;
 use crate::ffi::*;
+use crate::msgpack::Marker;
 use crate::opt::*;
 use crate::typeref::*;
 use crate::unicode::*;
 use byteorder::{BigEndian, ReadBytesExt};
-use rmp::Marker;
 use simdutf8::basic::{from_utf8, Utf8Error};
 use std::borrow::Cow;
 use std::os::raw::c_char;

{ormsgpack-1.8.0 → ormsgpack-1.9.1}/src/exc.rs

@@ -3,4 +3,3 @@
 pub const INVALID_STR: &str = "str is not valid UTF-8: surrogates not allowed";
 pub const RECURSION_LIMIT_REACHED: &str = "Recursion limit reached";
 pub const KEY_MUST_BE_STR: &str = "Dict key must be str";
-pub const PYDANTIC_MUST_HAVE_DICT: &str = "Pydantic's BaseModel must have __dict__ attribute";

{ormsgpack-1.8.0 → ormsgpack-1.9.1}/src/ext.rs

@@ -1,5 +1,5 @@
 use pyo3::ffi::*;
-use std::os::raw::{c_char, c_int, c_uint, c_void};
+use std::os::raw::{c_int, c_uint, c_void};
 use std::ptr::null_mut;
 
 #[repr(C)]
@@ -18,7 +18,7 @@ unsafe extern "C" fn ext_new(
     if Py_SIZE(args) != 2 || !kwds.is_null() {
         PyErr_SetString(
             PyExc_TypeError,
-            "Ext.__new__() takes 2 positional arguments\0".as_ptr() as *const c_char,
+            c"Ext.__new__() takes 2 positional arguments".as_ptr(),
         );
         return null_mut();
     }
@@ -26,7 +26,7 @@ unsafe extern "C" fn ext_new(
     if PyLong_Check(tag) == 0 {
         PyErr_SetString(
             PyExc_TypeError,
-            "Ext.__new__() first argument must be int\0".as_ptr() as *const c_char,
+            c"Ext.__new__() first argument must be int".as_ptr(),
         );
         return null_mut();
     }
@@ -34,7 +34,7 @@ unsafe extern "C" fn ext_new(
     if PyBytes_Check(data) == 0 {
         PyErr_SetString(
             PyExc_TypeError,
-            "Ext.__new__() second argument must be bytes\0".as_ptr() as *const c_char,
+            c"Ext.__new__() second argument must be bytes".as_ptr(),
         );
         return null_mut();
     }
@@ -69,7 +69,7 @@ pub unsafe fn create_ext_type() -> *mut PyTypeObject {
         },
     ];
     let mut spec = PyType_Spec {
-        name: "ormsgpack.Ext\0".as_ptr() as *const c_char,
+        name: c"ormsgpack.Ext".as_ptr(),
         basicsize: std::mem::size_of::<PyExt>() as c_int,
         itemsize: 0,
         flags: Py_TPFLAGS_DEFAULT as c_uint,

{ormsgpack-1.8.0 → ormsgpack-1.9.1}/src/lib.rs

@@ -15,32 +15,34 @@ mod deserialize;
 mod exc;
 mod ext;
 mod ffi;
+mod msgpack;
 mod opt;
 mod serialize;
 mod typeref;
 mod unicode;
 
 use pyo3::ffi::*;
+use std::ffi::CStr;
 use std::os::raw::c_char;
 use std::os::raw::c_int;
 use std::os::raw::c_long;
 use std::os::raw::c_void;
 use std::ptr::NonNull;
 
-const PACKB_DOC: &str =
-    "packb(obj, /, default=None, option=None)\n--\n\nSerialize Python objects to msgpack.\0";
-const UNPACKB_DOC: &str =
-    "unpackb(obj, /, ext_hook=None, option=None)\n--\n\nDeserialize msgpack to Python objects.\0";
+const PACKB_DOC: &CStr =
+    c"packb(obj, /, default=None, option=None)\n--\n\nSerialize Python objects to msgpack.";
+const UNPACKB_DOC: &CStr =
+    c"unpackb(obj, /, ext_hook=None, option=None)\n--\n\nDeserialize msgpack to Python objects.";
 
 macro_rules! module_add_object {
     ($mptr: expr, $name: expr, $object:expr) => {
-        PyModule_AddObject($mptr, $name.as_ptr() as *const c_char, $object);
+        PyModule_AddObject($mptr, $name.as_ptr(), $object);
     };
 }
 
 macro_rules! module_add_int {
     ($mptr:expr, $name:expr, $int:expr) => {
-        PyModule_AddIntConstant($mptr, $name.as_ptr() as *const c_char, $int as c_long);
+        PyModule_AddIntConstant($mptr, $name.as_ptr(), $int as c_long);
     };
 }
 
@@ -50,20 +52,20 @@ macro_rules! module_add_int {
 pub unsafe extern "C" fn PyInit_ormsgpack() -> *mut PyModuleDef {
     let methods: Box<[PyMethodDef; 3]> = Box::new([
         PyMethodDef {
-            ml_name: "packb\0".as_ptr() as *const c_char,
+            ml_name: c"packb".as_ptr(),
             ml_meth: PyMethodDefPointer {
                 PyCFunctionFastWithKeywords: packb,
             },
             ml_flags: METH_FASTCALL | METH_KEYWORDS,
-            ml_doc: PACKB_DOC.as_ptr() as *const c_char,
+            ml_doc: PACKB_DOC.as_ptr(),
         },
         PyMethodDef {
-            ml_name: "unpackb\0".as_ptr() as *const c_char,
+            ml_name: c"unpackb".as_ptr(),
             ml_meth: PyMethodDefPointer {
                 PyCFunctionFastWithKeywords: unpackb,
             },
             ml_flags: METH_FASTCALL | METH_KEYWORDS,
-            ml_doc: UNPACKB_DOC.as_ptr() as *const c_char,
+            ml_doc: UNPACKB_DOC.as_ptr(),
         },
         PyMethodDef::zeroed(),
     ]);
@@ -81,7 +83,7 @@ pub unsafe extern "C" fn PyInit_ormsgpack() -> *mut PyModuleDef {
 
     let init = Box::new(PyModuleDef {
         m_base: PyModuleDef_HEAD_INIT,
-        m_name: "ormsgpack\0".as_ptr() as *const c_char,
+        m_name: c"ormsgpack".as_ptr(),
         m_doc: std::ptr::null(),
         m_size: 0,
         m_methods: Box::into_raw(methods) as *mut PyMethodDef,
@@ -102,41 +104,34 @@ pub unsafe extern "C" fn ormsgpack_exec(mptr: *mut PyObject) -> c_int {
     let version = env!("CARGO_PKG_VERSION");
     module_add_object!(
         mptr,
-        "__version__\0",
+        c"__version__",
         PyUnicode_FromStringAndSize(version.as_ptr() as *const c_char, version.len() as isize)
     );
 
-    module_add_int!(mptr, "OPT_NAIVE_UTC\0", opt::NAIVE_UTC);
-    module_add_int!(mptr, "OPT_NON_STR_KEYS\0", opt::NON_STR_KEYS);
-    module_add_int!(mptr, "OPT_OMIT_MICROSECONDS\0", opt::OMIT_MICROSECONDS);
-    module_add_int!(mptr, "OPT_PASSTHROUGH_BIG_INT\0", opt::PASSTHROUGH_BIG_INT);
+    module_add_int!(mptr, c"OPT_NAIVE_UTC", opt::NAIVE_UTC);
+    module_add_int!(mptr, c"OPT_NON_STR_KEYS", opt::NON_STR_KEYS);
+    module_add_int!(mptr, c"OPT_OMIT_MICROSECONDS", opt::OMIT_MICROSECONDS);
+    module_add_int!(mptr, c"OPT_PASSTHROUGH_BIG_INT", opt::PASSTHROUGH_BIG_INT);
     module_add_int!(
         mptr,
-        "OPT_PASSTHROUGH_DATACLASS\0",
+        c"OPT_PASSTHROUGH_DATACLASS",
         opt::PASSTHROUGH_DATACLASS
     );
-    module_add_int!(
-        mptr,
-        "OPT_PASSTHROUGH_DATETIME\0",
-        opt::PASSTHROUGH_DATETIME
-    );
-    module_add_int!(
-        mptr,
-        "OPT_PASSTHROUGH_SUBCLASS\0",
-        opt::PASSTHROUGH_SUBCLASS
-    );
-    module_add_int!(mptr, "OPT_SERIALIZE_NUMPY\0", opt::SERIALIZE_NUMPY);
-    module_add_int!(mptr, "OPT_SERIALIZE_PYDANTIC\0", opt::SERIALIZE_PYDANTIC);
-    module_add_int!(mptr, "OPT_PASSTHROUGH_TUPLE\0", opt::PASSTHROUGH_TUPLE);
-    module_add_int!(mptr, "OPT_SORT_KEYS\0", opt::SORT_KEYS);
-    module_add_int!(mptr, "OPT_UTC_Z\0", opt::UTC_Z);
-    module_add_int!(mptr, "OPT_PASSTHROUGH_UUID\0", opt::PASSTHROUGH_UUID);
+    module_add_int!(mptr, c"OPT_PASSTHROUGH_DATETIME", opt::PASSTHROUGH_DATETIME);
+    module_add_int!(mptr, c"OPT_PASSTHROUGH_ENUM", opt::PASSTHROUGH_ENUM);
+    module_add_int!(mptr, c"OPT_PASSTHROUGH_SUBCLASS", opt::PASSTHROUGH_SUBCLASS);
+    module_add_int!(mptr, c"OPT_PASSTHROUGH_TUPLE", opt::PASSTHROUGH_TUPLE);
+    module_add_int!(mptr, c"OPT_PASSTHROUGH_UUID", opt::PASSTHROUGH_UUID);
+    module_add_int!(mptr, c"OPT_SERIALIZE_NUMPY", opt::SERIALIZE_NUMPY);
+    module_add_int!(mptr, c"OPT_SERIALIZE_PYDANTIC", opt::SERIALIZE_PYDANTIC);
+    module_add_int!(mptr, c"OPT_SORT_KEYS", opt::SORT_KEYS);
+    module_add_int!(mptr, c"OPT_UTC_Z", opt::UTC_Z);
 
     typeref::init_typerefs();
 
-    module_add_object!(mptr, "MsgpackDecodeError\0", typeref::MsgpackDecodeError);
-    module_add_object!(mptr, "MsgpackEncodeError\0", typeref::MsgpackEncodeError);
-    module_add_object!(mptr, "Ext\0", typeref::EXT_TYPE as *mut PyObject);
+    module_add_object!(mptr, c"MsgpackDecodeError", typeref::MsgpackDecodeError);
+    module_add_object!(mptr, c"MsgpackEncodeError", typeref::MsgpackEncodeError);
+    module_add_object!(mptr, c"Ext", typeref::EXT_TYPE as *mut PyObject);
 
     0
 }

ormsgpack-1.9.1/src/msgpack/array.rs

@@ -0,0 +1,21 @@
+// SPDX-License-Identifier: (Apache-2.0 OR MIT)
+
+use crate::msgpack::marker::Marker;
+use byteorder::{BigEndian, WriteBytesExt};
+
+pub fn write_array_len<W>(writer: &mut W, len: usize) -> Result<(), std::io::Error>
+where
+    W: std::io::Write,
+{
+    if len < 16 {
+        writer.write_u8(Marker::FixArray(len as u8).into())
+    } else if len < 65536 {
+        writer.write_u8(Marker::Array16.into())?;
+        writer.write_u16::<BigEndian>(len as u16)
+    } else if len <= 4294967295 {
+        writer.write_u8(Marker::Array32.into())?;
+        writer.write_u32::<BigEndian>(len as u32)
+    } else {
+        Err(std::io::Error::from(std::io::ErrorKind::InvalidInput))
+    }
+}

ormsgpack-1.9.1/src/msgpack/bin.rs

@@ -0,0 +1,24 @@
+// SPDX-License-Identifier: (Apache-2.0 OR MIT)
+
+use crate::msgpack::marker::Marker;
+use byteorder::{BigEndian, WriteBytesExt};
+
+pub fn write_bin<W>(writer: &mut W, value: &[u8]) -> Result<(), std::io::Error>
+where
+    W: std::io::Write,
+{
+    let len = value.len();
+    if len < 256 {
+        writer.write_u8(Marker::Bin8.into())?;
+        writer.write_u8(len as u8)?;
+    } else if len < 65536 {
+        writer.write_u8(Marker::Bin16.into())?;
+        writer.write_u16::<BigEndian>(len as u16)?;
+    } else if len <= 4294967295 {
+        writer.write_u8(Marker::Bin32.into())?;
+        writer.write_u32::<BigEndian>(len as u32)?;
+    } else {
+        return Err(std::io::Error::from(std::io::ErrorKind::InvalidInput));
+    }
+    writer.write_all(value)
+}

ormsgpack-1.9.1/src/msgpack/bool.rs

@@ -0,0 +1,13 @@
+// SPDX-License-Identifier: (Apache-2.0 OR MIT)
+
+use crate::msgpack::marker::Marker;
+use byteorder::WriteBytesExt;
+
+#[inline]
+pub fn write_bool<W>(writer: &mut W, value: bool) -> Result<(), std::io::Error>
+where
+    W: std::io::Write,
+{
+    let marker = if value { Marker::True } else { Marker::False };
+    writer.write_u8(marker.into())
+}