Skip to content

Commit 45e81f7

Browse files
committed
Fix: Outdated case-insensitive metadata in Rust
1 parent cbcd685 commit 45e81f7

File tree

2 files changed

+11
-13
lines changed

2 files changed

+11
-13
lines changed

include/stringzilla/stringzilla.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2326,7 +2326,7 @@ class basic_string_slice {
23262326
sz_utf8_case_insensitive_needle_metadata_t metadata = {};
23272327
sz_size_t match_length = 0;
23282328
auto ptr = sz_utf8_case_insensitive_find(start_, length_, other.data(), other.size(), &metadata, &match_length);
2329-
if (!ptr) return {npos, 0};
2329+
if (!ptr) return {npos, static_cast<size_type>(0)};
23302330
return {static_cast<size_type>(ptr - start_), match_length};
23312331
}
23322332

rust/stringzilla.rs

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -137,29 +137,27 @@ impl IndexSpan {
137137
#[repr(C)]
138138
#[derive(Debug, Clone, Copy)]
139139
pub(crate) struct Utf8CaseInsensitiveNeedleMetadata {
140-
// sz_utf8_string_slice_t safe_window (5 x usize = 40 bytes on 64-bit)
141-
safe_window_offset: usize,
142-
safe_window_length: usize,
143-
safe_window_runes_before: usize,
144-
safe_window_runes_within: usize,
145-
safe_window_runes_after: usize,
140+
// sz_size_t offset_in_unfolded
141+
offset_in_unfolded: usize,
142+
// sz_size_t length_in_unfolded
143+
length_in_unfolded: usize,
146144
// sz_u8_t folded_slice[16]
147145
folded_slice: [u8; 16],
148-
// 4 x sz_u8_t fields
146+
// sz_u8_t folded_slice_length
149147
folded_slice_length: u8,
148+
// sz_u8_t probe_second
150149
probe_second: u8,
150+
// sz_u8_t probe_third
151151
probe_third: u8,
152+
// sz_u8_t kernel_id
152153
kernel_id: u8,
153154
}
154155

155156
impl Default for Utf8CaseInsensitiveNeedleMetadata {
156157
fn default() -> Self {
157158
Self {
158-
safe_window_offset: 0,
159-
safe_window_length: 0,
160-
safe_window_runes_before: 0,
161-
safe_window_runes_within: 0,
162-
safe_window_runes_after: 0,
159+
offset_in_unfolded: 0,
160+
length_in_unfolded: 0,
163161
folded_slice: [0; 16],
164162
folded_slice_length: 0,
165163
probe_second: 0,

0 commit comments

Comments
 (0)