Skip to content

Commit a29a0c9

Browse files
committed
fix for renamed portable_simd API
1 parent 728d7e5 commit a29a0c9

1 file changed

Lines changed: 6 additions & 6 deletions

File tree

src/simd/generic.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ pub fn chunk_count(haystack: &[u8], needle: u8) -> usize {
4545
while haystack.len() >= offset + 64 * 255 {
4646
let mut counts = u8x64::splat(0);
4747
for _ in 0..255 {
48-
counts -= u8x64_from_offset(haystack, offset).simd_eq(needles_x64).to_int().cast();
48+
counts -= u8x64_from_offset(haystack, offset).simd_eq(needles_x64).to_simd().cast();
4949
offset += 64;
5050
}
5151
count += sum_x64(&counts);
@@ -55,7 +55,7 @@ pub fn chunk_count(haystack: &[u8], needle: u8) -> usize {
5555
if haystack.len() >= offset + 64 * 128 {
5656
let mut counts = u8x64::splat(0);
5757
for _ in 0..128 {
58-
counts -= u8x64_from_offset(haystack, offset).simd_eq(needles_x64).to_int().cast();
58+
counts -= u8x64_from_offset(haystack, offset).simd_eq(needles_x64).to_simd().cast();
5959
offset += 64;
6060
}
6161
count += sum_x64(&counts);
@@ -67,15 +67,15 @@ pub fn chunk_count(haystack: &[u8], needle: u8) -> usize {
6767
let mut counts = u8x32::splat(0);
6868
for i in 0..(haystack.len() - offset) / 32 {
6969
counts -=
70-
u8x32_from_offset(haystack, offset + i * 32).simd_eq(needles_x32).to_int().cast();
70+
u8x32_from_offset(haystack, offset + i * 32).simd_eq(needles_x32).to_simd().cast();
7171
}
7272
count += sum_x32(&counts);
7373

7474
// Straggler; need to reset counts because prior loop can run 255 times
7575
counts = u8x32::splat(0);
7676
if haystack.len() % 32 != 0 {
7777
counts -=
78-
u8x32_from_offset(haystack, haystack.len() - 32).simd_eq(needles_x32).to_int().cast()
78+
u8x32_from_offset(haystack, haystack.len() - 32).simd_eq(needles_x32).to_simd().cast()
7979
& u8x32_from_offset(&MASK, haystack.len() % 32);
8080
}
8181
count += sum_x32(&counts);
@@ -85,11 +85,11 @@ pub fn chunk_count(haystack: &[u8], needle: u8) -> usize {
8585
}
8686

8787
fn is_leading_utf8_byte_x64(u8s: u8x64) -> u8x64 {
88-
(u8s & u8x64::splat(0b1100_0000)).simd_ne(u8x64::splat(0b1000_0000)).to_int().cast()
88+
(u8s & u8x64::splat(0b1100_0000)).simd_ne(u8x64::splat(0b1000_0000)).to_simd().cast()
8989
}
9090

9191
fn is_leading_utf8_byte_x32(u8s: u8x32) -> u8x32 {
92-
(u8s & u8x32::splat(0b1100_0000)).simd_ne(u8x32::splat(0b1000_0000)).to_int().cast()
92+
(u8s & u8x32::splat(0b1100_0000)).simd_ne(u8x32::splat(0b1000_0000)).to_simd().cast()
9393
}
9494

9595
pub fn chunk_num_chars(utf8_chars: &[u8]) -> usize {

0 commit comments

Comments
 (0)