jimzah/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2024-12-02 10:02:32 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge 6236e2da28 into b0dcce93f7

Browse Source
This commit is contained in:
Tw 2024-11-25 22:59:02 -07:00 committed by GitHub
commit a597fb5a70
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Package/Fetch.zig
View File

@ -609,7 +609,7 @@ fn loadManifest(f: *Fetch, pkg_root: Cache.Path) RunError!void {
ast.* = try std.zig.Ast.parse(arena, manifest_bytes, .zon); ast.* = try std.zig.Ast.parse(arena, manifest_bytes, .zon);
if (ast.errors.len > 0) { if (ast.errors.len > 0) {
const file_path = try std.fmt.allocPrint(arena, "{}" ++ Manifest.basename, .{pkg_root}); const file_path = try std.fmt.allocPrint(arena, "{}" ++ fs.path.sep_str ++ Manifest.basename, .{pkg_root});
try std.zig.putAstErrorsIntoBundle(arena, ast.*, file_path, eb); try std.zig.putAstErrorsIntoBundle(arena, ast.*, file_path, eb);
return error.FetchFailed; return error.FetchFailed;
} }
@ -783,7 +783,7 @@ fn srcLoc(
const eb = &f.error_bundle; const eb = &f.error_bundle;
const token_starts = ast.tokens.items(.start); const token_starts = ast.tokens.items(.start);
const start_loc = ast.tokenLocation(0, tok); const start_loc = ast.tokenLocation(0, tok);
const src_path = try eb.printString("{}" ++ Manifest.basename, .{f.parent_package_root}); const src_path = try eb.printString("{}" ++ fs.path.sep_str ++ Manifest.basename, .{f.parent_package_root});
const msg_off = 0; const msg_off = 0;
return eb.addSourceLocation(.{ return eb.addSourceLocation(.{
.src_path = src_path, .src_path = src_path,