From 80997f7f7106b2f54c42bdce822cb47b9a01dce2 Mon Sep 17 00:00:00 2001 From: mat Date: Fri, 1 Aug 2025 21:51:41 -0200 Subject: [PATCH] use patched simd_cesu8 to fix compilation --- Cargo.lock | 5 ++--- Cargo.toml | 3 +++ simdnbt/Cargo.toml | 1 + simdnbt/src/lib.rs | 1 - simdnbt/src/mutf8.rs | 3 +-- 5 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 59572f7..4453533 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -738,8 +738,7 @@ checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" [[package]] name = "simd_cesu8" version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c14f02c32cc4ef5068b0e15bee4513942f59165add7778a518b4d507b3b97ab" +source = "git+https://github.com/EightFactorial/simd_cesu8#546354e0c62ffd08de95cfedc4a09ed7683adac4" dependencies = [ "rustc_version", "simdutf8", @@ -747,7 +746,7 @@ dependencies = [ [[package]] name = "simdnbt" -version = "0.7.1" +version = "0.7.2" dependencies = [ "azalea-nbt", "byteorder", diff --git a/Cargo.toml b/Cargo.toml index db2bdb5..883d9b4 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -9,3 +9,6 @@ debug = false [profile.bench] lto = true debug = true + +[patch.crates-io] +simd_cesu8 = { git = 'https://github.com/EightFactorial/simd_cesu8' } diff --git a/simdnbt/Cargo.toml b/simdnbt/Cargo.toml index 15e58af..b4579e9 100644 --- a/simdnbt/Cargo.toml +++ b/simdnbt/Cargo.toml @@ -32,6 +32,7 @@ ussr-nbt = "0.2.1" default = ["derive"] derive = ["dep:simdnbt-derive"] + [profile.release] lto = true debug = false diff --git a/simdnbt/src/lib.rs b/simdnbt/src/lib.rs index e84ad53..fa58ce4 100644 --- a/simdnbt/src/lib.rs +++ b/simdnbt/src/lib.rs @@ -1,6 +1,5 @@ #![doc = include_str!("../README.md")] #![feature(portable_simd)] -#![feature(array_chunks)] #![allow(internal_features)] #![feature(core_intrinsics)] #![feature(allocator_api)] diff --git a/simdnbt/src/mutf8.rs b/simdnbt/src/mutf8.rs index 53199cd..ebaabb9 100644 --- a/simdnbt/src/mutf8.rs +++ b/simdnbt/src/mutf8.rs @@ -24,8 +24,7 @@ pub struct Mutf8String { #[inline] fn is_plain_ascii(slice: &[u8]) -> bool { let mut is_plain_ascii = true; - let chunks_32_exact = slice.array_chunks::<32>(); - let mut remainder = chunks_32_exact.remainder(); + let (chunks_32_exact, mut remainder) = slice.as_chunks::<32>(); if remainder.len() > 16 { let chunk; (chunk, remainder) = remainder.split_first_chunk::<16>().unwrap();