authorgravatar for hello@nektro.netMeghan Denny <hello@nektro.net> 2021-05-07 19:36:11 -07:00
committergravatar for hello@nektro.netMeghan Denny <hello@nektro.net> 2021-05-07 19:36:11 -07:00
logbb3fd063b8560ce4b11e2b800656ad9c9308b3dc
tree703c447a0ab2197f81d8ef806f4bba6f540e9e44
parent52af404f587454370900f8227c6d5c56c6f4a3a3

organize imports

11 files changed, 29 insertions(+), 29 deletions(-)

src/cmd/aquila/showjson.zig+1-1
...@@ -1,5 +1,6 @@...@@ -1,5 +1,6 @@
1const std = @import("std");1const std = @import("std");
2const gpa = std.heap.c_allocator;2const gpa = std.heap.c_allocator;
3const out = std.io.getStdOut().writer();
34
4const u = @import("./../../util/index.zig");5const u = @import("./../../util/index.zig");
5const aq = @import("./../aq.zig");6const aq = @import("./../aq.zig");
...@@ -11,6 +12,5 @@ pub fn execute(args: [][]u8) !void {...@@ -11,6 +12,5 @@ pub fn execute(args: [][]u8) !void {
11 const url = try std.mem.join(gpa, "/", &.{ aq.server_root, args[0] });12 const url = try std.mem.join(gpa, "/", &.{ aq.server_root, args[0] });
12 const val = try aq.server_fetch(url);13 const val = try aq.server_fetch(url);
1314
14 const out = std.io.getStdOut().writer();
15 try out.print("{}\n", .{val});15 try out.print("{}\n", .{val});
16}16}
src/cmd/fetch.zig+11-11
...@@ -1,8 +1,8 @@...@@ -1,8 +1,8 @@
1const std = @import("std");1const std = @import("std");
2const gpa = std.heap.c_allocator;2const gpa = std.heap.c_allocator;
3const fs = std.fs;
43
5const known_folders = @import("known-folders");4const known_folders = @import("known-folders");
5
6const u = @import("./../util/index.zig");6const u = @import("./../util/index.zig");
7const common = @import("./../common.zig");7const common = @import("./../common.zig");
88
...@@ -11,7 +11,7 @@ const common = @import("./../common.zig");...@@ -11,7 +11,7 @@ const common = @import("./../common.zig");
1111
12pub fn execute(args: [][]u8) !void {12pub fn execute(args: [][]u8) !void {
13 //13 //
14 const dir = try fs.path.join(gpa, &.{ ".zigmod", "deps" });14 const dir = try std.fs.path.join(gpa, &.{ ".zigmod", "deps" });
15 const should_update = !(args.len >= 1 and std.mem.eql(u8, args[0], "--no-update"));15 const should_update = !(args.len >= 1 and std.mem.eql(u8, args[0], "--no-update"));
1616
17 const top_module = try common.collect_deps_deep(dir, "zig.mod", .{17 const top_module = try common.collect_deps_deep(dir, "zig.mod", .{
...@@ -20,7 +20,7 @@ pub fn execute(args: [][]u8) !void {...@@ -20,7 +20,7 @@ pub fn execute(args: [][]u8) !void {
20 });20 });
2121
22 //22 //
23 const f = try fs.cwd().createFile("deps.zig", .{});23 const f = try std.fs.cwd().createFile("deps.zig", .{});
24 defer f.close();24 defer f.close();
2525
26 const w = f.writer();26 const w = f.writer();
...@@ -109,7 +109,7 @@ pub fn execute(args: [][]u8) !void {...@@ -109,7 +109,7 @@ pub fn execute(args: [][]u8) !void {
109 try w.writeAll("};\n\n");109 try w.writeAll("};\n\n");
110}110}
111111
112fn print_ids(w: fs.File.Writer, list: []u.Module) !void {112fn print_ids(w: std.fs.File.Writer, list: []u.Module) !void {
113 for (list) |mod| {113 for (list) |mod| {
114 if (std.mem.eql(u8, mod.id, "root")) {114 if (std.mem.eql(u8, mod.id, "root")) {
115 continue;115 continue;
...@@ -121,7 +121,7 @@ fn print_ids(w: fs.File.Writer, list: []u.Module) !void {...@@ -121,7 +121,7 @@ fn print_ids(w: fs.File.Writer, list: []u.Module) !void {
121 }121 }
122}122}
123123
124fn print_paths(w: fs.File.Writer, list: []u.Module) !void {124fn print_paths(w: std.fs.File.Writer, list: []u.Module) !void {
125 for (list) |mod| {125 for (list) |mod| {
126 if (std.mem.eql(u8, mod.id, "root")) {126 if (std.mem.eql(u8, mod.id, "root")) {
127 continue;127 continue;
...@@ -138,7 +138,7 @@ fn print_paths(w: fs.File.Writer, list: []u.Module) !void {...@@ -138,7 +138,7 @@ fn print_paths(w: fs.File.Writer, list: []u.Module) !void {
138 }138 }
139}139}
140140
141fn print_deps(w: fs.File.Writer, dir: []const u8, m: u.Module, tabs: i32, array: bool) anyerror!void {141fn print_deps(w: std.fs.File.Writer, dir: []const u8, m: u.Module, tabs: i32, array: bool) anyerror!void {
142 if (m.has_no_zig_deps() and tabs > 0) {142 if (m.has_no_zig_deps() and tabs > 0) {
143 try w.print("null", .{});143 try w.print("null", .{});
144 return;144 return;
...@@ -163,7 +163,7 @@ fn print_deps(w: fs.File.Writer, dir: []const u8, m: u.Module, tabs: i32, array:...@@ -163,7 +163,7 @@ fn print_deps(w: fs.File.Writer, dir: []const u8, m: u.Module, tabs: i32, array:
163 try w.print("{s}", .{try u.concat(&.{ r, "}" })});163 try w.print("{s}", .{try u.concat(&.{ r, "}" })});
164}164}
165165
166fn print_incl_dirs_to(w: fs.File.Writer, list: []u.Module) !void {166fn print_incl_dirs_to(w: std.fs.File.Writer, list: []u.Module) !void {
167 for (list) |mod, i| {167 for (list) |mod, i| {
168 if (mod.is_sys_lib) {168 if (mod.is_sys_lib) {
169 continue;169 continue;
...@@ -178,7 +178,7 @@ fn print_incl_dirs_to(w: fs.File.Writer, list: []u.Module) !void {...@@ -178,7 +178,7 @@ fn print_incl_dirs_to(w: fs.File.Writer, list: []u.Module) !void {
178 }178 }
179}179}
180180
181fn print_csrc_dirs_to(w: fs.File.Writer, list: []u.Module) !void {181fn print_csrc_dirs_to(w: std.fs.File.Writer, list: []u.Module) !void {
182 for (list) |mod, i| {182 for (list) |mod, i| {
183 if (mod.is_sys_lib) {183 if (mod.is_sys_lib) {
184 continue;184 continue;
...@@ -193,7 +193,7 @@ fn print_csrc_dirs_to(w: fs.File.Writer, list: []u.Module) !void {...@@ -193,7 +193,7 @@ fn print_csrc_dirs_to(w: fs.File.Writer, list: []u.Module) !void {
193 }193 }
194}194}
195195
196fn print_csrc_flags_to(w: fs.File.Writer, list: []u.Module) !void {196fn print_csrc_flags_to(w: std.fs.File.Writer, list: []u.Module) !void {
197 for (list) |mod, i| {197 for (list) |mod, i| {
198 if (mod.is_sys_lib) {198 if (mod.is_sys_lib) {
199 continue;199 continue;
...@@ -209,7 +209,7 @@ fn print_csrc_flags_to(w: fs.File.Writer, list: []u.Module) !void {...@@ -209,7 +209,7 @@ fn print_csrc_flags_to(w: fs.File.Writer, list: []u.Module) !void {
209 }209 }
210}210}
211211
212fn print_sys_libs_to(w: fs.File.Writer, list: []u.Module, list2: *std.ArrayList([]const u8)) !void {212fn print_sys_libs_to(w: std.fs.File.Writer, list: []u.Module, list2: *std.ArrayList([]const u8)) !void {
213 for (list) |mod| {213 for (list) |mod| {
214 if (!mod.is_sys_lib) {214 if (!mod.is_sys_lib) {
215 continue;215 continue;
...@@ -218,7 +218,7 @@ fn print_sys_libs_to(w: fs.File.Writer, list: []u.Module, list2: *std.ArrayList(...@@ -218,7 +218,7 @@ fn print_sys_libs_to(w: fs.File.Writer, list: []u.Module, list2: *std.ArrayList(
218 }218 }
219}219}
220220
221fn print_pkg_data_to(w: fs.File.Writer, list: *std.ArrayList(u.Module), list2: *std.ArrayList(u.Module)) anyerror!void {221fn print_pkg_data_to(w: std.fs.File.Writer, list: *std.ArrayList(u.Module), list2: *std.ArrayList(u.Module)) anyerror!void {
222 var i: usize = 0;222 var i: usize = 0;
223 while (i < list.items.len) : (i += 1) {223 while (i < list.items.len) : (i += 1) {
224 const mod = list.items[i];224 const mod = list.items[i];
src/cmd/license.zig+3-5
...@@ -1,14 +1,12 @@...@@ -1,14 +1,12 @@
1const std = @import("std");1const std = @import("std");
2const gpa = std.heap.c_allocator;2const gpa = std.heap.c_allocator;
33
4const style = @import("ansi").style;
5const licenses = @import("licenses");
6
4const u = @import("./../util/index.zig");7const u = @import("./../util/index.zig");
5const common = @import("./../common.zig");8const common = @import("./../common.zig");
69
7const ansi = @import("ansi");
8const style = ansi.style;
9
10const licenses = @import("licenses");
11
12const Module = u.Module;10const Module = u.Module;
13const List = std.ArrayList(u.Module);11const List = std.ArrayList(u.Module);
14const Map = std.StringArrayHashMap(*List);12const Map = std.StringArrayHashMap(*List);
src/cmd/sum.zig+1
...@@ -2,6 +2,7 @@ const std = @import("std");...@@ -2,6 +2,7 @@ const std = @import("std");
2const gpa = std.heap.c_allocator;2const gpa = std.heap.c_allocator;
33
4const known_folders = @import("known-folders");4const known_folders = @import("known-folders");
5
5const u = @import("./../util/index.zig");6const u = @import("./../util/index.zig");
6const common = @import("./../common.zig");7const common = @import("./../common.zig");
78
src/cmd/zpm/showjson.zig+1-1
...@@ -4,7 +4,7 @@ const gpa = std.heap.c_allocator;...@@ -4,7 +4,7 @@ const gpa = std.heap.c_allocator;
4const zfetch = @import("zfetch");4const zfetch = @import("zfetch");
5const json = @import("json");5const json = @import("json");
66
7const u = @import("./../util/index.zig");7const u = @import("./../../util/index.zig");
8const zpm = @import("./../zpm.zig");8const zpm = @import("./../zpm.zig");
99
10//10//
src/cmd/zpm/tags.zig+2-2
...@@ -6,7 +6,7 @@ const zfetch = @import("zfetch");...@@ -6,7 +6,7 @@ const zfetch = @import("zfetch");
6const json = @import("json");6const json = @import("json");
7const range = @import("range").range;7const range = @import("range").range;
88
9const u = @import("./../util/index.zig");9const u = @import("./../../util/index.zig");
10const zpm = @import("./../zpm.zig");10const zpm = @import("./../zpm.zig");
1111
12//12//
...@@ -41,7 +41,7 @@ pub fn execute(args: [][]u8) !void {...@@ -41,7 +41,7 @@ pub fn execute(args: [][]u8) !void {
41}41}
4242
43fn print_c_n(c: u8, n: usize) !void {43fn print_c_n(c: u8, n: usize) !void {
44 for (range(n)) |_, i| {44 for (range(n)) |_| {
45 try out.writeAll(&.{c});45 try out.writeAll(&.{c});
46 }46 }
47}47}
src/common.zig+5-6
...@@ -1,6 +1,5 @@...@@ -1,6 +1,5 @@
1const std = @import("std");1const std = @import("std");
2const gpa = std.heap.c_allocator;2const gpa = std.heap.c_allocator;
3const fs = std.fs;
43
5const u = @import("./util/index.zig");4const u = @import("./util/index.zig");
65
...@@ -68,9 +67,9 @@ pub fn collect_pkgs(mod: u.Module, list: *std.ArrayList(u.Module)) anyerror!void...@@ -68,9 +67,9 @@ pub fn collect_pkgs(mod: u.Module, list: *std.ArrayList(u.Module)) anyerror!void
68}67}
6968
70fn get_moddir(basedir: []const u8, d: u.Dep, parent_name: []const u8, options: CollectOptions) ![]const u8 {69fn get_moddir(basedir: []const u8, d: u.Dep, parent_name: []const u8, options: CollectOptions) ![]const u8 {
71 const p = try fs.path.join(gpa, &.{ basedir, try d.clean_path() });70 const p = try std.fs.path.join(gpa, &.{ basedir, try d.clean_path() });
72 const pv = try fs.path.join(gpa, &.{ basedir, try d.clean_path_v() });71 const pv = try std.fs.path.join(gpa, &.{ basedir, try d.clean_path_v() });
73 const tempdir = try fs.path.join(gpa, &.{ basedir, "temp" });72 const tempdir = try std.fs.path.join(gpa, &.{ basedir, "temp" });
74 if (options.log) {73 if (options.log) {
75 u.print("fetch: {s}: {s}: {s}", .{ parent_name, @tagName(d.type), d.path });74 u.print("fetch: {s}: {s}: {s}", .{ parent_name, @tagName(d.type), d.path });
76 }75 }
...@@ -101,8 +100,8 @@ fn get_moddir(basedir: []const u8, d: u.Dep, parent_name: []const u8, options: C...@@ -101,8 +100,8 @@ fn get_moddir(basedir: []const u8, d: u.Dep, parent_name: []const u8, options: C
101 if ((try u.run_cmd(tempdir, &.{ "git", "checkout", vers.string })) > 0) {100 if ((try u.run_cmd(tempdir, &.{ "git", "checkout", vers.string })) > 0) {
102 u.assert(false, "fetch: git: {s}: {s} {s} does not exist", .{ d.path, @tagName(vers.id), vers.string });101 u.assert(false, "fetch: git: {s}: {s} {s} does not exist", .{ d.path, @tagName(vers.id), vers.string });
103 }102 }
104 const td_fd = try fs.cwd().openDir(basedir, .{});103 const td_fd = try std.fs.cwd().openDir(basedir, .{});
105 try fs.cwd().makePath(pv);104 try std.fs.cwd().makePath(pv);
106 try td_fd.rename("temp", try d.clean_path_v());105 try td_fd.rename("temp", try d.clean_path_v());
107 if (vers.id != .branch) {106 if (vers.id != .branch) {
108 const pvd = try std.fs.cwd().openDir(pv, .{});107 const pvd = try std.fs.cwd().openDir(pv, .{});
src/main.zig+2-1
...@@ -1,5 +1,6 @@...@@ -1,5 +1,6 @@
1const std = @import("std");1const std = @import("std");
2const builtin = std.builtin;2const builtin = std.builtin;
3
3const build_options = @import("build_options");4const build_options = @import("build_options");
4const zigmod = @import("zigmod");5const zigmod = @import("zigmod");
56
...@@ -17,7 +18,7 @@ pub fn main() !void {...@@ -17,7 +18,7 @@ pub fn main() !void {
1718
18 if (args.len == 0) {19 if (args.len == 0) {
19 u.print("zigmod {s} {s} {s} {s}", .{20 u.print("zigmod {s} {s} {s} {s}", .{
20 @import("build_options").version,21 build_options.version,
21 @tagName(builtin.os.tag),22 @tagName(builtin.os.tag),
22 @tagName(builtin.arch),23 @tagName(builtin.arch),
23 @tagName(builtin.abi),24 @tagName(builtin.abi),
src/util/dep.zig+1-1
...@@ -1,6 +1,6 @@...@@ -1,6 +1,6 @@
1const std = @import("std");1const std = @import("std");
2const gpa = std.heap.c_allocator;2const gpa = std.heap.c_allocator;
3const builtin = @import("builtin");3const builtin = std.builtin;
44
5const u = @import("index.zig");5const u = @import("index.zig");
6const yaml = @import("./yaml.zig");6const yaml = @import("./yaml.zig");
src/util/funcs.zig+1
...@@ -2,6 +2,7 @@ const std = @import("std");...@@ -2,6 +2,7 @@ const std = @import("std");
2const gpa = std.heap.c_allocator;2const gpa = std.heap.c_allocator;
33
4const ansi = @import("ansi");4const ansi = @import("ansi");
5
5const u = @import("index.zig");6const u = @import("index.zig");
67
7//8//
src/util/module.zig+1-1
...@@ -1,6 +1,6 @@...@@ -1,6 +1,6 @@
1const std = @import("std");1const std = @import("std");
2const gpa = std.heap.c_allocator;2const gpa = std.heap.c_allocator;
3const builtin = @import("builtin");3const builtin = std.builtin;
44
5const u = @import("index.zig");5const u = @import("index.zig");
6const yaml = @import("./yaml.zig");6const yaml = @import("./yaml.zig");