Fix clippy lints

marmeladema · marmeladema · commit c1f5b6b56c31 · 2025-11-02T23:14:14.000+01:00
diff --git a/src/aarch64.rs b/src/aarch64.rs
@@ -302,5 +302,5 @@ mod tests {
         }
     }
 
-    crate::generate_tests!(neon_searcher, NeonSearcher);
+    crate::tests::generate_tests!(neon_searcher, NeonSearcher);
 }
diff --git a/src/lib.rs b/src/lib.rs
@@ -293,7 +293,7 @@ trait Searcher<N: NeedleWithSize + ?Sized> {
 }
 
 #[cfg(test)]
-mod tests {
+pub(crate) mod tests {
     use super::{MemchrSearcher, Needle};
 
     fn memchr_search(haystack: &[u8], needle: &[u8]) -> bool {
@@ -380,7 +380,6 @@ mod tests {
         result
     }
 
-    #[macro_export]
     macro_rules! generate_tests {
         ($mod: ident, $name:ident) => {
             mod $mod {
@@ -418,6 +417,7 @@ mod tests {
             }
         };
     }
+    pub(crate) use generate_tests;
 
     pub(crate) fn search_same<S: TestSearcher>() {
         assert!(search::<S>(b"x", b"x"));
diff --git a/src/stdsimd.rs b/src/stdsimd.rs
@@ -193,5 +193,5 @@ mod tests {
         }
     }
 
-    crate::generate_tests!(std_simd_searcher, StdSimdSearcher);
+    crate::tests::generate_tests!(std_simd_searcher, StdSimdSearcher);
 }
diff --git a/src/wasm32.rs b/src/wasm32.rs
@@ -289,5 +289,5 @@ mod tests {
         }
     }
 
-    crate::generate_tests!(wasm32_searcher, Wasm32Searcher);
+    crate::tests::generate_tests!(wasm32_searcher, Wasm32Searcher);
 }
diff --git a/src/x86.rs b/src/x86.rs
@@ -59,7 +59,7 @@ impl Vector for __m16i {
     #[inline]
     #[target_feature(enable = "avx2")]
     unsafe fn to_bitmask(a: Self) -> u32 {
-        std::mem::transmute(_mm_movemask_epi8(a.0) & 0x3)
+        i32::cast_unsigned(_mm_movemask_epi8(a.0) & 0x3)
     }
 }
 
@@ -106,7 +106,7 @@ impl Vector for __m32i {
     #[inline]
     #[target_feature(enable = "avx2")]
     unsafe fn to_bitmask(a: Self) -> u32 {
-        std::mem::transmute(_mm_movemask_epi8(a.0) & 0xF)
+        i32::cast_unsigned(_mm_movemask_epi8(a.0) & 0xF)
     }
 }
 
@@ -153,7 +153,7 @@ impl Vector for __m64i {
     #[inline]
     #[target_feature(enable = "avx2")]
     unsafe fn to_bitmask(a: Self) -> u32 {
-        std::mem::transmute(_mm_movemask_epi8(a.0) & 0xFF)
+        i32::cast_unsigned(_mm_movemask_epi8(a.0) & 0xFF)
     }
 }
 
@@ -195,7 +195,7 @@ impl Vector for __m128i {
     #[inline]
     #[target_feature(enable = "avx2")]
     unsafe fn to_bitmask(a: Self) -> u32 {
-        std::mem::transmute(_mm_movemask_epi8(a))
+        i32::cast_unsigned(_mm_movemask_epi8(a))
     }
 }
 
@@ -230,7 +230,7 @@ impl Vector for __m256i {
     #[inline]
     #[target_feature(enable = "avx2")]
     unsafe fn to_bitmask(a: Self) -> u32 {
-        std::mem::transmute(_mm256_movemask_epi8(a))
+        i32::cast_unsigned(_mm256_movemask_epi8(a))
     }
 }
 
@@ -587,7 +587,7 @@ mod tests {
     }
 
     impl crate::tests::TestSearcher for Avx2Searcher<&[u8]> {
-        fn with_position(needle: &'static [u8], position: usize) -> Avx2Searcher<&[u8]> {
+        fn with_position(needle: &'static [u8], position: usize) -> Avx2Searcher<&'static [u8]> {
             unsafe { Avx2Searcher::with_position(needle, position) }
         }
 
@@ -596,10 +596,10 @@ mod tests {
         }
     }
 
-    crate::generate_tests!(avx2_searcher, Avx2Searcher);
+    crate::tests::generate_tests!(avx2_searcher, Avx2Searcher);
 
     impl crate::tests::TestSearcher for DynamicAvx2Searcher<&[u8]> {
-        fn with_position(needle: &'static [u8], position: usize) -> DynamicAvx2Searcher<&[u8]> {
+        fn with_position(needle: &'static [u8], position: usize) -> DynamicAvx2Searcher<&'static [u8]> {
             unsafe { DynamicAvx2Searcher::with_position(needle, position) }
         }
 
@@ -608,5 +608,5 @@ mod tests {
         }
     }
 
-    crate::generate_tests!(dynamic_avx2_searcher, DynamicAvx2Searcher);
+    crate::tests::generate_tests!(dynamic_avx2_searcher, DynamicAvx2Searcher);
 }

Original file line number	Diff line number	Diff line change
`@@ -302,5 +302,5 @@ mod tests {`
`302`	`302`	`}`
`303`	`303`	`}`
`304`	`304`
`305`		`- crate::generate_tests!(neon_searcher, NeonSearcher);`
	`305`	`+ crate::tests::generate_tests!(neon_searcher, NeonSearcher);`
`306`	`306`	`}`
Original file line number	Diff line number	Diff line change
`@@ -293,7 +293,7 @@ trait Searcher<N: NeedleWithSize + ?Sized> {`
`293`	`293`	`}`
`294`	`294`
`295`	`295`	`#[cfg(test)]`
`296`		`-mod tests {`
	`296`	`+pub(crate) mod tests {`
`297`	`297`	`use super::{MemchrSearcher, Needle};`
`298`	`298`
`299`	`299`	`fn memchr_search(haystack: &[u8], needle: &[u8]) -> bool {`
`@@ -380,7 +380,6 @@ mod tests {`
`380`	`380`	`result`
`381`	`381`	`}`
`382`	`382`
`383`		`- #[macro_export]`
`384`	`383`	`macro_rules! generate_tests {`
`385`	`384`	`($mod: ident, $name:ident) => {`
`386`	`385`	`mod $mod {`
`@@ -418,6 +417,7 @@ mod tests {`
`418`	`417`	`}`
`419`	`418`	`};`
`420`	`419`	`}`
	`420`	`+ pub(crate) use generate_tests;`
`421`	`421`
`422`	`422`	`pub(crate) fn search_same<S: TestSearcher>() {`
`423`	`423`	`assert!(search::<S>(b"x", b"x"));`
Original file line number	Diff line number	Diff line change
`@@ -193,5 +193,5 @@ mod tests {`
`193`	`193`	`}`
`194`	`194`	`}`
`195`	`195`
`196`		`- crate::generate_tests!(std_simd_searcher, StdSimdSearcher);`
	`196`	`+ crate::tests::generate_tests!(std_simd_searcher, StdSimdSearcher);`
`197`	`197`	`}`
Original file line number	Diff line number	Diff line change
`@@ -289,5 +289,5 @@ mod tests {`
`289`	`289`	`}`
`290`	`290`	`}`
`291`	`291`
`292`		`- crate::generate_tests!(wasm32_searcher, Wasm32Searcher);`
	`292`	`+ crate::tests::generate_tests!(wasm32_searcher, Wasm32Searcher);`
`293`	`293`	`}`
Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ impl Vector for __m16i {`
`59`	`59`	`#[inline]`
`60`	`60`	`#[target_feature(enable = "avx2")]`
`61`	`61`	`unsafe fn to_bitmask(a: Self) -> u32 {`
`62`		`- std::mem::transmute(_mm_movemask_epi8(a.0) & 0x3)`
	`62`	`+ i32::cast_unsigned(_mm_movemask_epi8(a.0) & 0x3)`
`63`	`63`	`}`
`64`	`64`	`}`
`65`	`65`
`@@ -106,7 +106,7 @@ impl Vector for __m32i {`
`106`	`106`	`#[inline]`
`107`	`107`	`#[target_feature(enable = "avx2")]`
`108`	`108`	`unsafe fn to_bitmask(a: Self) -> u32 {`
`109`		`- std::mem::transmute(_mm_movemask_epi8(a.0) & 0xF)`
	`109`	`+ i32::cast_unsigned(_mm_movemask_epi8(a.0) & 0xF)`
`110`	`110`	`}`
`111`	`111`	`}`
`112`	`112`
`@@ -153,7 +153,7 @@ impl Vector for __m64i {`
`153`	`153`	`#[inline]`
`154`	`154`	`#[target_feature(enable = "avx2")]`
`155`	`155`	`unsafe fn to_bitmask(a: Self) -> u32 {`
`156`		`- std::mem::transmute(_mm_movemask_epi8(a.0) & 0xFF)`
	`156`	`+ i32::cast_unsigned(_mm_movemask_epi8(a.0) & 0xFF)`
`157`	`157`	`}`
`158`	`158`	`}`
`159`	`159`
`@@ -195,7 +195,7 @@ impl Vector for __m128i {`
`195`	`195`	`#[inline]`
`196`	`196`	`#[target_feature(enable = "avx2")]`
`197`	`197`	`unsafe fn to_bitmask(a: Self) -> u32 {`
`198`		`- std::mem::transmute(_mm_movemask_epi8(a))`
	`198`	`+ i32::cast_unsigned(_mm_movemask_epi8(a))`
`199`	`199`	`}`
`200`	`200`	`}`
`201`	`201`
`@@ -230,7 +230,7 @@ impl Vector for __m256i {`
`230`	`230`	`#[inline]`
`231`	`231`	`#[target_feature(enable = "avx2")]`
`232`	`232`	`unsafe fn to_bitmask(a: Self) -> u32 {`
`233`		`- std::mem::transmute(_mm256_movemask_epi8(a))`
	`233`	`+ i32::cast_unsigned(_mm256_movemask_epi8(a))`
`234`	`234`	`}`
`235`	`235`	`}`
`236`	`236`
`@@ -587,7 +587,7 @@ mod tests {`
`587`	`587`	`}`
`588`	`588`
`589`	`589`	`impl crate::tests::TestSearcher for Avx2Searcher<&[u8]> {`
`590`		`- fn with_position(needle: &'static [u8], position: usize) -> Avx2Searcher<&[u8]> {`
	`590`	`+ fn with_position(needle: &'static [u8], position: usize) -> Avx2Searcher<&'static [u8]> {`
`591`	`591`	`unsafe { Avx2Searcher::with_position(needle, position) }`
`592`	`592`	`}`
`593`	`593`
`@@ -596,10 +596,10 @@ mod tests {`
`596`	`596`	`}`
`597`	`597`	`}`
`598`	`598`
`599`		`- crate::generate_tests!(avx2_searcher, Avx2Searcher);`
	`599`	`+ crate::tests::generate_tests!(avx2_searcher, Avx2Searcher);`
`600`	`600`
`601`	`601`	`impl crate::tests::TestSearcher for DynamicAvx2Searcher<&[u8]> {`
`602`		`- fn with_position(needle: &'static [u8], position: usize) -> DynamicAvx2Searcher<&[u8]> {`
	`602`	`+ fn with_position(needle: &'static [u8], position: usize) -> DynamicAvx2Searcher<&'static [u8]> {`
`603`	`603`	`unsafe { DynamicAvx2Searcher::with_position(needle, position) }`
`604`	`604`	`}`
`605`	`605`
`@@ -608,5 +608,5 @@ mod tests {`
`608`	`608`	`}`
`609`	`609`	`}`
`610`	`610`
`611`		`- crate::generate_tests!(dynamic_avx2_searcher, DynamicAvx2Searcher);`
	`611`	`+ crate::tests::generate_tests!(dynamic_avx2_searcher, DynamicAvx2Searcher);`
`612`	`612`	`}`