authorgravatar for hello@nektro.netMeghan Denny <hello@nektro.net> 2025-03-22 02:47:13 -07:00
committergravatar for hello@nektro.netMeghan Denny <hello@nektro.net> 2025-03-22 02:47:13 -07:00
log2f89b319bf72f797e1d488e2e0e0f16f4ffcfef8
tree67e495a440e39482b2d37d4bc84a6a3d520997c3
parent11805225d52bc28c2edc31fd7a855bd1aa16bc67

prefer splitScalar

1 files changed, 15 insertions(+), 15 deletions(-)

git.zig+15-15
...@@ -74,12 +74,12 @@ pub fn getHEAD(alloc: std.mem.Allocator, dir: std.fs.Dir) !?CommitId {...@@ -74,12 +74,12 @@ pub fn getHEAD(alloc: std.mem.Allocator, dir: std.fs.Dir) !?CommitId {
74 error.FileNotFound => break :blk,74 error.FileNotFound => break :blk,
75 else => |e| return e,75 else => |e| return e,
76 };76 };
77 var iter = std.mem.split(u8, pckedrfs, "\n");77 var iter = std.mem.splitScalar(u8, pckedrfs, '\n');
78 while (iter.next()) |line| {78 while (iter.next()) |line| {
79 if (std.mem.startsWith(u8, line, "#")) continue;79 if (std.mem.startsWith(u8, line, "#")) continue;
80 if (std.mem.startsWith(u8, line, "^")) continue;80 if (std.mem.startsWith(u8, line, "^")) continue;
81 if (line.len == 0) continue;81 if (line.len == 0) continue;
82 var jter = std.mem.split(u8, line, " ");82 var jter = std.mem.splitScalar(u8, line, ' ');
83 const objid = jter.next().?;83 const objid = jter.next().?;
84 const ref = jter.next().?;84 const ref = jter.next().?;
85 std.debug.assert(jter.next() == null);85 std.debug.assert(jter.next() == null);
...@@ -193,7 +193,7 @@ pub fn parseCommit(alloc: std.mem.Allocator, commitfile: string) !Commit {...@@ -193,7 +193,7 @@ pub fn parseCommit(alloc: std.mem.Allocator, commitfile: string) !Commit {
193 const t = tracer.trace(@src(), "", .{});193 const t = tracer.trace(@src(), "", .{});
194 defer t.end();194 defer t.end();
195195
196 var iter = std.mem.split(u8, commitfile, "\n");196 var iter = std.mem.splitScalar(u8, commitfile, '\n');
197 var result: Commit = undefined;197 var result: Commit = undefined;
198 var parents = std.ArrayList(CommitId).init(alloc);198 var parents = std.ArrayList(CommitId).init(alloc);
199 errdefer parents.deinit();199 errdefer parents.deinit();
...@@ -221,7 +221,7 @@ fn parseCommitUserAndAt(input: string) !Commit.UserAndAt {...@@ -221,7 +221,7 @@ fn parseCommitUserAndAt(input: string) !Commit.UserAndAt {
221 // first and second part is https://datatracker.ietf.org/doc/html/rfc5322#section-3.4221 // first and second part is https://datatracker.ietf.org/doc/html/rfc5322#section-3.4
222 // third part is unix epoch timestamp222 // third part is unix epoch timestamp
223 // fourth part is TZ223 // fourth part is TZ
224 var maybe_bad_parser = std.mem.splitBackwards(u8, input, " ");224 var maybe_bad_parser = std.mem.splitBackwardsScalar(u8, input, ' ');
225 const tz_part = maybe_bad_parser.next() orelse return error.BadCommitTz;225 const tz_part = maybe_bad_parser.next() orelse return error.BadCommitTz;
226 const time_part = maybe_bad_parser.next() orelse return error.BadCommitTime;226 const time_part = maybe_bad_parser.next() orelse return error.BadCommitTime;
227 const email_part = maybe_bad_parser.next() orelse return error.BadCommitEmail;227 const email_part = maybe_bad_parser.next() orelse return error.BadCommitEmail;
...@@ -258,7 +258,7 @@ pub fn parseTree(alloc: std.mem.Allocator, treefile: string) !Tree {...@@ -258,7 +258,7 @@ pub fn parseTree(alloc: std.mem.Allocator, treefile: string) !Tree {
258 const t = tracer.trace(@src(), "", .{});258 const t = tracer.trace(@src(), "", .{});
259 defer t.end();259 defer t.end();
260260
261 var iter = std.mem.split(u8, treefile, "\n");261 var iter = std.mem.splitScalar(u8, treefile, '\n');
262 var children = std.ArrayList(Tree.Object).init(alloc);262 var children = std.ArrayList(Tree.Object).init(alloc);
263 errdefer children.deinit();263 errdefer children.deinit();
264264
...@@ -267,7 +267,7 @@ pub fn parseTree(alloc: std.mem.Allocator, treefile: string) !Tree {...@@ -267,7 +267,7 @@ pub fn parseTree(alloc: std.mem.Allocator, treefile: string) !Tree {
267 std.debug.assert(iter.peek() == null);267 std.debug.assert(iter.peek() == null);
268 break;268 break;
269 }269 }
270 var jter = std.mem.split(u8, line, " ");270 var jter = std.mem.splitScalar(u8, line, ' ');
271 const mode = jter.next().?;271 const mode = jter.next().?;
272 const otype = std.meta.stringToEnum(Tree.Object.Id.Tag, jter.next().?).?;272 const otype = std.meta.stringToEnum(Tree.Object.Id.Tag, jter.next().?).?;
273 const id_and_name = jter.next().?;273 const id_and_name = jter.next().?;
...@@ -431,7 +431,7 @@ pub fn parseTreeDiffMeta(input: string) !TreeDiffMeta {...@@ -431,7 +431,7 @@ pub fn parseTreeDiffMeta(input: string) !TreeDiffMeta {
431 defer t.end();431 defer t.end();
432432
433 var result = std.mem.zeroes(TreeDiffMeta);433 var result = std.mem.zeroes(TreeDiffMeta);
434 var lineiter = std.mem.split(u8, input, "\n");434 var lineiter = std.mem.splitScalar(u8, input, '\n');
435435
436 while (lineiter.next()) |lin| {436 while (lineiter.next()) |lin| {
437 if (lin.len == 0) break;437 if (lin.len == 0) break;
...@@ -504,7 +504,7 @@ pub fn parseTreeDiff(alloc: std.mem.Allocator, input: string) !TreeDiff {...@@ -504,7 +504,7 @@ pub fn parseTreeDiff(alloc: std.mem.Allocator, input: string) !TreeDiff {
504 const t = tracer.trace(@src(), "", .{});504 const t = tracer.trace(@src(), "", .{});
505 defer t.end();505 defer t.end();
506506
507 var lineiter = std.mem.split(u8, input, "\n");507 var lineiter = std.mem.splitScalar(u8, input, '\n');
508 var overview = std.ArrayList(TreeDiff.StateLine).init(alloc);508 var overview = std.ArrayList(TreeDiff.StateLine).init(alloc);
509 var diffs = std.ArrayList(TreeDiff.Diff).init(alloc);509 var diffs = std.ArrayList(TreeDiff.Diff).init(alloc);
510510
...@@ -513,14 +513,14 @@ pub fn parseTreeDiff(alloc: std.mem.Allocator, input: string) !TreeDiff {...@@ -513,14 +513,14 @@ pub fn parseTreeDiff(alloc: std.mem.Allocator, input: string) !TreeDiff {
513 std.debug.assert(lin[0] == ':');513 std.debug.assert(lin[0] == ':');
514514
515 // :100644 100644 c06b41d04c381f1841d445c0072219d9a7f57e17 e8f91cf7dd413ac65a362b0a170951033dba4762 M notes/all_packages.txt515 // :100644 100644 c06b41d04c381f1841d445c0072219d9a7f57e17 e8f91cf7dd413ac65a362b0a170951033dba4762 M notes/all_packages.txt
516 var jter = std.mem.tokenize(u8, lin[1..], " ");516 var jter = std.mem.tokenizeScalar(u8, lin[1..], ' ');
517 const before_mode = try parseTreeMode(jter.next().?);517 const before_mode = try parseTreeMode(jter.next().?);
518 const after_mode = try parseTreeMode(jter.next().?);518 const after_mode = try parseTreeMode(jter.next().?);
519519
520 const before_tree = ensureObjId(TreeId, jter.next().?);520 const before_tree = ensureObjId(TreeId, jter.next().?);
521 const after_tree = ensureObjId(TreeId, jter.next().?);521 const after_tree = ensureObjId(TreeId, jter.next().?);
522522
523 var kter = std.mem.split(u8, jter.next().?, "\t"); // why is there a tab here git. why?523 var kter = std.mem.splitScalar(u8, jter.next().?, '\t'); // why is there a tab here git. why?
524 const action_s = kter.next().?;524 const action_s = kter.next().?;
525525
526 try overview.append(.{526 try overview.append(.{
...@@ -681,11 +681,11 @@ pub fn getBranches(alloc: std.mem.Allocator, dir: std.fs.Dir) ![]const Ref {...@@ -681,11 +681,11 @@ pub fn getBranches(alloc: std.mem.Allocator, dir: std.fs.Dir) ![]const Ref {
681 });681 });
682 std.debug.assert(result.term == .Exited and result.term.Exited == 0);682 std.debug.assert(result.term == .Exited and result.term.Exited == 0);
683 const output = std.mem.trimRight(u8, result.stdout, "\n");683 const output = std.mem.trimRight(u8, result.stdout, "\n");
684 var iter = std.mem.split(u8, output, "\n");684 var iter = std.mem.splitScalar(u8, output, '\n');
685 var list = std.ArrayList(Ref).init(alloc);685 var list = std.ArrayList(Ref).init(alloc);
686 errdefer list.deinit();686 errdefer list.deinit();
687 while (iter.next()) |line| {687 while (iter.next()) |line| {
688 var jter = std.mem.split(u8, line, " ");688 var jter = std.mem.splitScalar(u8, line, ' ');
689 try list.append(Ref{689 try list.append(Ref{
690 .commit = ensureObjId(CommitId, jter.next().?),690 .commit = ensureObjId(CommitId, jter.next().?),
691 .label = extras.trimPrefixEnsure(jter.rest(), "refs/heads/").?,691 .label = extras.trimPrefixEnsure(jter.rest(), "refs/heads/").?,
...@@ -712,11 +712,11 @@ pub fn getTags(alloc: std.mem.Allocator, dir: std.fs.Dir) ![]const Ref {...@@ -712,11 +712,11 @@ pub fn getTags(alloc: std.mem.Allocator, dir: std.fs.Dir) ![]const Ref {
712 if (result.term == .Exited and result.term.Exited == 1) return &.{}; // show-ref exits 1 when there are no tags712 if (result.term == .Exited and result.term.Exited == 1) return &.{}; // show-ref exits 1 when there are no tags
713 std.debug.assert(result.term == .Exited and result.term.Exited == 0);713 std.debug.assert(result.term == .Exited and result.term.Exited == 0);
714 const output = std.mem.trimRight(u8, result.stdout, "\n");714 const output = std.mem.trimRight(u8, result.stdout, "\n");
715 var iter = std.mem.split(u8, output, "\n");715 var iter = std.mem.splitScalar(u8, output, '\n');
716 var list = std.ArrayList(Ref).init(alloc);716 var list = std.ArrayList(Ref).init(alloc);
717 errdefer list.deinit();717 errdefer list.deinit();
718 while (iter.next()) |line| {718 while (iter.next()) |line| {
719 var jter = std.mem.split(u8, line, " ");719 var jter = std.mem.splitScalar(u8, line, ' ');
720 const id = ensureObjId(CommitId, jter.next().?).id;720 const id = ensureObjId(CommitId, jter.next().?).id;
721 const label = extras.trimPrefixEnsure(jter.rest(), "refs/tags/").?;721 const label = extras.trimPrefixEnsure(jter.rest(), "refs/tags/").?;
722 extras.assertLog(!std.mem.endsWith(u8, label, "^{}"), "{s}", .{label});722 extras.assertLog(!std.mem.endsWith(u8, label, "^{}"), "{s}", .{label});
...@@ -733,7 +733,7 @@ pub fn getTags(alloc: std.mem.Allocator, dir: std.fs.Dir) ![]const Ref {...@@ -733,7 +733,7 @@ pub fn getTags(alloc: std.mem.Allocator, dir: std.fs.Dir) ![]const Ref {
733 },733 },
734 .tag => {734 .tag => {
735 const derefline = iter.next().?;735 const derefline = iter.next().?;
736 var kter = std.mem.split(u8, derefline, " ");736 var kter = std.mem.splitScalar(u8, derefline, ' ');
737 const id2 = ensureObjId(CommitId, kter.next().?).id;737 const id2 = ensureObjId(CommitId, kter.next().?).id;
738 const label2 = extras.trimPrefixEnsure(kter.rest(), "refs/tags/").?;738 const label2 = extras.trimPrefixEnsure(kter.rest(), "refs/tags/").?;
739 extras.assertLog(std.mem.endsWith(u8, label2, "^{}"), "{s}", .{label2});739 extras.assertLog(std.mem.endsWith(u8, label2, "^{}"), "{s}", .{label2});