authorgravatar for der.teufel.mail@gmail.comKrzysztof Wolicki <der.teufel.mail@gmail.com> 2024-01-18 08:13:04+01:00
committergravatar for noreply@github.comGitHub <noreply@github.com> 2024-01-18 09:13:04+02:00
log14efbbfd89c7e034436faa87a201a35324b9dff3
treefae0a7a3b2e8fa7e3fbf8fb538cc4100bfacb4cb
parent6e5bdb5397b5ec5ff3dd6e3ca6f7f93a9b6bfde9
signaturebadge-check Signed by PGP key B5690EEEBB952194

std.Uri: change specifier for printing with scheme to semicolon `;`

Fetch: print scheme when suggesting adding a ref to git URIs

2 files changed, 3 insertions(+), 3 deletions(-)

lib/std/Uri.zig+2-2
...@@ -318,7 +318,7 @@ pub fn format(...@@ -318,7 +318,7 @@ pub fn format(
318) @TypeOf(writer).Error!void {318) @TypeOf(writer).Error!void {
319 _ = options;319 _ = options;
320320
321 const scheme = comptime std.mem.indexOf(u8, fmt, ":") != null or fmt.len == 0;321 const scheme = comptime std.mem.indexOf(u8, fmt, ";") != null or fmt.len == 0;
322 const authentication = comptime std.mem.indexOf(u8, fmt, "@") != null or fmt.len == 0;322 const authentication = comptime std.mem.indexOf(u8, fmt, "@") != null or fmt.len == 0;
323 const authority = comptime std.mem.indexOf(u8, fmt, "+") != null or fmt.len == 0;323 const authority = comptime std.mem.indexOf(u8, fmt, "+") != null or fmt.len == 0;
324 const path = comptime std.mem.indexOf(u8, fmt, "/") != null or fmt.len == 0;324 const path = comptime std.mem.indexOf(u8, fmt, "/") != null or fmt.len == 0;
...@@ -850,7 +850,7 @@ test "format" {...@@ -850,7 +850,7 @@ test "format" {
850 };850 };
851 var buf = std.ArrayList(u8).init(std.testing.allocator);851 var buf = std.ArrayList(u8).init(std.testing.allocator);
852 defer buf.deinit();852 defer buf.deinit();
853 try uri.format(":/?#", .{}, buf.writer());853 try buf.writer().print("{;/?#}", .{uri});
854 try std.testing.expectEqualSlices(u8, "file:/foo/bar/baz", buf.items);854 try std.testing.expectEqualSlices(u8, "file:/foo/bar/baz", buf.items);
855}855}
856856
src/Package/Fetch.zig+1-1
...@@ -915,7 +915,7 @@ fn initResource(f: *Fetch, uri: std.Uri) RunError!Resource {...@@ -915,7 +915,7 @@ fn initResource(f: *Fetch, uri: std.Uri) RunError!Resource {
915 });915 });
916 const notes_start = try eb.reserveNotes(notes_len);916 const notes_start = try eb.reserveNotes(notes_len);
917 eb.extra.items[notes_start] = @intFromEnum(try eb.addErrorMessage(.{917 eb.extra.items[notes_start] = @intFromEnum(try eb.addErrorMessage(.{
918 .msg = try eb.printString("try .url = \"{+/}#{}\",", .{918 .msg = try eb.printString("try .url = \"{;+/}#{}\",", .{
919 uri, std.fmt.fmtSliceHexLower(&want_oid),919 uri, std.fmt.fmtSliceHexLower(&want_oid),
920 }),920 }),
921 }));921 }));