cleanup

Author: hkratz

portable/src/implementation/helpers.rs

@@ -36,45 +36,3 @@ pub(crate) fn get_compat_error(input: &[u8], failing_block_pos: usize) -> Utf8Er
     // UNWRAP: safe because the SIMD UTF-8 validation found an error
     validate_utf8_at_offset(input, offset).unwrap_err()
 }
-
-pub(crate) const SIMD_CHUNK_SIZE: usize = 64;
-
-#[repr(C, align(32))]
-#[allow(dead_code)] // only used if there is a SIMD implementation
-pub(crate) struct Utf8CheckAlgorithm<T> {
-    pub(crate) prev: T,
-    pub(crate) incomplete: T,
-    pub(crate) error: T,
-}
-
-#[repr(C, align(16))]
-#[allow(dead_code)] // only used if a 128-bit SIMD implementation is used
-pub(crate) struct TempSimdChunkA16(pub(crate) [u8; SIMD_CHUNK_SIZE]);
-
-#[allow(dead_code)] // only used if there is a SIMD implementation
-impl TempSimdChunkA16 {
-    #[expect(clippy::inline_always)]
-    #[inline(always)] // needs to be forced because otherwise it is not inlined on armv7 neo
-    pub(crate) const fn new() -> Self {
-        Self([0; SIMD_CHUNK_SIZE])
-    }
-}
-
-#[repr(C, align(32))]
-#[allow(dead_code)] // only used if a 256-bit SIMD implementation is used
-pub(crate) struct TempSimdChunkA32(pub(crate) [u8; SIMD_CHUNK_SIZE]);
-
-#[allow(dead_code)] // only used if there is a SIMD implementation
-impl TempSimdChunkA32 {
-    #[expect(clippy::inline_always)]
-    #[inline(always)] // needs to be forced because otherwise it is not inlined on armv7 neo
-    pub(crate) const fn new() -> Self {
-        Self([0; SIMD_CHUNK_SIZE])
-    }
-}
-
-#[derive(Clone, Copy)]
-#[allow(dead_code)] // only used if there is a SIMD implementation
-pub(crate) struct SimdU8Value<T>(pub(crate) T)
-where
-    T: Copy;

portable/src/implementation/mod.rs

@@ -7,7 +7,7 @@ pub(crate) mod simd;
 
 #[inline]
 pub(crate) fn validate_utf8_basic(input: &[u8]) -> Result<(), crate::basic::Utf8Error> {
-    if input.len() < helpers::SIMD_CHUNK_SIZE {
+    if input.len() < simd::SIMD_CHUNK_SIZE {
         return validate_utf8_basic_fallback(input);
     }
 
@@ -24,7 +24,7 @@ fn validate_utf8_basic_simd(input: &[u8]) -> Result<(), crate::basic::Utf8Error>
 
 #[inline]
 pub(crate) fn validate_utf8_compat(input: &[u8]) -> Result<(), crate::compat::Utf8Error> {
-    if input.len() < helpers::SIMD_CHUNK_SIZE {
+    if input.len() < simd::SIMD_CHUNK_SIZE {
         return validate_utf8_compat_fallback(input);
     }
 

portable/src/implementation/simd.rs

@@ -4,7 +4,9 @@ use std::simd::{
     simd_swizzle, u8x16, LaneCount, Simd, SupportedLaneCount,
 };
 
-use crate::{basic, compat, implementation::helpers::SIMD_CHUNK_SIZE};
+use crate::{basic, compat};
+
+pub(crate) const SIMD_CHUNK_SIZE: usize = 64;
 
 #[cfg(all(
     any(target_arch = "aarch64", target_arch = "arm"),
@@ -562,7 +564,6 @@ where
     ///
     #[inline]
     pub fn validate_utf8_basic(input: &[u8]) -> core::result::Result<(), basic::Utf8Error> {
-        use crate::implementation::helpers::SIMD_CHUNK_SIZE;
         let mut algorithm = Self::new();
         let mut chunks = input.chunks_exact(SIMD_CHUNK_SIZE);
         for chunk in chunks.by_ref() {
@@ -593,7 +594,6 @@ where
     #[inline]
     #[expect(clippy::redundant_else)] // more readable
     fn validate_utf8_compat_simd0(input: &[u8]) -> core::result::Result<(), usize> {
-        use crate::implementation::helpers::SIMD_CHUNK_SIZE;
         let mut algorithm = Self::new();
         let mut idx = 0;
         let mut chunks = input.chunks_exact(SIMD_CHUNK_SIZE);
@@ -709,7 +709,6 @@ impl basic::imp::Utf8Validator for Utf8ValidatorImp {
 
     #[inline]
     fn update(&mut self, mut input: &[u8]) {
-        use crate::implementation::helpers::SIMD_CHUNK_SIZE;
         if input.is_empty() {
             return;
         }
@@ -779,8 +778,6 @@ impl basic::imp::ChunkedUtf8Validator for ChunkedUtf8ValidatorImp {
 
     #[inline]
     fn update_from_chunks(&mut self, input: &[u8]) {
-        use crate::implementation::helpers::SIMD_CHUNK_SIZE;
-
         assert!(
             input.len() % SIMD_CHUNK_SIZE == 0,
             "Input size must be a multiple of 64."
@@ -796,8 +793,6 @@ impl basic::imp::ChunkedUtf8Validator for ChunkedUtf8ValidatorImp {
         mut self,
         remaining_input: core::option::Option<&[u8]>,
     ) -> core::result::Result<(), basic::Utf8Error> {
-        use crate::implementation::helpers::SIMD_CHUNK_SIZE;
-
         if let Some(mut remaining_input) = remaining_input {
             if !remaining_input.is_empty() {
                 let len = remaining_input.len();