Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: ijl/orjson
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 3.9.9
Choose a base ref
...
head repository: ijl/orjson
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 3.9.10
Choose a head ref
  • 2 commits
  • 6 files changed
  • 1 contributor

Commits on Oct 26, 2023

  1. cargo update, misc build

    @ijl
    ijl committed Oct 26, 2023
    Copy the full SHA
    fa9ddd0 View commit details

  2. 3.9.10

    @ijl
    ijl committed Oct 26, 2023
    Copy the full SHA
    399b36a View commit details
Showing with 49 additions and 19 deletions.
  1. +1 −0 .github/workflows/debug.yaml
  2. +8 −0 CHANGELOG.md
  3. +32 −11 Cargo.lock
  4. +4 −4 Cargo.toml
  5. +3 −3 src/lib.rs
  6. +1 −1 src/str/create.rs
1 change: 1 addition & 0 deletions .github/workflows/debug.yaml
View file
Original file line number Diff line number Diff line change
@@ -12,6 +12,7 @@ jobs:
{ version: "nightly-2023-10-10" },
]
python: [
{ version: '3.12', abi: 'cp312-cp312' },
{ version: '3.11', abi: 'cp311-cp311' },
{ version: '3.8', abi: 'cp38-cp38' },
]
8 changes: 8 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
# Changelog


## 3.9.10 - 2023-10-26

### Fixed

- Fix debug assert failure on 3.12 `--profile=dev` build.


## 3.9.9 - 2023-10-12

### Changed
43 changes: 32 additions & 11 deletions Cargo.lock
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "orjson"
version = "3.9.9"
version = "3.9.10"
authors = ["ijl <ijl@mailbox.org>"]
description = "Fast, correct Python JSON library supporting dataclasses, datetimes, and numpy"
edition = "2021"
@@ -48,12 +48,12 @@ no-panic = [
yyjson = []

[dependencies]
ahash = { version = "0.8", default_features = false }
ahash = { version = "^0.8.6", default_features = false }
arrayvec = { version = "0.7", default_features = false, features = ["std", "serde"] }
associative-cache = { version = "2", default_features = false }
beef = { version = "0.5", default_features = false, features = ["impl_serde"] }
bytecount = { version = "^0.6.4", default_features = false, features = ["runtime-dispatch-simd"] }
chrono = { version = "^0.4.24", default_features = false }
bytecount = { version = "^0.6.7", default_features = false, features = ["runtime-dispatch-simd"] }
chrono = { version = "^0.4.31", default_features = false }
compact_str = { version = "0.7", default_features = false, features = ["serde"] }
encoding_rs = { version = "0.8", default_features = false }
itoa = { version = "1", default_features = false }
6 changes: 3 additions & 3 deletions src/lib.rs
View file
Original file line number Diff line number Diff line change
@@ -208,7 +208,7 @@ fn raise_loads_exception(err: deserialize::DeserializeError) -> *mut PyObject {
PyTuple_SET_ITEM(args, 1, doc);
PyTuple_SET_ITEM(args, 2, pos);
PyErr_SetObject(typeref::JsonDecodeError, args);
debug_assert!(ffi!(Py_REFCNT(args)) == 2);
debug_assert!(ffi!(Py_REFCNT(args)) <= 2);
Py_DECREF(args);
};
null_mut()
@@ -222,7 +222,7 @@ fn raise_dumps_exception_fixed(msg: &str) -> *mut PyObject {
let err_msg =
PyUnicode_FromStringAndSize(msg.as_ptr() as *const c_char, msg.len() as isize);
PyErr_SetObject(typeref::JsonEncodeError, err_msg);
debug_assert!(ffi!(Py_REFCNT(err_msg)) == 2);
debug_assert!(ffi!(Py_REFCNT(err_msg)) <= 2);
Py_DECREF(err_msg);
};
null_mut()
@@ -239,7 +239,7 @@ fn raise_dumps_exception_dynamic(err: &String) -> *mut PyObject {
let err_msg =
PyUnicode_FromStringAndSize(err.as_ptr() as *const c_char, err.len() as isize);
PyErr_SetObject(typeref::JsonEncodeError, err_msg);
debug_assert!(ffi!(Py_REFCNT(err_msg)) == 2);
debug_assert!(ffi!(Py_REFCNT(err_msg)) <= 2);
Py_DECREF(err_msg);

if !cause_exc.is_null() {
2 changes: 1 addition & 1 deletion src/str/create.rs
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: (Apache-2.0 OR MIT)

use crate::str::check::is_four_byte;
use crate::str::is_four_byte;

use crate::typeref::EMPTY_UNICODE;
use pyo3_ffi::*;