diff options
| author | Alex Rønne Petersen <alex@alexrp.com> | 2025-12-22 12:50:46 +0100 |
|---|---|---|
| committer | Alex Rønne Petersen <alex@alexrp.com> | 2025-12-22 12:50:46 +0100 |
| commit | aa0249d74e573742db3567f589fc6e4a00e1fff8 (patch) | |
| tree | cce61cb7f02072d205a12ae451922f0bf09c13ce /lib/std/Build/Step/ConfigHeader.zig | |
| parent | 6b9125cbe662d530160e0732c856aa0da86894c0 (diff) | |
| parent | 02c5f05e2f0e8e786f0530014e35c1520efd0084 (diff) | |
| download | zig-aa0249d74e573742db3567f589fc6e4a00e1fff8.tar.gz zig-aa0249d74e573742db3567f589fc6e4a00e1fff8.zip | |
Merge pull request 'std.ascii: rename indexOf functions to find' (#30101) from adria/zig:indexof-find into master
Reviewed-on: https://codeberg.org/ziglang/zig/pulls/30101
Reviewed-by: Andrew Kelley <andrewrk@noreply.codeberg.org>
Reviewed-by: mlugg <mlugg@noreply.codeberg.org>
Diffstat (limited to 'lib/std/Build/Step/ConfigHeader.zig')
| -rw-r--r-- | lib/std/Build/Step/ConfigHeader.zig | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/std/Build/Step/ConfigHeader.zig b/lib/std/Build/Step/ConfigHeader.zig index 8c0d3032da..df2419764d 100644 --- a/lib/std/Build/Step/ConfigHeader.zig +++ b/lib/std/Build/Step/ConfigHeader.zig @@ -578,12 +578,12 @@ fn expand_variables_autoconf_at( var source_offset: usize = 0; while (curr < contents.len) : (curr += 1) { if (contents[curr] != '@') continue; - if (std.mem.indexOfScalarPos(u8, contents, curr + 1, '@')) |close_pos| { + if (std.mem.findScalarPos(u8, contents, curr + 1, '@')) |close_pos| { if (close_pos == curr + 1) { // closed immediately, preserve as a literal continue; } - const valid_varname_end = std.mem.indexOfNonePos(u8, contents, curr + 1, valid_varname_chars) orelse 0; + const valid_varname_end = std.mem.findNonePos(u8, contents, curr + 1, valid_varname_chars) orelse 0; if (valid_varname_end != close_pos) { // contains invalid characters, preserve as a literal continue; @@ -635,12 +635,12 @@ fn expand_variables_cmake( loop: while (curr < contents.len) : (curr += 1) { switch (contents[curr]) { '@' => blk: { - if (std.mem.indexOfScalarPos(u8, contents, curr + 1, '@')) |close_pos| { + if (std.mem.findScalarPos(u8, contents, curr + 1, '@')) |close_pos| { if (close_pos == curr + 1) { // closed immediately, preserve as a literal break :blk; } - const valid_varname_end = std.mem.indexOfNonePos(u8, contents, curr + 1, valid_varname_chars) orelse 0; + const valid_varname_end = std.mem.findNonePos(u8, contents, curr + 1, valid_varname_chars) orelse 0; if (valid_varname_end != close_pos) { // contains invalid characters, preserve as a literal break :blk; @@ -731,7 +731,7 @@ fn expand_variables_cmake( else => {}, } - if (var_stack.items.len > 0 and std.mem.indexOfScalar(u8, valid_varname_chars, contents[curr]) == null) { + if (var_stack.items.len > 0 and std.mem.findScalar(u8, valid_varname_chars, contents[curr]) == null) { return error.InvalidCharacter; } } |