authorgravatar for 36246800+nmarks413@users.noreply.github.comnmarks <36246800+nmarks413@users.noreply.github.com> 2025-05-04 13:27:54 -07:00
committergravatar for noreply@github.comGitHub <noreply@github.com> 2025-05-04 13:27:54 -07:00
log9d8f82035e63c80ffadb7bd5fc47248783d29167
tree8b57808c683b221aab4e23705eb01f4480f5eded
parentca1b3b29bd85ee6a6f57a024e11ccdc99b462372
signaturebadge-check Signed by PGP key B5690EEEBB952194

remove weird redundancy in utils/funcs.zig (#111) [skip ci]

* remove weird redundancy * renamed all references of index.zig to funcs.zig

19 files changed, 18 insertions(+), 21 deletions(-)

src/cmd/aq.zig+1-1
......@@ -5,7 +5,7 @@ const zfetch = @import("zfetch");
55const extras = @import("extras");
66const json = @import("json");
77
8const u = @import("./../util/index.zig");
8const u = @import("./../util/funcs.zig");
99
1010//
1111//
src/cmd/aquila/install.zig+1-1
......@@ -5,7 +5,7 @@ const knownfolders = @import("known-folders");
55const extras = @import("extras");
66
77const zigmod = @import("../../lib.zig");
8const u = @import("./../../util/index.zig");
8const u = @import("./../../util/funcs.zig");
99const common = @import("./../../common.zig");
1010
1111pub fn execute(self_name: []const u8, args: [][]u8) !void {
src/cmd/aquila/update.zig+1-1
......@@ -5,7 +5,7 @@ const knownfolders = @import("known-folders");
55const extras = @import("extras");
66
77const zigmod = @import("../../lib.zig");
8const u = @import("./../../util/index.zig");
8const u = @import("./../../util/funcs.zig");
99const common = @import("./../../common.zig");
1010
1111pub fn execute(self_name: []const u8, args: [][]u8) !void {
src/cmd/ci.zig+1-1
......@@ -2,7 +2,7 @@ const std = @import("std");
22const string = []const u8;
33
44const zigmod = @import("../lib.zig");
5const u = @import("./../util/index.zig");
5const u = @import("./../util/funcs.zig");
66const common = @import("./../common.zig");
77
88// Inspired by:
src/cmd/fetch.zig+1-1
......@@ -4,7 +4,7 @@ const ansi = @import("ansi");
44const extras = @import("extras");
55
66const zigmod = @import("../lib.zig");
7const u = @import("./../util/index.zig");
7const u = @import("./../util/funcs.zig");
88const common = @import("./../common.zig");
99const license = @import("./license.zig");
1010
src/cmd/generate.zig+1-1
......@@ -3,7 +3,7 @@ const string = []const u8;
33const extras = @import("extras");
44
55const zigmod = @import("../lib.zig");
6const u = @import("./../util/index.zig");
6const u = @import("./../util/funcs.zig");
77const common = @import("./../common.zig");
88
99//
src/cmd/init.zig+1-1
......@@ -8,7 +8,7 @@ const ini = @import("ini");
88const time = @import("time");
99const extras = @import("extras");
1010
11const u = @import("./../util/index.zig");
11const u = @import("./../util/funcs.zig");
1212
1313//
1414//
src/cmd/license.zig+1-1
......@@ -6,7 +6,7 @@ const licenses = @import("licenses");
66const extras = @import("extras");
77
88const zigmod = @import("../lib.zig");
9const u = @import("./../util/index.zig");
9const u = @import("./../util/funcs.zig");
1010const common = @import("./../common.zig");
1111
1212const List = std.ArrayList(zigmod.Module);
src/cmd/sum.zig+1-1
......@@ -2,7 +2,7 @@ const std = @import("std");
22const gpa = std.heap.c_allocator;
33
44const zigmod = @import("../lib.zig");
5const u = @import("./../util/index.zig");
5const u = @import("./../util/funcs.zig");
66const common = @import("./../common.zig");
77
88//
src/cmd/version.zig+1-1
......@@ -2,7 +2,7 @@ const std = @import("std");
22const gpa = std.heap.c_allocator;
33const builtin = @import("builtin");
44
5const u = @import("./../util/index.zig");
5const u = @import("./../util/funcs.zig");
66
77//
88//
src/cmd/zpm.zig+1-1
......@@ -5,7 +5,7 @@ const zfetch = @import("zfetch");
55const extras = @import("extras");
66const json = @import("json");
77
8const u = @import("./../util/index.zig");
8const u = @import("./../util/funcs.zig");
99
1010//
1111//
src/cmd/zpm/add.zig+1-1
......@@ -4,7 +4,7 @@ const zfetch = @import("zfetch");
44const extras = @import("extras");
55
66const zigmod = @import("../../lib.zig");
7const u = @import("./../../util/index.zig");
7const u = @import("./../../util/funcs.zig");
88const zpm = @import("./../zpm.zig");
99
1010//
src/common.zig+1-1
......@@ -5,7 +5,7 @@ const ansi = @import("ansi");
55const extras = @import("extras");
66
77const zigmod = @import("./lib.zig");
8const u = @import("./util/index.zig");
8const u = @import("./util/funcs.zig");
99
1010//
1111//
src/util/dep.zig+1-1
......@@ -5,7 +5,7 @@ const yaml = @import("yaml");
55const extras = @import("extras");
66
77const zigmod = @import("../lib.zig");
8const u = @import("index.zig");
8const u = @import("funcs.zig");
99
1010//
1111//
src/util/dep_type.zig+1-1
......@@ -1,7 +1,7 @@
11const std = @import("std");
22const string = []const u8;
33
4const u = @import("./index.zig");
4const u = @import("./funcs.zig");
55
66//
77//
src/util/funcs.zig+1-3
......@@ -4,8 +4,6 @@ const gpa = std.heap.c_allocator;
44const extras = @import("extras");
55const git = @import("git");
66
7const u = @import("index.zig");
8
97//
108//
119
......@@ -56,7 +54,7 @@ pub fn file_list(alloc: std.mem.Allocator, dpath: string) ![]const string {
5654pub fn run_cmd_raw(alloc: std.mem.Allocator, dir: ?string, args: []const string) !std.process.Child.RunResult {
5755 return std.process.Child.run(.{ .allocator = alloc, .cwd = dir, .argv = args, .max_output_bytes = std.math.maxInt(usize) }) catch |e| switch (e) {
5856 error.FileNotFound => {
59 u.fail("\"{s}\" command not found", .{args[0]});
57 fail("\"{s}\" command not found", .{args[0]});
6058 },
6159 else => |ee| return ee,
6260 };
src/util/index.zig deleted-1
......@@ -1 +0,0 @@
1pub usingnamespace @import("./funcs.zig");
src/util/modfile.zig+1-1
......@@ -3,7 +3,7 @@ const string = []const u8;
33const yaml = @import("yaml");
44
55const zigmod = @import("../lib.zig");
6const u = @import("index.zig");
6const u = @import("funcs.zig");
77
88//
99//
src/util/module.zig+1-1
......@@ -5,7 +5,7 @@ const yaml = @import("yaml");
55const extras = @import("extras");
66
77const zigmod = @import("../lib.zig");
8const u = @import("index.zig");
8const u = @import("funcs.zig");
99const common = @import("./../common.zig");
1010
1111//