From b72be3c288dc8c745ed63105332004363f86807a Mon Sep 17 00:00:00 2001 From: Meghan Denny Date: Sat, 14 Aug 2021 00:57:46 -0700 Subject: [PATCH] cmd/fetch- fix slight miscalculation in zigmod.lock diff parsing --- src/cmd/fetch.zig | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/cmd/fetch.zig b/src/cmd/fetch.zig index 01787d083ff3fb919ea57587dc2cd1234b1d1c67..8c75534e5f99eb56aae13afd43adb68613dafe63 100644 --- a/src/cmd/fetch.zig +++ b/src/cmd/fetch.zig @@ -159,6 +159,7 @@ fn diff_lockfile() !void { var changes = std.StringHashMap(DiffChange).init(gpa); + var didbreak = false; var i: usize = 0; while (i < rems.items.len) { const it = rems.items[i]; @@ -176,11 +177,13 @@ fn diff_lockfile() !void { }); _ = rems.orderedRemove(i); _ = adds.orderedRemove(j); + didbreak = true; break; } - j += 1; + if (!didbreak) j += 1; } - i += 1; + if (!didbreak) i += 1; + if (didbreak) didbreak = false; } if (adds.items.len > 0) { -- 2.54.0