zig

commit 14efbbfd89c7e034436faa87a201a35324b9dff3 (tree)
parent 6e5bdb5397b5ec5ff3dd6e3ca6f7f93a9b6bfde9
Author: Krzysztof Wolicki <der.teufel.mail@gmail.com>
Date:   Thu, 18 Jan 2024 08:13:04 +0100

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

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

Diffstat:
M
lib/std/Uri.zig
 | 
4
++--
M
src/Package/Fetch.zig
 | 
2
+-

2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/lib/std/Uri.zig b/lib/std/Uri.zig
@@ -318,7 +318,7 @@ pub fn format(
 ) @TypeOf(writer).Error!void {
     _ = options;
 
-    const scheme = comptime std.mem.indexOf(u8, fmt, ":") != null or fmt.len == 0;
+    const scheme = comptime std.mem.indexOf(u8, fmt, ";") != null or fmt.len == 0;
     const authentication = comptime std.mem.indexOf(u8, fmt, "@") != null or fmt.len == 0;
     const authority = comptime std.mem.indexOf(u8, fmt, "+") != null or fmt.len == 0;
     const path = comptime std.mem.indexOf(u8, fmt, "/") != null or fmt.len == 0;
@@ -850,7 +850,7 @@ test "format" {
     };
     var buf = std.ArrayList(u8).init(std.testing.allocator);
     defer buf.deinit();
-    try uri.format(":/?#", .{}, buf.writer());
+    try buf.writer().print("{;/?#}", .{uri});
     try std.testing.expectEqualSlices(u8, "file:/foo/bar/baz", buf.items);
 }
 
diff --git a/src/Package/Fetch.zig b/src/Package/Fetch.zig
@@ -915,7 +915,7 @@ fn initResource(f: *Fetch, uri: std.Uri) RunError!Resource {
             });
             const notes_start = try eb.reserveNotes(notes_len);
             eb.extra.items[notes_start] = @intFromEnum(try eb.addErrorMessage(.{
-                .msg = try eb.printString("try .url = \"{+/}#{}\",", .{
+                .msg = try eb.printString("try .url = \"{;+/}#{}\",", .{
                     uri, std.fmt.fmtSliceHexLower(&want_oid),
                 }),
             }));