From bb3fd063b8560ce4b11e2b800656ad9c9308b3dc Mon Sep 17 00:00:00 2001 From: Meghan Denny Date: Fri, 7 May 2021 19:36:11 -0700 Subject: [PATCH] organize imports --- src/cmd/aquila/showjson.zig | 2 +- src/cmd/fetch.zig | 22 +++++++++++----------- src/cmd/license.zig | 8 +++----- src/cmd/sum.zig | 1 + src/cmd/zpm/showjson.zig | 2 +- src/cmd/zpm/tags.zig | 4 ++-- src/common.zig | 11 +++++------ src/main.zig | 3 ++- src/util/dep.zig | 2 +- src/util/funcs.zig | 1 + src/util/module.zig | 2 +- 11 files changed, 29 insertions(+), 29 deletions(-) diff --git a/src/cmd/aquila/showjson.zig b/src/cmd/aquila/showjson.zig index d13b8630a0bfe06d06f2dd8690eabd01653ae5f0..64c2d96b4cf05007a89f5c9bb22baf4c86ecdd54 100644 --- a/src/cmd/aquila/showjson.zig +++ b/src/cmd/aquila/showjson.zig @@ -1,5 +1,6 @@ const std = @import("std"); const gpa = std.heap.c_allocator; +const out = std.io.getStdOut().writer(); const u = @import("./../../util/index.zig"); const aq = @import("./../aq.zig"); @@ -11,6 +12,5 @@ pub fn execute(args: [][]u8) !void { const url = try std.mem.join(gpa, "/", &.{ aq.server_root, args[0] }); const val = try aq.server_fetch(url); - const out = std.io.getStdOut().writer(); try out.print("{}\n", .{val}); } diff --git a/src/cmd/fetch.zig b/src/cmd/fetch.zig index 9230e9414069b0dd58ca9d3b28cc30b52cb8794f..8713271d46814b0b7fec4d9b5813a73244749bf7 100644 --- a/src/cmd/fetch.zig +++ b/src/cmd/fetch.zig @@ -1,8 +1,8 @@ const std = @import("std"); const gpa = std.heap.c_allocator; -const fs = std.fs; const known_folders = @import("known-folders"); + const u = @import("./../util/index.zig"); const common = @import("./../common.zig"); @@ -11,7 +11,7 @@ const common = @import("./../common.zig"); pub fn execute(args: [][]u8) !void { // - const dir = try fs.path.join(gpa, &.{ ".zigmod", "deps" }); + const dir = try std.fs.path.join(gpa, &.{ ".zigmod", "deps" }); const should_update = !(args.len >= 1 and std.mem.eql(u8, args[0], "--no-update")); const top_module = try common.collect_deps_deep(dir, "zig.mod", .{ @@ -20,7 +20,7 @@ pub fn execute(args: [][]u8) !void { }); // - const f = try fs.cwd().createFile("deps.zig", .{}); + const f = try std.fs.cwd().createFile("deps.zig", .{}); defer f.close(); const w = f.writer(); @@ -109,7 +109,7 @@ pub fn execute(args: [][]u8) !void { try w.writeAll("};\n\n"); } -fn print_ids(w: fs.File.Writer, list: []u.Module) !void { +fn print_ids(w: std.fs.File.Writer, list: []u.Module) !void { for (list) |mod| { if (std.mem.eql(u8, mod.id, "root")) { continue; @@ -121,7 +121,7 @@ fn print_ids(w: fs.File.Writer, list: []u.Module) !void { } } -fn print_paths(w: fs.File.Writer, list: []u.Module) !void { +fn print_paths(w: std.fs.File.Writer, list: []u.Module) !void { for (list) |mod| { if (std.mem.eql(u8, mod.id, "root")) { continue; @@ -138,7 +138,7 @@ fn print_paths(w: fs.File.Writer, list: []u.Module) !void { } } -fn print_deps(w: fs.File.Writer, dir: []const u8, m: u.Module, tabs: i32, array: bool) anyerror!void { +fn print_deps(w: std.fs.File.Writer, dir: []const u8, m: u.Module, tabs: i32, array: bool) anyerror!void { if (m.has_no_zig_deps() and tabs > 0) { try w.print("null", .{}); return; @@ -163,7 +163,7 @@ fn print_deps(w: fs.File.Writer, dir: []const u8, m: u.Module, tabs: i32, array: try w.print("{s}", .{try u.concat(&.{ r, "}" })}); } -fn print_incl_dirs_to(w: fs.File.Writer, list: []u.Module) !void { +fn print_incl_dirs_to(w: std.fs.File.Writer, list: []u.Module) !void { for (list) |mod, i| { if (mod.is_sys_lib) { continue; @@ -178,7 +178,7 @@ fn print_incl_dirs_to(w: fs.File.Writer, list: []u.Module) !void { } } -fn print_csrc_dirs_to(w: fs.File.Writer, list: []u.Module) !void { +fn print_csrc_dirs_to(w: std.fs.File.Writer, list: []u.Module) !void { for (list) |mod, i| { if (mod.is_sys_lib) { continue; @@ -193,7 +193,7 @@ fn print_csrc_dirs_to(w: fs.File.Writer, list: []u.Module) !void { } } -fn print_csrc_flags_to(w: fs.File.Writer, list: []u.Module) !void { +fn print_csrc_flags_to(w: std.fs.File.Writer, list: []u.Module) !void { for (list) |mod, i| { if (mod.is_sys_lib) { continue; @@ -209,7 +209,7 @@ fn print_csrc_flags_to(w: fs.File.Writer, list: []u.Module) !void { } } -fn print_sys_libs_to(w: fs.File.Writer, list: []u.Module, list2: *std.ArrayList([]const u8)) !void { +fn print_sys_libs_to(w: std.fs.File.Writer, list: []u.Module, list2: *std.ArrayList([]const u8)) !void { for (list) |mod| { if (!mod.is_sys_lib) { continue; @@ -218,7 +218,7 @@ fn print_sys_libs_to(w: fs.File.Writer, list: []u.Module, list2: *std.ArrayList( } } -fn print_pkg_data_to(w: fs.File.Writer, list: *std.ArrayList(u.Module), list2: *std.ArrayList(u.Module)) anyerror!void { +fn print_pkg_data_to(w: std.fs.File.Writer, list: *std.ArrayList(u.Module), list2: *std.ArrayList(u.Module)) anyerror!void { var i: usize = 0; while (i < list.items.len) : (i += 1) { const mod = list.items[i]; diff --git a/src/cmd/license.zig b/src/cmd/license.zig index 61fd7e8c49a78e00609c528192ff9d2c95a4680a..fa142a4962abdd2845ede042f4a490b75e273ea7 100644 --- a/src/cmd/license.zig +++ b/src/cmd/license.zig @@ -1,14 +1,12 @@ const std = @import("std"); const gpa = std.heap.c_allocator; +const style = @import("ansi").style; +const licenses = @import("licenses"); + const u = @import("./../util/index.zig"); const common = @import("./../common.zig"); -const ansi = @import("ansi"); -const style = ansi.style; - -const licenses = @import("licenses"); - const Module = u.Module; const List = std.ArrayList(u.Module); const Map = std.StringArrayHashMap(*List); diff --git a/src/cmd/sum.zig b/src/cmd/sum.zig index e420e763b02d8e4bc9f183743e387ffd700593b8..a4235c96ca26e2ba67370877af0ae88ea92851c6 100644 --- a/src/cmd/sum.zig +++ b/src/cmd/sum.zig @@ -2,6 +2,7 @@ const std = @import("std"); const gpa = std.heap.c_allocator; const known_folders = @import("known-folders"); + const u = @import("./../util/index.zig"); const common = @import("./../common.zig"); diff --git a/src/cmd/zpm/showjson.zig b/src/cmd/zpm/showjson.zig index 09e6aa0aed79402f0e4fe376ff3c4e6f19f06ae5..603e088beff0c7c3e03a91cfaa6d9104a673d7d6 100644 --- a/src/cmd/zpm/showjson.zig +++ b/src/cmd/zpm/showjson.zig @@ -4,7 +4,7 @@ const gpa = std.heap.c_allocator; const zfetch = @import("zfetch"); const json = @import("json"); -const u = @import("./../util/index.zig"); +const u = @import("./../../util/index.zig"); const zpm = @import("./../zpm.zig"); // diff --git a/src/cmd/zpm/tags.zig b/src/cmd/zpm/tags.zig index 9e145ccbeb38ba11af5578734a335ba8b8412c21..2673c3d4d407dacccc45209e3524dfcdf9412784 100644 --- a/src/cmd/zpm/tags.zig +++ b/src/cmd/zpm/tags.zig @@ -6,7 +6,7 @@ const zfetch = @import("zfetch"); const json = @import("json"); const range = @import("range").range; -const u = @import("./../util/index.zig"); +const u = @import("./../../util/index.zig"); const zpm = @import("./../zpm.zig"); // @@ -41,7 +41,7 @@ pub fn execute(args: [][]u8) !void { } fn print_c_n(c: u8, n: usize) !void { - for (range(n)) |_, i| { + for (range(n)) |_| { try out.writeAll(&.{c}); } } diff --git a/src/common.zig b/src/common.zig index 94a5f9c39c0840c76d5e80e0024ab65532e44af9..921755b4fd6df609240aaa6be32c13e4aa43a8e9 100644 --- a/src/common.zig +++ b/src/common.zig @@ -1,6 +1,5 @@ const std = @import("std"); const gpa = std.heap.c_allocator; -const fs = std.fs; const u = @import("./util/index.zig"); @@ -68,9 +67,9 @@ pub fn collect_pkgs(mod: u.Module, list: *std.ArrayList(u.Module)) anyerror!void } fn get_moddir(basedir: []const u8, d: u.Dep, parent_name: []const u8, options: CollectOptions) ![]const u8 { - const p = try fs.path.join(gpa, &.{ basedir, try d.clean_path() }); - const pv = try fs.path.join(gpa, &.{ basedir, try d.clean_path_v() }); - const tempdir = try fs.path.join(gpa, &.{ basedir, "temp" }); + const p = try std.fs.path.join(gpa, &.{ basedir, try d.clean_path() }); + const pv = try std.fs.path.join(gpa, &.{ basedir, try d.clean_path_v() }); + const tempdir = try std.fs.path.join(gpa, &.{ basedir, "temp" }); if (options.log) { u.print("fetch: {s}: {s}: {s}", .{ parent_name, @tagName(d.type), d.path }); } @@ -101,8 +100,8 @@ fn get_moddir(basedir: []const u8, d: u.Dep, parent_name: []const u8, options: C if ((try u.run_cmd(tempdir, &.{ "git", "checkout", vers.string })) > 0) { u.assert(false, "fetch: git: {s}: {s} {s} does not exist", .{ d.path, @tagName(vers.id), vers.string }); } - const td_fd = try fs.cwd().openDir(basedir, .{}); - try fs.cwd().makePath(pv); + const td_fd = try std.fs.cwd().openDir(basedir, .{}); + try std.fs.cwd().makePath(pv); try td_fd.rename("temp", try d.clean_path_v()); if (vers.id != .branch) { const pvd = try std.fs.cwd().openDir(pv, .{}); diff --git a/src/main.zig b/src/main.zig index 1d7a0c740a432d060d7477b7c289dd7f38a32f4b..027ce0b320a0ee9a8138387e55d6c6f4bf150133 100644 --- a/src/main.zig +++ b/src/main.zig @@ -1,5 +1,6 @@ const std = @import("std"); const builtin = std.builtin; + const build_options = @import("build_options"); const zigmod = @import("zigmod"); @@ -17,7 +18,7 @@ pub fn main() !void { if (args.len == 0) { u.print("zigmod {s} {s} {s} {s}", .{ - @import("build_options").version, + build_options.version, @tagName(builtin.os.tag), @tagName(builtin.arch), @tagName(builtin.abi), diff --git a/src/util/dep.zig b/src/util/dep.zig index 8ea5c5c5d59865cf2a7bbe93627137e704bb4ee3..a78058dda12c090c665f7aa1c8c2b945244a3299 100644 --- a/src/util/dep.zig +++ b/src/util/dep.zig @@ -1,6 +1,6 @@ const std = @import("std"); const gpa = std.heap.c_allocator; -const builtin = @import("builtin"); +const builtin = std.builtin; const u = @import("index.zig"); const yaml = @import("./yaml.zig"); diff --git a/src/util/funcs.zig b/src/util/funcs.zig index 6c143e3adc4d322fec1300bf6ee71bae0df95023..1d1c851e0a583bae12040a9fc2fb9f27dbed0c2c 100644 --- a/src/util/funcs.zig +++ b/src/util/funcs.zig @@ -2,6 +2,7 @@ const std = @import("std"); const gpa = std.heap.c_allocator; const ansi = @import("ansi"); + const u = @import("index.zig"); // diff --git a/src/util/module.zig b/src/util/module.zig index 201fdae2642cbe8600d54e31d683a183af5e046a..013fb9f05b85bd8385c9aba182057ed73a948116 100644 --- a/src/util/module.zig +++ b/src/util/module.zig @@ -1,6 +1,6 @@ const std = @import("std"); const gpa = std.heap.c_allocator; -const builtin = @import("builtin"); +const builtin = std.builtin; const u = @import("index.zig"); const yaml = @import("./yaml.zig"); -- 2.54.0