aboutsummaryrefslogtreecommitdiff
path: root/lib/std/Build/Step/ConfigHeader.zig
diff options
context:
space:
mode:
authorAndrew Kelley <andrew@ziglang.org>2023-06-03 13:51:02 -0700
committerGitHub <noreply@github.com>2023-06-03 13:51:02 -0700
commit629f0d23b5c0768b5957688591f6fa6216ae4dd3 (patch)
tree8952bf92a1069fa9dfee49d3fcf8f3c2abafbd4b /lib/std/Build/Step/ConfigHeader.zig
parent3add9d8257d9414421acf91823917d9d49b28c6f (diff)
parent104f4053a2c3c6a1a2bf801ca5bf88ce4fee7a2a (diff)
downloadzig-629f0d23b5c0768b5957688591f6fa6216ae4dd3.tar.gz
zig-629f0d23b5c0768b5957688591f6fa6216ae4dd3.zip
Merge pull request #15579 from squeek502/mem-delimiters
Split `std.mem.split` and `tokenize` into `sequence`, `any`, and `scalar` versions
Diffstat (limited to 'lib/std/Build/Step/ConfigHeader.zig')
-rw-r--r--lib/std/Build/Step/ConfigHeader.zig8
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/std/Build/Step/ConfigHeader.zig b/lib/std/Build/Step/ConfigHeader.zig
index f6939e0e38..4b76e24b26 100644
--- a/lib/std/Build/Step/ConfigHeader.zig
+++ b/lib/std/Build/Step/ConfigHeader.zig
@@ -250,14 +250,14 @@ fn render_autoconf(
var any_errors = false;
var line_index: u32 = 0;
- var line_it = std.mem.split(u8, contents, "\n");
+ var line_it = std.mem.splitScalar(u8, contents, '\n');
while (line_it.next()) |line| : (line_index += 1) {
if (!std.mem.startsWith(u8, line, "#")) {
try output.appendSlice(line);
try output.appendSlice("\n");
continue;
}
- var it = std.mem.tokenize(u8, line[1..], " \t\r");
+ var it = std.mem.tokenizeAny(u8, line[1..], " \t\r");
const undef = it.next().?;
if (!std.mem.eql(u8, undef, "undef")) {
try output.appendSlice(line);
@@ -297,14 +297,14 @@ fn render_cmake(
var any_errors = false;
var line_index: u32 = 0;
- var line_it = std.mem.split(u8, contents, "\n");
+ var line_it = std.mem.splitScalar(u8, contents, '\n');
while (line_it.next()) |line| : (line_index += 1) {
if (!std.mem.startsWith(u8, line, "#")) {
try output.appendSlice(line);
try output.appendSlice("\n");
continue;
}
- var it = std.mem.tokenize(u8, line[1..], " \t\r");
+ var it = std.mem.tokenizeAny(u8, line[1..], " \t\r");
const cmakedefine = it.next().?;
if (!std.mem.eql(u8, cmakedefine, "cmakedefine") and
!std.mem.eql(u8, cmakedefine, "cmakedefine01"))