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 @@
11const std = @import("std");
22const gpa = std.heap.c_allocator;
3const out = std.io.getStdOut().writer();
34
45const u = @import("./../../util/index.zig");
56const aq = @import("./../aq.zig");
......@@ -11,6 +12,5 @@ pub fn execute(args: [][]u8) !void {
1112 const url = try std.mem.join(gpa, "/", &.{ aq.server_root, args[0] });
1213 const val = try aq.server_fetch(url);
1314
14 const out = std.io.getStdOut().writer();
1515 try out.print("{}\n", .{val});
1616}
src/cmd/fetch.zig+11-11
......@@ -1,8 +1,8 @@
11const std = @import("std");
22const gpa = std.heap.c_allocator;
3const fs = std.fs;
43
54const known_folders = @import("known-folders");
5
66const u = @import("./../util/index.zig");
77const common = @import("./../common.zig");
88
......@@ -11,7 +11,7 @@ const common = @import("./../common.zig");
1111
1212pub fn execute(args: [][]u8) !void {
1313 //
14 const dir = try fs.path.join(gpa, &.{ ".zigmod", "deps" });
14 const dir = try std.fs.path.join(gpa, &.{ ".zigmod", "deps" });
1515 const should_update = !(args.len >= 1 and std.mem.eql(u8, args[0], "--no-update"));
1616
1717 const top_module = try common.collect_deps_deep(dir, "zig.mod", .{
......@@ -20,7 +20,7 @@ pub fn execute(args: [][]u8) !void {
2020 });
2121
2222 //
23 const f = try fs.cwd().createFile("deps.zig", .{});
23 const f = try std.fs.cwd().createFile("deps.zig", .{});
2424 defer f.close();
2525
2626 const w = f.writer();
......@@ -109,7 +109,7 @@ pub fn execute(args: [][]u8) !void {
109109 try w.writeAll("};\n\n");
110110}
111111
112fn print_ids(w: fs.File.Writer, list: []u.Module) !void {
112fn print_ids(w: std.fs.File.Writer, list: []u.Module) !void {
113113 for (list) |mod| {
114114 if (std.mem.eql(u8, mod.id, "root")) {
115115 continue;
......@@ -121,7 +121,7 @@ fn print_ids(w: fs.File.Writer, list: []u.Module) !void {
121121 }
122122}
123123
124fn print_paths(w: fs.File.Writer, list: []u.Module) !void {
124fn print_paths(w: std.fs.File.Writer, list: []u.Module) !void {
125125 for (list) |mod| {
126126 if (std.mem.eql(u8, mod.id, "root")) {
127127 continue;
......@@ -138,7 +138,7 @@ fn print_paths(w: fs.File.Writer, list: []u.Module) !void {
138138 }
139139}
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 {
142142 if (m.has_no_zig_deps() and tabs > 0) {
143143 try w.print("null", .{});
144144 return;
......@@ -163,7 +163,7 @@ fn print_deps(w: fs.File.Writer, dir: []const u8, m: u.Module, tabs: i32, array:
163163 try w.print("{s}", .{try u.concat(&.{ r, "}" })});
164164}
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 {
167167 for (list) |mod, i| {
168168 if (mod.is_sys_lib) {
169169 continue;
......@@ -178,7 +178,7 @@ fn print_incl_dirs_to(w: fs.File.Writer, list: []u.Module) !void {
178178 }
179179}
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 {
182182 for (list) |mod, i| {
183183 if (mod.is_sys_lib) {
184184 continue;
......@@ -193,7 +193,7 @@ fn print_csrc_dirs_to(w: fs.File.Writer, list: []u.Module) !void {
193193 }
194194}
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 {
197197 for (list) |mod, i| {
198198 if (mod.is_sys_lib) {
199199 continue;
......@@ -209,7 +209,7 @@ fn print_csrc_flags_to(w: fs.File.Writer, list: []u.Module) !void {
209209 }
210210}
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 {
213213 for (list) |mod| {
214214 if (!mod.is_sys_lib) {
215215 continue;
......@@ -218,7 +218,7 @@ fn print_sys_libs_to(w: fs.File.Writer, list: []u.Module, list2: *std.ArrayList(
218218 }
219219}
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 {
222222 var i: usize = 0;
223223 while (i < list.items.len) : (i += 1) {
224224 const mod = list.items[i];
src/cmd/license.zig+3-5
......@@ -1,14 +1,12 @@
11const std = @import("std");
22const gpa = std.heap.c_allocator;
33
4const style = @import("ansi").style;
5const licenses = @import("licenses");
6
47const u = @import("./../util/index.zig");
58const common = @import("./../common.zig");
69
7const ansi = @import("ansi");
8const style = ansi.style;
9
10const licenses = @import("licenses");
11
1210const Module = u.Module;
1311const List = std.ArrayList(u.Module);
1412const Map = std.StringArrayHashMap(*List);
src/cmd/sum.zig+1
......@@ -2,6 +2,7 @@ const std = @import("std");
22const gpa = std.heap.c_allocator;
33
44const known_folders = @import("known-folders");
5
56const u = @import("./../util/index.zig");
67const common = @import("./../common.zig");
78
src/cmd/zpm/showjson.zig+1-1
......@@ -4,7 +4,7 @@ const gpa = std.heap.c_allocator;
44const zfetch = @import("zfetch");
55const json = @import("json");
66
7const u = @import("./../util/index.zig");
7const u = @import("./../../util/index.zig");
88const zpm = @import("./../zpm.zig");
99
1010//
src/cmd/zpm/tags.zig+2-2
......@@ -6,7 +6,7 @@ const zfetch = @import("zfetch");
66const json = @import("json");
77const range = @import("range").range;
88
9const u = @import("./../util/index.zig");
9const u = @import("./../../util/index.zig");
1010const zpm = @import("./../zpm.zig");
1111
1212//
......@@ -41,7 +41,7 @@ pub fn execute(args: [][]u8) !void {
4141}
4242
4343fn print_c_n(c: u8, n: usize) !void {
44 for (range(n)) |_, i| {
44 for (range(n)) |_| {
4545 try out.writeAll(&.{c});
4646 }
4747}
src/common.zig+5-6
......@@ -1,6 +1,5 @@
11const std = @import("std");
22const gpa = std.heap.c_allocator;
3const fs = std.fs;
43
54const u = @import("./util/index.zig");
65
......@@ -68,9 +67,9 @@ pub fn collect_pkgs(mod: u.Module, list: *std.ArrayList(u.Module)) anyerror!void
6867}
6968
7069fn 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() });
72 const pv = try fs.path.join(gpa, &.{ basedir, try d.clean_path_v() });
73 const tempdir = try fs.path.join(gpa, &.{ basedir, "temp" });
70 const p = try std.fs.path.join(gpa, &.{ basedir, try d.clean_path() });
71 const pv = try std.fs.path.join(gpa, &.{ basedir, try d.clean_path_v() });
72 const tempdir = try std.fs.path.join(gpa, &.{ basedir, "temp" });
7473 if (options.log) {
7574 u.print("fetch: {s}: {s}: {s}", .{ parent_name, @tagName(d.type), d.path });
7675 }
......@@ -101,8 +100,8 @@ fn get_moddir(basedir: []const u8, d: u.Dep, parent_name: []const u8, options: C
101100 if ((try u.run_cmd(tempdir, &.{ "git", "checkout", vers.string })) > 0) {
102101 u.assert(false, "fetch: git: {s}: {s} {s} does not exist", .{ d.path, @tagName(vers.id), vers.string });
103102 }
104 const td_fd = try fs.cwd().openDir(basedir, .{});
105 try fs.cwd().makePath(pv);
103 const td_fd = try std.fs.cwd().openDir(basedir, .{});
104 try std.fs.cwd().makePath(pv);
106105 try td_fd.rename("temp", try d.clean_path_v());
107106 if (vers.id != .branch) {
108107 const pvd = try std.fs.cwd().openDir(pv, .{});
src/main.zig+2-1
......@@ -1,5 +1,6 @@
11const std = @import("std");
22const builtin = std.builtin;
3
34const build_options = @import("build_options");
45const zigmod = @import("zigmod");
56
......@@ -17,7 +18,7 @@ pub fn main() !void {
1718
1819 if (args.len == 0) {
1920 u.print("zigmod {s} {s} {s} {s}", .{
20 @import("build_options").version,
21 build_options.version,
2122 @tagName(builtin.os.tag),
2223 @tagName(builtin.arch),
2324 @tagName(builtin.abi),
src/util/dep.zig+1-1
......@@ -1,6 +1,6 @@
11const std = @import("std");
22const gpa = std.heap.c_allocator;
3const builtin = @import("builtin");
3const builtin = std.builtin;
44
55const u = @import("index.zig");
66const yaml = @import("./yaml.zig");
src/util/funcs.zig+1
......@@ -2,6 +2,7 @@ const std = @import("std");
22const gpa = std.heap.c_allocator;
33
44const ansi = @import("ansi");
5
56const u = @import("index.zig");
67
78//
src/util/module.zig+1-1
......@@ -1,6 +1,6 @@
11const std = @import("std");
22const gpa = std.heap.c_allocator;
3const builtin = @import("builtin");
3const builtin = std.builtin;
44
55const u = @import("index.zig");
66const yaml = @import("./yaml.zig");