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 {
7474 error.FileNotFound => break :blk,
7575 else => |e| return e,
7676 };
77 var iter = std.mem.split(u8, pckedrfs, "\n");
77 var iter = std.mem.splitScalar(u8, pckedrfs, '\n');
7878 while (iter.next()) |line| {
7979 if (std.mem.startsWith(u8, line, "#")) continue;
8080 if (std.mem.startsWith(u8, line, "^")) continue;
8181 if (line.len == 0) continue;
82 var jter = std.mem.split(u8, line, " ");
82 var jter = std.mem.splitScalar(u8, line, ' ');
8383 const objid = jter.next().?;
8484 const ref = jter.next().?;
8585 std.debug.assert(jter.next() == null);
......@@ -193,7 +193,7 @@ pub fn parseCommit(alloc: std.mem.Allocator, commitfile: string) !Commit {
193193 const t = tracer.trace(@src(), "", .{});
194194 defer t.end();
195195
196 var iter = std.mem.split(u8, commitfile, "\n");
196 var iter = std.mem.splitScalar(u8, commitfile, '\n');
197197 var result: Commit = undefined;
198198 var parents = std.ArrayList(CommitId).init(alloc);
199199 errdefer parents.deinit();
......@@ -221,7 +221,7 @@ fn parseCommitUserAndAt(input: string) !Commit.UserAndAt {
221221 // first and second part is https://datatracker.ietf.org/doc/html/rfc5322#section-3.4
222222 // third part is unix epoch timestamp
223223 // fourth part is TZ
224 var maybe_bad_parser = std.mem.splitBackwards(u8, input, " ");
224 var maybe_bad_parser = std.mem.splitBackwardsScalar(u8, input, ' ');
225225 const tz_part = maybe_bad_parser.next() orelse return error.BadCommitTz;
226226 const time_part = maybe_bad_parser.next() orelse return error.BadCommitTime;
227227 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 {
258258 const t = tracer.trace(@src(), "", .{});
259259 defer t.end();
260260
261 var iter = std.mem.split(u8, treefile, "\n");
261 var iter = std.mem.splitScalar(u8, treefile, '\n');
262262 var children = std.ArrayList(Tree.Object).init(alloc);
263263 errdefer children.deinit();
264264
......@@ -267,7 +267,7 @@ pub fn parseTree(alloc: std.mem.Allocator, treefile: string) !Tree {
267267 std.debug.assert(iter.peek() == null);
268268 break;
269269 }
270 var jter = std.mem.split(u8, line, " ");
270 var jter = std.mem.splitScalar(u8, line, ' ');
271271 const mode = jter.next().?;
272272 const otype = std.meta.stringToEnum(Tree.Object.Id.Tag, jter.next().?).?;
273273 const id_and_name = jter.next().?;
......@@ -431,7 +431,7 @@ pub fn parseTreeDiffMeta(input: string) !TreeDiffMeta {
431431 defer t.end();
432432
433433 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
436436 while (lineiter.next()) |lin| {
437437 if (lin.len == 0) break;
......@@ -504,7 +504,7 @@ pub fn parseTreeDiff(alloc: std.mem.Allocator, input: string) !TreeDiff {
504504 const t = tracer.trace(@src(), "", .{});
505505 defer t.end();
506506
507 var lineiter = std.mem.split(u8, input, "\n");
507 var lineiter = std.mem.splitScalar(u8, input, '\n');
508508 var overview = std.ArrayList(TreeDiff.StateLine).init(alloc);
509509 var diffs = std.ArrayList(TreeDiff.Diff).init(alloc);
510510
......@@ -513,14 +513,14 @@ pub fn parseTreeDiff(alloc: std.mem.Allocator, input: string) !TreeDiff {
513513 std.debug.assert(lin[0] == ':');
514514
515515 // :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..], ' ');
517517 const before_mode = try parseTreeMode(jter.next().?);
518518 const after_mode = try parseTreeMode(jter.next().?);
519519
520520 const before_tree = ensureObjId(TreeId, jter.next().?);
521521 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?
524524 const action_s = kter.next().?;
525525
526526 try overview.append(.{
......@@ -681,11 +681,11 @@ pub fn getBranches(alloc: std.mem.Allocator, dir: std.fs.Dir) ![]const Ref {
681681 });
682682 std.debug.assert(result.term == .Exited and result.term.Exited == 0);
683683 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');
685685 var list = std.ArrayList(Ref).init(alloc);
686686 errdefer list.deinit();
687687 while (iter.next()) |line| {
688 var jter = std.mem.split(u8, line, " ");
688 var jter = std.mem.splitScalar(u8, line, ' ');
689689 try list.append(Ref{
690690 .commit = ensureObjId(CommitId, jter.next().?),
691691 .label = extras.trimPrefixEnsure(jter.rest(), "refs/heads/").?,
......@@ -712,11 +712,11 @@ pub fn getTags(alloc: std.mem.Allocator, dir: std.fs.Dir) ![]const Ref {
712712 if (result.term == .Exited and result.term.Exited == 1) return &.{}; // show-ref exits 1 when there are no tags
713713 std.debug.assert(result.term == .Exited and result.term.Exited == 0);
714714 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');
716716 var list = std.ArrayList(Ref).init(alloc);
717717 errdefer list.deinit();
718718 while (iter.next()) |line| {
719 var jter = std.mem.split(u8, line, " ");
719 var jter = std.mem.splitScalar(u8, line, ' ');
720720 const id = ensureObjId(CommitId, jter.next().?).id;
721721 const label = extras.trimPrefixEnsure(jter.rest(), "refs/tags/").?;
722722 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 {
733733 },
734734 .tag => {
735735 const derefline = iter.next().?;
736 var kter = std.mem.split(u8, derefline, " ");
736 var kter = std.mem.splitScalar(u8, derefline, ' ');
737737 const id2 = ensureObjId(CommitId, kter.next().?).id;
738738 const label2 = extras.trimPrefixEnsure(kter.rest(), "refs/tags/").?;
739739 extras.assertLog(std.mem.endsWith(u8, label2, "^{}"), "{s}", .{label2});