From 9cb286b1359cd1840053d8c7cc5f8b67b06b94b3 Mon Sep 17 00:00:00 2001 From: Meghan Denny Date: Sat, 30 May 2026 11:29:33 -0700 Subject: [PATCH] adapt to changed readUntilDelimiter api --- src/cmd/fetch.zig | 3 ++- src/common.zig | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/cmd/fetch.zig b/src/cmd/fetch.zig index 3ac2ac9adf00f8b0b067c05c3f9c15e0b084b52b..9a13aa816c92b8051c313a92970807479f397add 100644 --- a/src/cmd/fetch.zig +++ b/src/cmd/fetch.zig @@ -216,7 +216,8 @@ fn diff_lockfile(alloc: std.mem.Allocator) !void { var rems = std.ArrayList(string).init(alloc); var adds = std.ArrayList(string).init(alloc); - while (try r.readUntilDelimiterOrEofAlloc(alloc, '\n', max)) |line| { + while (try r.readUntilDelimiterOrEofAlloc(alloc, '\n', max)) |line_full| { + const line = line_full[0 .. line_full.len - 1]; if (line[0] == ' ') continue; if (line[0] == '-') try rems.append(line[1..]); if (line[0] == '+') if (line[1] == '2') break else try adds.append(line[1..]); diff --git a/src/common.zig b/src/common.zig index 09fcf6cc005a1ae37248bce50778447ea285f471..9881168ed85d0eda7de8d62fe572f2e2e809f472 100644 --- a/src/common.zig +++ b/src/common.zig @@ -341,7 +341,8 @@ pub fn parse_lockfile(alloc: std.mem.Allocator, dir: nfs.Dir) ![]const [4]string var r = nio.BufferedReader(4096, nfs.File).init(f); var i: usize = 0; var v: usize = 1; - while (try r.readUntilDelimiterOrEofAlloc(alloc, '\n', max)) |line| : (i += 1) { + while (try r.readUntilDelimiterOrEofAlloc(alloc, '\n', max)) |line_full| : (i += 1) { + const line = line_full[0 .. line_full.len - 1]; if (i == 0 and std.mem.eql(u8, line, "2")) { v = 2; continue; -- 2.54.0