authorgravatar for hello@nektro.netMeghan Denny <hello@nektro.net> 2021-08-21 02:20:57 -07:00
committergravatar for hello@nektro.netMeghan Denny <hello@nektro.net> 2021-08-21 02:20:57 -07:00
log23c790648a2fd38658aa0ce29a39645669758ffe
tree88643368452364159222676d7653042a06388f2f
parente9d9ca65eba74847190595b30c00ce1a817b7f0d

cmd/fetch- make internal methods accept a Dir

1 files changed, 6 insertions(+), 6 deletions(-)

src/cmd/fetch.zig+6-6
...@@ -30,17 +30,17 @@ pub fn execute(args: [][]u8) !void {...@@ -30,17 +30,17 @@ pub fn execute(args: [][]u8) !void {
30 var list = std.ArrayList(u.Module).init(gpa);30 var list = std.ArrayList(u.Module).init(gpa);
31 try common.collect_pkgs(top_module, &list);31 try common.collect_pkgs(top_module, &list);
3232
33 try create_depszig(cachepath, top_module, &list);33 try create_depszig(cachepath, dir, top_module, &list);
3434
35 if (bootstrap) return;35 if (bootstrap) return;
3636
37 try create_lockfile(&list, cachepath);37 try create_lockfile(&list, cachepath, dir);
3838
39 try diff_lockfile();39 try diff_lockfile();
40}40}
4141
42pub fn create_depszig(cachepath: string, top_module: u.Module, list: *std.ArrayList(u.Module)) !void {42pub fn create_depszig(cachepath: string, dir: std.fs.Dir, top_module: u.Module, list: *std.ArrayList(u.Module)) !void {
43 const f = try std.fs.cwd().createFile("deps.zig", .{});43 const f = try dir.createFile("deps.zig", .{});
44 defer f.close();44 defer f.close();
4545
46 const w = f.writer();46 const w = f.writer();
...@@ -116,8 +116,8 @@ pub fn create_depszig(cachepath: string, top_module: u.Module, list: *std.ArrayL...@@ -116,8 +116,8 @@ pub fn create_depszig(cachepath: string, top_module: u.Module, list: *std.ArrayL
116 try w.writeAll("};\n");116 try w.writeAll("};\n");
117}117}
118118
119fn create_lockfile(list: *std.ArrayList(u.Module), path: string) !void {119fn create_lockfile(list: *std.ArrayList(u.Module), path: string, dir: std.fs.Dir) !void {
120 const fl = try std.fs.cwd().createFile("zigmod.lock", .{});120 const fl = try dir.createFile("zigmod.lock", .{});
121 defer fl.close();121 defer fl.close();
122122
123 const wl = fl.writer();123 const wl = fl.writer();