Skip to content

Commit 14efbbf

Browse files
std.Uri: change specifier for printing with scheme to semicolon ;
Fetch: print scheme when suggesting adding a ref to git URIs
1 parent 6e5bdb5 commit 14efbbf

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

lib/std/Uri.zig

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -318,7 +318,7 @@ pub fn format(
318318
) @TypeOf(writer).Error!void {
319319
_ = 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;
322322
const authentication = comptime std.mem.indexOf(u8, fmt, "@") != null or fmt.len == 0;
323323
const authority = comptime std.mem.indexOf(u8, fmt, "+") != null or fmt.len == 0;
324324
const path = comptime std.mem.indexOf(u8, fmt, "/") != null or fmt.len == 0;
@@ -850,7 +850,7 @@ test "format" {
850850
};
851851
var buf = std.ArrayList(u8).init(std.testing.allocator);
852852
defer buf.deinit();
853-
try uri.format(":/?#", .{}, buf.writer());
853+
try buf.writer().print("{;/?#}", .{uri});
854854
try std.testing.expectEqualSlices(u8, "file:/foo/bar/baz", buf.items);
855855
}
856856

src/Package/Fetch.zig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -915,7 +915,7 @@ fn initResource(f: *Fetch, uri: std.Uri) RunError!Resource {
915915
});
916916
const notes_start = try eb.reserveNotes(notes_len);
917917
eb.extra.items[notes_start] = @intFromEnum(try eb.addErrorMessage(.{
918-
.msg = try eb.printString("try .url = \"{+/}#{}\",", .{
918+
.msg = try eb.printString("try .url = \"{;+/}#{}\",", .{
919919
uri, std.fmt.fmtSliceHexLower(&want_oid),
920920
}),
921921
}));

0 commit comments

Comments
 (0)