From 9d8f82035e63c80ffadb7bd5fc47248783d29167 Mon Sep 17 00:00:00 2001
From: nmarks <36246800+nmarks413@users.noreply.github.com>
Date: Sun, 4 May 2025 13:27:54 -0700
Subject: [PATCH] remove weird redundancy in utils/funcs.zig (#111) [skip ci]

* remove weird redundancy

* renamed all references of index.zig to funcs.zig
---
 src/cmd/aq.zig             | 2 +-
 src/cmd/aquila/install.zig | 2 +-
 src/cmd/aquila/update.zig  | 2 +-
 src/cmd/ci.zig             | 2 +-
 src/cmd/fetch.zig          | 2 +-
 src/cmd/generate.zig       | 2 +-
 src/cmd/init.zig           | 2 +-
 src/cmd/license.zig        | 2 +-
 src/cmd/sum.zig            | 2 +-
 src/cmd/version.zig        | 2 +-
 src/cmd/zpm.zig            | 2 +-
 src/cmd/zpm/add.zig        | 2 +-
 src/common.zig             | 2 +-
 src/util/dep.zig           | 2 +-
 src/util/dep_type.zig      | 2 +-
 src/util/funcs.zig         | 4 +---
 src/util/index.zig         | 1 -
 src/util/modfile.zig       | 2 +-
 src/util/module.zig        | 2 +-
 19 files changed, 18 insertions(+), 21 deletions(-)
 delete mode 100644 src/util/index.zig

diff --git a/src/cmd/aq.zig b/src/cmd/aq.zig
index d77326e411939baa36ed94f6fcd0833b4acfaf21..7bb7b38e56965d7a86dd27dd6db61dc6a037f472 100644
--- a/src/cmd/aq.zig
+++ b/src/cmd/aq.zig
@@ -5,7 +5,7 @@ const zfetch = @import("zfetch");
 const extras = @import("extras");
 const json = @import("json");
 
-const u = @import("./../util/index.zig");
+const u = @import("./../util/funcs.zig");
 
 //
 //
diff --git a/src/cmd/aquila/install.zig b/src/cmd/aquila/install.zig
index b5b27c5c73538799f1390511170dfae1836103f8..e37f3ce6aa03098cd4c18ecacd7d2a5bde94cbe2 100644
--- a/src/cmd/aquila/install.zig
+++ b/src/cmd/aquila/install.zig
@@ -5,7 +5,7 @@ const knownfolders = @import("known-folders");
 const extras = @import("extras");
 
 const zigmod = @import("../../lib.zig");
-const u = @import("./../../util/index.zig");
+const u = @import("./../../util/funcs.zig");
 const common = @import("./../../common.zig");
 
 pub fn execute(self_name: []const u8, args: [][]u8) !void {
diff --git a/src/cmd/aquila/update.zig b/src/cmd/aquila/update.zig
index a989eda571aff084c4323fe9665d487b29dc3061..cc66f89b063b682029c33071dd027f4671b3082e 100644
--- a/src/cmd/aquila/update.zig
+++ b/src/cmd/aquila/update.zig
@@ -5,7 +5,7 @@ const knownfolders = @import("known-folders");
 const extras = @import("extras");
 
 const zigmod = @import("../../lib.zig");
-const u = @import("./../../util/index.zig");
+const u = @import("./../../util/funcs.zig");
 const common = @import("./../../common.zig");
 
 pub fn execute(self_name: []const u8, args: [][]u8) !void {
diff --git a/src/cmd/ci.zig b/src/cmd/ci.zig
index 49979be23481205d03457a272ad6aaf7e07769ca..75d070a9ad7176cc9233c687ab6da511a03c31ab 100644
--- a/src/cmd/ci.zig
+++ b/src/cmd/ci.zig
@@ -2,7 +2,7 @@ const std = @import("std");
 const string = []const u8;
 
 const zigmod = @import("../lib.zig");
-const u = @import("./../util/index.zig");
+const u = @import("./../util/funcs.zig");
 const common = @import("./../common.zig");
 
 // Inspired by:
diff --git a/src/cmd/fetch.zig b/src/cmd/fetch.zig
index 7bdc9e053eee171257608f85c42097b629d08e94..6289ba0fb98a0ff3c84201d59095141796113dd5 100644
--- a/src/cmd/fetch.zig
+++ b/src/cmd/fetch.zig
@@ -4,7 +4,7 @@ const ansi = @import("ansi");
 const extras = @import("extras");
 
 const zigmod = @import("../lib.zig");
-const u = @import("./../util/index.zig");
+const u = @import("./../util/funcs.zig");
 const common = @import("./../common.zig");
 const license = @import("./license.zig");
 
diff --git a/src/cmd/generate.zig b/src/cmd/generate.zig
index 5cc18b342f745106f3c05bbc658119c0c8d61432..7a495e3678121af61ca09e2c52f1a70879c2379a 100644
--- a/src/cmd/generate.zig
+++ b/src/cmd/generate.zig
@@ -3,7 +3,7 @@ const string = []const u8;
 const extras = @import("extras");
 
 const zigmod = @import("../lib.zig");
-const u = @import("./../util/index.zig");
+const u = @import("./../util/funcs.zig");
 const common = @import("./../common.zig");
 
 //
diff --git a/src/cmd/init.zig b/src/cmd/init.zig
index 9b262bbe0327ac347d8550f46f8ec5e3aca14bc1..c6559c5095fb223e1b04e34ca6cf5d0021fc84cd 100644
--- a/src/cmd/init.zig
+++ b/src/cmd/init.zig
@@ -8,7 +8,7 @@ const ini = @import("ini");
 const time = @import("time");
 const extras = @import("extras");
 
-const u = @import("./../util/index.zig");
+const u = @import("./../util/funcs.zig");
 
 //
 //
diff --git a/src/cmd/license.zig b/src/cmd/license.zig
index 9ba4d58b39bafb40977a6ef7b04a5a11f3dd5a05..5361afe41ff83662c02478b21b444e88e0c4ff42 100644
--- a/src/cmd/license.zig
+++ b/src/cmd/license.zig
@@ -6,7 +6,7 @@ const licenses = @import("licenses");
 const extras = @import("extras");
 
 const zigmod = @import("../lib.zig");
-const u = @import("./../util/index.zig");
+const u = @import("./../util/funcs.zig");
 const common = @import("./../common.zig");
 
 const List = std.ArrayList(zigmod.Module);
diff --git a/src/cmd/sum.zig b/src/cmd/sum.zig
index da91051c127e5fd0bdf61c983867a789d9a47397..301c7ce9579055e2eaa34e26540ffe75e9d98533 100644
--- a/src/cmd/sum.zig
+++ b/src/cmd/sum.zig
@@ -2,7 +2,7 @@ const std = @import("std");
 const gpa = std.heap.c_allocator;
 
 const zigmod = @import("../lib.zig");
-const u = @import("./../util/index.zig");
+const u = @import("./../util/funcs.zig");
 const common = @import("./../common.zig");
 
 //
diff --git a/src/cmd/version.zig b/src/cmd/version.zig
index 4fb8d88b42058038d6b88d14dcd5036fc5027641..a262f2115ec234dd53cdc46aaf214a36867b90e6 100644
--- a/src/cmd/version.zig
+++ b/src/cmd/version.zig
@@ -2,7 +2,7 @@ const std = @import("std");
 const gpa = std.heap.c_allocator;
 const builtin = @import("builtin");
 
-const u = @import("./../util/index.zig");
+const u = @import("./../util/funcs.zig");
 
 //
 //
diff --git a/src/cmd/zpm.zig b/src/cmd/zpm.zig
index bdbabf9a40e71ef029dccffa3fd1be560b3e0988..071be0b7e88b80acecf9c278e7cc9ab664cf41d3 100644
--- a/src/cmd/zpm.zig
+++ b/src/cmd/zpm.zig
@@ -5,7 +5,7 @@ const zfetch = @import("zfetch");
 const extras = @import("extras");
 const json = @import("json");
 
-const u = @import("./../util/index.zig");
+const u = @import("./../util/funcs.zig");
 
 //
 //
diff --git a/src/cmd/zpm/add.zig b/src/cmd/zpm/add.zig
index b787517fddbebe80ec3388df68fd074a8f5debda..4bee8c58b47bebbcb17d0ba9150e54587a207c57 100644
--- a/src/cmd/zpm/add.zig
+++ b/src/cmd/zpm/add.zig
@@ -4,7 +4,7 @@ const zfetch = @import("zfetch");
 const extras = @import("extras");
 
 const zigmod = @import("../../lib.zig");
-const u = @import("./../../util/index.zig");
+const u = @import("./../../util/funcs.zig");
 const zpm = @import("./../zpm.zig");
 
 //
diff --git a/src/common.zig b/src/common.zig
index 5d83eb0106a8de4c7bacbb663a86c185f3d98e15..613f50c40f677d77cd2009aeac30741597f9afde 100644
--- a/src/common.zig
+++ b/src/common.zig
@@ -5,7 +5,7 @@ const ansi = @import("ansi");
 const extras = @import("extras");
 
 const zigmod = @import("./lib.zig");
-const u = @import("./util/index.zig");
+const u = @import("./util/funcs.zig");
 
 //
 //
diff --git a/src/util/dep.zig b/src/util/dep.zig
index bc5ce4aa05fe414f2582c3d3fda603ae16790379..58412a78f59be3e09b538903a1e94b2be4900f68 100644
--- a/src/util/dep.zig
+++ b/src/util/dep.zig
@@ -5,7 +5,7 @@ const yaml = @import("yaml");
 const extras = @import("extras");
 
 const zigmod = @import("../lib.zig");
-const u = @import("index.zig");
+const u = @import("funcs.zig");
 
 //
 //
diff --git a/src/util/dep_type.zig b/src/util/dep_type.zig
index 865b826028abbcb6175d6a050892da786115389a..1e822042af8efbccb0aa8ec9133c862ecacb3787 100644
--- a/src/util/dep_type.zig
+++ b/src/util/dep_type.zig
@@ -1,7 +1,7 @@
 const std = @import("std");
 const string = []const u8;
 
-const u = @import("./index.zig");
+const u = @import("./funcs.zig");
 
 //
 //
diff --git a/src/util/funcs.zig b/src/util/funcs.zig
index a483131671e3d58e87bd5bf831f333f7ba84fedf..7ca645c1621450707bdda81f7e5f95fdec20d3a6 100644
--- a/src/util/funcs.zig
+++ b/src/util/funcs.zig
@@ -4,8 +4,6 @@ const gpa = std.heap.c_allocator;
 const extras = @import("extras");
 const git = @import("git");
 
-const u = @import("index.zig");
-
 //
 //
 
@@ -56,7 +54,7 @@ pub fn file_list(alloc: std.mem.Allocator, dpath: string) ![]const string {
 pub fn run_cmd_raw(alloc: std.mem.Allocator, dir: ?string, args: []const string) !std.process.Child.RunResult {
     return std.process.Child.run(.{ .allocator = alloc, .cwd = dir, .argv = args, .max_output_bytes = std.math.maxInt(usize) }) catch |e| switch (e) {
         error.FileNotFound => {
-            u.fail("\"{s}\" command not found", .{args[0]});
+            fail("\"{s}\" command not found", .{args[0]});
         },
         else => |ee| return ee,
     };
diff --git a/src/util/index.zig b/src/util/index.zig
deleted file mode 100644
index 8766d2722ddde05712eef274d5df38ba8bca514e..0000000000000000000000000000000000000000
--- a/src/util/index.zig
+++ /dev/null
@@ -1 +0,0 @@
-pub usingnamespace @import("./funcs.zig");
diff --git a/src/util/modfile.zig b/src/util/modfile.zig
index e381fbbea2a2c4ce1e9f293ef38740c1b1e5b4a3..923686f4e573fe97490def2e528d03fc24798aa6 100644
--- a/src/util/modfile.zig
+++ b/src/util/modfile.zig
@@ -3,7 +3,7 @@ const string = []const u8;
 const yaml = @import("yaml");
 
 const zigmod = @import("../lib.zig");
-const u = @import("index.zig");
+const u = @import("funcs.zig");
 
 //
 //
diff --git a/src/util/module.zig b/src/util/module.zig
index 61a7872fdd2b76ff8cadeffa3b1fe2afbd39bd9d..dcc4084878ac27f740cd7d1e6d5c75f03a454f7f 100644
--- a/src/util/module.zig
+++ b/src/util/module.zig
@@ -5,7 +5,7 @@ const yaml = @import("yaml");
 const extras = @import("extras");
 
 const zigmod = @import("../lib.zig");
-const u = @import("index.zig");
+const u = @import("funcs.zig");
 const common = @import("./../common.zig");
 
 //
-- 
2.54.0