diff options
| author | Andrew Kelley <andrew@ziglang.org> | 2023-06-03 13:51:02 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-06-03 13:51:02 -0700 |
| commit | 629f0d23b5c0768b5957688591f6fa6216ae4dd3 (patch) | |
| tree | 8952bf92a1069fa9dfee49d3fcf8f3c2abafbd4b /src/Compilation.zig | |
| parent | 3add9d8257d9414421acf91823917d9d49b28c6f (diff) | |
| parent | 104f4053a2c3c6a1a2bf801ca5bf88ce4fee7a2a (diff) | |
| download | zig-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 'src/Compilation.zig')
| -rw-r--r-- | src/Compilation.zig | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/Compilation.zig b/src/Compilation.zig index 30d825b9c6..cbdc789d40 100644 --- a/src/Compilation.zig +++ b/src/Compilation.zig @@ -4671,7 +4671,7 @@ pub fn hasSharedLibraryExt(filename: []const u8) bool { return true; } // Look for .so.X, .so.X.Y, .so.X.Y.Z - var it = mem.split(u8, filename, "."); + var it = mem.splitScalar(u8, filename, '.'); _ = it.first(); var so_txt = it.next() orelse return false; while (!mem.eql(u8, so_txt, "so")) { @@ -5051,14 +5051,14 @@ fn parseLldStderr(comp: *Compilation, comptime prefix: []const u8, stderr: []con defer context_lines.deinit(); var current_err: ?*LldError = null; - var lines = mem.split(u8, stderr, std.cstr.line_sep); + var lines = mem.splitSequence(u8, stderr, std.cstr.line_sep); while (lines.next()) |line| { if (mem.startsWith(u8, line, prefix ++ ":")) { if (current_err) |err| { err.context_lines = try context_lines.toOwnedSlice(); } - var split = std.mem.split(u8, line, "error: "); + var split = std.mem.splitSequence(u8, line, "error: "); _ = split.first(); const duped_msg = try std.fmt.allocPrint(comp.gpa, "{s}: {s}", .{ prefix, split.rest() }); |
