Skip to content

Commit f94318a

Browse files
ijlijl
committed
cargo update
1 parent ee8759c commit f94318a

10 files changed

Lines changed: 96 additions & 96 deletions

File tree

‎.github/workflows/linux.yaml‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,8 @@ jobs:
6868
options: --user 0
6969
steps:
7070
- run: yum install -y clang lld
71-
- run: curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain nightly-2023-06-30 --profile minimal -y
72-
- run: rustup component add rust-src --toolchain nightly-2023-06-30-x86_64-unknown-linux-gnu
71+
- run: curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain nightly-2023-07-30 --profile minimal -y
72+
- run: rustup component add rust-src --toolchain nightly-2023-07-30-x86_64-unknown-linux-gnu
7373
- uses: actions/checkout@v3
7474

7575
- name: build-std
@@ -82,7 +82,7 @@ jobs:
8282
- run: |
8383
maturin build --release --strip \
8484
--out=dist \
85-
--features=unstable-simd,yyjson \
85+
--features=no-panic,yyjson \
8686
--compatibility manylinux_2_17 \
8787
--interpreter python${{ matrix.python.version }} \
8888
--target=x86_64-unknown-linux-gnu
@@ -139,11 +139,11 @@ jobs:
139139
RUSTFLAGS: "-C target-feature=-crt-static"
140140
CARGO_UNSTABLE_SPARSE_REGISTRY: "true"
141141
with:
142-
rust-toolchain: nightly-2023-06-30
142+
rust-toolchain: nightly-2023-07-30
143143
rustup-components: rust-src
144144
target: ${{ matrix.platform.target }}
145145
manylinux: musllinux_1_1
146-
args: --release --strip --out=dist --features=unstable-simd,yyjson -i python${{ matrix.python.version }}
146+
args: --release --strip --out=dist --features=no-panic,yyjson -i python${{ matrix.python.version }}
147147

148148
- name: Set up QEMU
149149
if: matrix.platform.arch != 'x86_64'
@@ -225,13 +225,12 @@ jobs:
225225
CFLAGS: "${{ matrix.target.cflags }}"
226226
LDFLAGS: "${{ matrix.target.cflags }} -flto -Wl,--as-needed"
227227
CARGO_UNSTABLE_SPARSE_REGISTRY: "true"
228-
CARGO_FEATURE_YYJSON: "1"
229228
with:
230229
target: ${{ matrix.target.target }}
231-
rust-toolchain: nightly-2023-06-30
230+
rust-toolchain: nightly-2023-07-30
232231
rustup-components: rust-src
233232
manylinux: auto
234-
args: --release --strip --out=dist -i python${{ matrix.python.version }}
233+
args: --release --strip --out=dist --features=no-panic,yyjson -i python${{ matrix.python.version }}
235234

236235
- uses: uraimo/run-on-arch-action@v2
237236
name: Test

‎.github/workflows/next.yaml‎

Lines changed: 0 additions & 55 deletions
This file was deleted.

‎Cargo.lock‎

Lines changed: 75 additions & 20 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Cargo.toml‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,11 @@ unstable-simd = [
3838
"encoding_rs/simd-accel",
3939
]
4040

41+
no-panic = [
42+
"itoa/no-panic",
43+
"ryu/no-panic",
44+
]
45+
4146
# Build yyjson as a backend and panic if it fails. The default is to attempt
4247
# to build and on failure fall back to another backend.
4348
yyjson = []
@@ -54,16 +59,16 @@ encoding_rs = { version = "0.8", default_features = false }
5459
itoa = { version = "1", default_features = false }
5560
itoap = { version = "1", features = ["std", "simd"] }
5661
once_cell = { version = "1", default_features = false, features = ["race"] }
57-
pyo3-ffi = { version = "^0.19.1", default_features = false, features = ["extension-module"]}
62+
pyo3-ffi = { version = "^0.19.2", default_features = false, features = ["extension-module"]}
5863
ryu = { version = "1", default_features = false }
5964
serde = { version = "1", default_features = false }
6065
serde_json = { version = "1", default_features = false, features = ["std", "float_roundtrip"] }
6166
simdutf8 = { version = "0.1", default_features = false, features = ["std", "aarch64_neon"] }
62-
smallvec = { version = "^1.10", default_features = false, features = ["union", "write"] }
67+
smallvec = { version = "^1.11", default_features = false, features = ["union", "write"] }
6368

6469
[build-dependencies]
6570
cc = { version = "1" }
66-
pyo3-build-config = { version = "^0.19.1" }
71+
pyo3-build-config = { version = "^0.19.2" }
6772
version_check = { version = "0.9" }
6873

6974
[profile.release]

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1195,7 +1195,7 @@ It benefits from also having a C build environment to compile a faster
11951195
deserialization backend. See this project's `manylinux_2_28` builds for an
11961196
example using clang and LTO.
11971197

1198-
The project's own CI tests against `nightly-2023-06-30` and stable 1.60. It
1198+
The project's own CI tests against `nightly-2023-07-30` and stable 1.60. It
11991199
is prudent to pin the nightly version because that channel can introduce
12001200
breaking changes.
12011201

‎ci/azure-macos.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ steps:
2323
PATH=$HOME/.cargo/bin:$PATH \
2424
MACOSX_DEPLOYMENT_TARGET=$(macosx_deployment_target) \
2525
PYO3_CROSS_LIB_DIR=$(python -c "import sysconfig;print(sysconfig.get_config_var('LIBDIR'))") \
26-
maturin build --release --strip --features=unstable-simd,yyjson --interpreter $(interpreter) --target=universal2-apple-darwin
26+
maturin build --release --strip --features=no-panic,yyjson --interpreter $(interpreter) --target=universal2-apple-darwin
2727
env:
2828
CC: "clang"
2929
LDFLAGS: "-O2 -flto=thin -fuse-ld=lld -Wl,--as-needed"

‎ci/azure-pipelines.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
variables:
2-
toolchain: nightly-2023-06-30
2+
toolchain: nightly-2023-07-30
33

44
jobs:
55

‎ci/azure-win.yml‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,12 @@ steps:
1515
displayName: build dependencies
1616
- script: python.exe -m pip install -r test\requirements.txt -r integration\requirements.txt
1717
displayName: test dependencies
18-
- script: maturin.exe build --release --strip --interpreter $(interpreter)
18+
- script: maturin.exe build --release --features=no-panic,yyjson --strip --interpreter $(interpreter)
1919
displayName: build
2020
- script: python.exe -m pip install orjson --no-index --find-links=D:\a\1\s\target\wheels
2121
displayName: install
2222
- script: python.exe -m pytest -s -rxX -v test
2323
displayName: pytest
24-
- script: python.exe -m pip uninstall -y numpy
25-
displayName: remove optional packages
26-
- script: python.exe -m pytest -s -rxX -v test
27-
displayName: pytest without optional packages
2824
- script: python.exe integration\thread
2925
displayName: thread
3026
- script: python.exe integration\init

‎src/deserialize/error.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ impl<'a> DeserializeError<'a> {
6161
/// Return position of the error in the deserialized data
6262
#[cold]
6363
#[cfg(not(feature = "yyjson"))]
64-
#[cfg_attr(feature = "unstable-simd", optimize(size))]
64+
#[cfg_attr(feature = "optimize", optimize(size))]
6565
pub fn pos(&self) -> i64 {
6666
if self.line == 0 || self.data.is_none() {
6767
return 1;

‎test/test_memory.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ class Object:
6161
for i in range(100000, 101000)
6262
]
6363

64-
MAX_INCREASE = 1048576 # 1MiB
64+
MAX_INCREASE = 2097152 # 2MiB
6565

6666

6767
class Unsupported:

0 commit comments

Comments
 (0)