cargo update

.github/workflows/debug.yaml

@@ -8,9 +8,9 @@ jobs:
  fail-fast: false
  matrix:
  profile: [
- { rust: "1.65", features: "" },
- { rust: "1.65", features: "--features=yyjson" },
- { rust: "nightly-2024-02-03", features: "--features=yyjson,unstable-simd" },
+ { rust: "1.72", features: "" },
+ { rust: "1.72", features: "--features=yyjson" },
+ { rust: "nightly-2024-02-13", features: "--features=yyjson,unstable-simd" },
  ]
  python: [
  { version: '3.13' },

.github/workflows/linux.yaml

@@ -7,7 +7,7 @@ jobs:
  strategy:
  fail-fast: false
  env:
- RUST_TOOLCHAIN: "1.65" # MSRV
+ RUST_TOOLCHAIN: "1.72" # MSRV
  steps:
  - run: curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain $RUST_TOOLCHAIN -y
  - run: rustup default $RUST_TOOLCHAIN
@@ -71,8 +71,8 @@ jobs:
  options: --user 0
  steps:
  - run: yum install -y clang lld
- - run: curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain nightly-2024-02-03 --profile minimal -y
- - run: rustup component add rust-src --toolchain nightly-2024-02-03-x86_64-unknown-linux-gnu
+ - run: curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain nightly-2024-02-13 --profile minimal -y
+ - run: rustup component add rust-src --toolchain nightly-2024-02-13-x86_64-unknown-linux-gnu
  - uses: actions/checkout@v4
 
  - name: build-std
@@ -84,7 +84,7 @@ jobs:
  - run: |
  maturin build --release --strip \
  --out=dist \
- --features=encoding_rs/simd-accel,no-panic,unstable-simd,yyjson \
+ --features=no-panic,unstable-simd,yyjson \
  --compatibility manylinux_2_17 \
  --interpreter python${{ matrix.python.version }} \
  --target=x86_64-unknown-linux-gnu
@@ -143,11 +143,11 @@ jobs:
  RUSTFLAGS: "-C target-feature=-crt-static -Z mir-opt-level=4"
  CARGO_UNSTABLE_SPARSE_REGISTRY: "true"
  with:
- rust-toolchain: nightly-2024-02-03
+ rust-toolchain: nightly-2024-02-13
  rustup-components: rust-src
  target: ${{ matrix.platform.target }}
  manylinux: musllinux_1_2
- args: --release --strip --out=dist --features=encoding_rs/simd-accel,no-panic,unstable-simd,yyjson -i python${{ matrix.python.version }}
+ args: --release --strip --out=dist --features=no-panic,unstable-simd,yyjson -i python${{ matrix.python.version }}
 
  - name: Set up QEMU
  if: matrix.platform.arch != 'x86_64'
@@ -196,7 +196,7 @@ jobs:
  {
  arch: 'aarch64',
  cflags: '-O2 -flto',
- features: 'encoding_rs/simd-accel,no-panic,unstable-simd,yyjson',
+ features: 'no-panic,unstable-simd,yyjson',
  rustflags: '-Z mir-opt-level=4 -D warnings',
  target: 'aarch64-unknown-linux-gnu',
  },
@@ -239,7 +239,7 @@ jobs:
  RUSTFLAGS: "${{ matrix.target.rustflags }}"
  with:
  target: ${{ matrix.target.target }}
- rust-toolchain: nightly-2024-02-03
+ rust-toolchain: nightly-2024-02-13
  rustup-components: rust-src
  manylinux: auto
  args: --release --strip --out=dist --features=${{ matrix.target.features }} -i python${{ matrix.python.version }}

Cargo.toml

@@ -5,7 +5,7 @@ authors = ["ijl <[email protected]>"]
 description = "Fast, correct Python JSON library supporting dataclasses, datetimes, and numpy"
 edition = "2021"
 resolver = "2"
-rust-version = "1.65"
+rust-version = "1.72"
 license = "Apache-2.0 OR MIT"
 repository = "https:/ijl/orjson"
 homepage = "https:/ijl/orjson"
@@ -45,7 +45,7 @@ no-panic = [
 yyjson = []
 
 [dependencies]
-ahash = { version = "=0.8.6", default_features = false, features = ["compile-time-rng"] }
+ahash = { version = "^0.8.8", default_features = false, features = ["compile-time-rng"] }
 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"] }

README.md

@@ -1184,7 +1184,7 @@ No. `bytes` is the correct type for a serialized blob.
 
 ## Packaging
 
-To package orjson requires at least [Rust](https://www.rust-lang.org/) 1.65
+To package orjson requires at least [Rust](https://www.rust-lang.org/) 1.72
 and the [maturin](https:/PyO3/maturin) build tool. The recommended
 build command is:
 
@@ -1196,7 +1196,7 @@ It benefits from also having a C build environment to compile a faster
 deserialization backend. See this project's `manylinux_2_28` builds for an
 example using clang and LTO.
 
-The project's own CI tests against `nightly-2024-02-03` and stable 1.65. It
+The project's own CI tests against `nightly-2024-02-13` and stable 1.65. It
 is prudent to pin the nightly version because that channel can introduce
 breaking changes.
 

ci/azure-macos.yml

@@ -23,7 +23,7 @@ steps:
  PATH=$HOME/.cargo/bin:$PATH \
  MACOSX_DEPLOYMENT_TARGET=$(macosx_deployment_target) \
  PYO3_CROSS_LIB_DIR=$(python -c "import sysconfig;print(sysconfig.get_config_var('LIBDIR'))") \
- maturin build --release --strip --features=encoding_rs/simd-accel,no-panic,unstable-simd,yyjson --interpreter $(interpreter) --target=universal2-apple-darwin
+ maturin build --release --strip --features=no-panic,unstable-simd,yyjson --interpreter $(interpreter) --target=universal2-apple-darwin
  env:
  CC: "clang"
  CFLAGS: "-O2 -fstrict-aliasing -flto=full"

ci/azure-pipelines.yml

@@ -1,5 +1,5 @@
 variables:
- toolchain: nightly-2024-02-03
+ toolchain: nightly-2024-02-13
 
 jobs:
 

ci/azure-win.yml

@@ -19,8 +19,10 @@ steps:
  displayName: build dependencies
 - script: python.exe -m pip install -r test\requirements.txt -r integration\requirements.txt
  displayName: test dependencies
-- script: maturin.exe build --release --features=encoding_rs/simd-accel,no-panic,yyjson --strip --interpreter $(interpreter) --target $(target)
+- script: maturin.exe build --release --features=no-panic,unstable-simd,yyjson --strip --interpreter $(interpreter) --target $(target)
  displayName: build
+ env:
+ RUSTFLAGS: "-Z mir-opt-level=4"
 - script: python.exe -m pip install orjson --no-index --find-links=D:\a\1\s\target\wheels
  displayName: install
 - script: python.exe -m pytest -s -rxX -v test

src/serialize/per_type/datetime.rs

@@ -161,10 +161,6 @@ impl DateTimeLike for DateTime {
  pydatetime_get!(second, PyDateTime_DATE_GET_SECOND, u8);
  pydatetime_get!(microsecond, PyDateTime_DATE_GET_MICROSECOND, u32);
 
- fn millisecond(&self) -> u32 {
- self.microsecond() / 1_000
- }
-
  fn nanosecond(&self) -> u32 {
  self.microsecond() * 1_000
  }

src/serialize/per_type/datetimelike.rs

@@ -76,8 +76,6 @@ pub trait DateTimeLike {
  fn minute(&self) -> u8;
  /// Returns the second component of the datetime.
  fn second(&self) -> u8;
- /// Returns the number of milliseconds since the whole non-leap second.
- fn millisecond(&self) -> u32;
  /// Returns the number of microseconds since the whole non-leap second.
  fn microsecond(&self) -> u32;
  /// Returns the number of nanoseconds since the whole non-leap second.

src/serialize/per_type/numpy.rs

@@ -1279,10 +1279,6 @@ impl DateTimeLike for NumpyDatetime64Repr {
  forward_inner!(second, u8);
  forward_inner!(nanosecond, u32);
 
- fn millisecond(&self) -> u32 {
- self.nanosecond() / 1_000_000
- }
-
  fn microsecond(&self) -> u32 {
  self.nanosecond() / 1_000
  }