Commit 9d8f82035e63c80ffadb7bd5fc47248783d29167 | zigmod

author	nmarks <36246800+nmarks413@users.noreply.github.com> 2025-05-04 13:27:54 -07:00
committer	GitHub <noreply@github.com> 2025-05-04 13:27:54 -07:00
log	9d8f82035e63c80ffadb7bd5fc47248783d29167
tree	8b57808c683b221aab4e23705eb01f4480f5eded
parent	ca1b3b29bd85ee6a6f57a024e11ccdc99b462372
signature	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");	...	@@ -5,7 +5,7 @@ const zfetch = @import("zfetch");
5	const extras = @import("extras");	5	const extras = @import("extras");
6	const json = @import("json");	6	const json = @import("json");
7		7
8	const u = @import("./../util/index.zig");	8	const u = @import("./../util/funcs.zig");
9		9
10	//	10	//
11	//	11	//

src/cmd/aquila/install.zig+1-1

...	@@ -5,7 +5,7 @@ const knownfolders = @import("known-folders");	...	@@ -5,7 +5,7 @@ const knownfolders = @import("known-folders");
5	const extras = @import("extras");	5	const extras = @import("extras");
6		6
7	const zigmod = @import("../../lib.zig");	7	const zigmod = @import("../../lib.zig");
8	const u = @import("./../../util/index.zig");	8	const u = @import("./../../util/funcs.zig");
9	const common = @import("./../../common.zig");	9	const common = @import("./../../common.zig");
10		10
11	pub fn execute(self_name: []const u8, args: [][]u8) !void {	11	pub 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");	...	@@ -5,7 +5,7 @@ const knownfolders = @import("known-folders");
5	const extras = @import("extras");	5	const extras = @import("extras");
6		6
7	const zigmod = @import("../../lib.zig");	7	const zigmod = @import("../../lib.zig");
8	const u = @import("./../../util/index.zig");	8	const u = @import("./../../util/funcs.zig");
9	const common = @import("./../../common.zig");	9	const common = @import("./../../common.zig");
10		10
11	pub fn execute(self_name: []const u8, args: [][]u8) !void {	11	pub fn execute(self_name: []const u8, args: [][]u8) !void {

src/cmd/ci.zig+1-1

...	@@ -2,7 +2,7 @@ const std = @import("std");	...	@@ -2,7 +2,7 @@ const std = @import("std");
2	const string = []const u8;	2	const string = []const u8;
3		3
4	const zigmod = @import("../lib.zig");	4	const zigmod = @import("../lib.zig");
5	const u = @import("./../util/index.zig");	5	const u = @import("./../util/funcs.zig");
6	const common = @import("./../common.zig");	6	const common = @import("./../common.zig");
7		7
8	// Inspired by:	8	// Inspired by:

src/cmd/fetch.zig+1-1

...	@@ -4,7 +4,7 @@ const ansi = @import("ansi");	...	@@ -4,7 +4,7 @@ const ansi = @import("ansi");
4	const extras = @import("extras");	4	const extras = @import("extras");
5		5
6	const zigmod = @import("../lib.zig");	6	const zigmod = @import("../lib.zig");
7	const u = @import("./../util/index.zig");	7	const u = @import("./../util/funcs.zig");
8	const common = @import("./../common.zig");	8	const common = @import("./../common.zig");
9	const license = @import("./license.zig");	9	const license = @import("./license.zig");
10		10

src/cmd/generate.zig+1-1

...	@@ -3,7 +3,7 @@ const string = []const u8;	...	@@ -3,7 +3,7 @@ const string = []const u8;
3	const extras = @import("extras");	3	const extras = @import("extras");
4		4
5	const zigmod = @import("../lib.zig");	5	const zigmod = @import("../lib.zig");
6	const u = @import("./../util/index.zig");	6	const u = @import("./../util/funcs.zig");
7	const common = @import("./../common.zig");	7	const common = @import("./../common.zig");
8		8
9	//	9	//

src/cmd/init.zig+1-1

...	@@ -8,7 +8,7 @@ const ini = @import("ini");	...	@@ -8,7 +8,7 @@ const ini = @import("ini");
8	const time = @import("time");	8	const time = @import("time");
9	const extras = @import("extras");	9	const extras = @import("extras");
10		10
11	const u = @import("./../util/index.zig");	11	const u = @import("./../util/funcs.zig");
12		12
13	//	13	//
14	//	14	//

src/cmd/license.zig+1-1

...	@@ -6,7 +6,7 @@ const licenses = @import("licenses");	...	@@ -6,7 +6,7 @@ const licenses = @import("licenses");
6	const extras = @import("extras");	6	const extras = @import("extras");
7		7
8	const zigmod = @import("../lib.zig");	8	const zigmod = @import("../lib.zig");
9	const u = @import("./../util/index.zig");	9	const u = @import("./../util/funcs.zig");
10	const common = @import("./../common.zig");	10	const common = @import("./../common.zig");
11		11
12	const List = std.ArrayList(zigmod.Module);	12	const List = std.ArrayList(zigmod.Module);

src/cmd/sum.zig+1-1

...	@@ -2,7 +2,7 @@ const std = @import("std");	...	@@ -2,7 +2,7 @@ const std = @import("std");
2	const gpa = std.heap.c_allocator;	2	const gpa = std.heap.c_allocator;
3		3
4	const zigmod = @import("../lib.zig");	4	const zigmod = @import("../lib.zig");
5	const u = @import("./../util/index.zig");	5	const u = @import("./../util/funcs.zig");
6	const common = @import("./../common.zig");	6	const common = @import("./../common.zig");
7		7
8	//	8	//

src/cmd/version.zig+1-1

...	@@ -2,7 +2,7 @@ const std = @import("std");	...	@@ -2,7 +2,7 @@ const std = @import("std");
2	const gpa = std.heap.c_allocator;	2	const gpa = std.heap.c_allocator;
3	const builtin = @import("builtin");	3	const builtin = @import("builtin");
4		4
5	const u = @import("./../util/index.zig");	5	const u = @import("./../util/funcs.zig");
6		6
7	//	7	//
8	//	8	//

src/cmd/zpm.zig+1-1

...	@@ -5,7 +5,7 @@ const zfetch = @import("zfetch");	...	@@ -5,7 +5,7 @@ const zfetch = @import("zfetch");
5	const extras = @import("extras");	5	const extras = @import("extras");
6	const json = @import("json");	6	const json = @import("json");
7		7
8	const u = @import("./../util/index.zig");	8	const u = @import("./../util/funcs.zig");
9		9
10	//	10	//
11	//	11	//

src/cmd/zpm/add.zig+1-1

...	@@ -4,7 +4,7 @@ const zfetch = @import("zfetch");	...	@@ -4,7 +4,7 @@ const zfetch = @import("zfetch");
4	const extras = @import("extras");	4	const extras = @import("extras");
5		5
6	const zigmod = @import("../../lib.zig");	6	const zigmod = @import("../../lib.zig");
7	const u = @import("./../../util/index.zig");	7	const u = @import("./../../util/funcs.zig");
8	const zpm = @import("./../zpm.zig");	8	const zpm = @import("./../zpm.zig");
9		9
10	//	10	//

src/common.zig+1-1

...	@@ -5,7 +5,7 @@ const ansi = @import("ansi");	...	@@ -5,7 +5,7 @@ const ansi = @import("ansi");
5	const extras = @import("extras");	5	const extras = @import("extras");
6		6
7	const zigmod = @import("./lib.zig");	7	const zigmod = @import("./lib.zig");
8	const u = @import("./util/index.zig");	8	const u = @import("./util/funcs.zig");
9		9
10	//	10	//
11	//	11	//

src/util/dep.zig+1-1

...	@@ -5,7 +5,7 @@ const yaml = @import("yaml");	...	@@ -5,7 +5,7 @@ const yaml = @import("yaml");
5	const extras = @import("extras");	5	const extras = @import("extras");
6		6
7	const zigmod = @import("../lib.zig");	7	const zigmod = @import("../lib.zig");
8	const u = @import("index.zig");	8	const u = @import("funcs.zig");
9		9
10	//	10	//
11	//	11	//

src/util/dep_type.zig+1-1

...	@@ -1,7 +1,7 @@	...	@@ -1,7 +1,7 @@
1	const std = @import("std");	1	const std = @import("std");
2	const string = []const u8;	2	const string = []const u8;
3		3
4	const u = @import("./index.zig");	4	const u = @import("./funcs.zig");
5		5
6	//	6	//
7	//	7	//

src/util/funcs.zig+1-3

...	@@ -4,8 +4,6 @@ const gpa = std.heap.c_allocator;	...	@@ -4,8 +4,6 @@ const gpa = std.heap.c_allocator;
4	const extras = @import("extras");	4	const extras = @import("extras");
5	const git = @import("git");	5	const git = @import("git");
6		6
7	const u = @import("index.zig");
8
9	//	7	//
10	//	8	//
11		9
...	@@ -56,7 +54,7 @@ pub fn file_list(alloc: std.mem.Allocator, dpath: string) ![]const string {	...	@@ -56,7 +54,7 @@ pub fn file_list(alloc: std.mem.Allocator, dpath: string) ![]const string {
56	pub fn run_cmd_raw(alloc: std.mem.Allocator, dir: ?string, args: []const string) !std.process.Child.RunResult {	54	pub fn run_cmd_raw(alloc: std.mem.Allocator, dir: ?string, args: []const string) !std.process.Child.RunResult {
57	return std.process.Child.run(.{ .allocator = alloc, .cwd = dir, .argv = args, .max_output_bytes = std.math.maxInt(usize) }) catch \|e\| switch (e) {	55	return std.process.Child.run(.{ .allocator = alloc, .cwd = dir, .argv = args, .max_output_bytes = std.math.maxInt(usize) }) catch \|e\| switch (e) {
58	error.FileNotFound => {	56	error.FileNotFound => {
59	u.fail("\"{s}\" command not found", .{args[0]});	57	fail("\"{s}\" command not found", .{args[0]});
60	},	58	},
61	else => \|ee\| return ee,	59	else => \|ee\| return ee,
62	};	60	};

src/util/index.zig deleted-1

...	@@ -1 +0,0 @@
1	pub usingnamespace @import("./funcs.zig");

src/util/modfile.zig+1-1

...	@@ -3,7 +3,7 @@ const string = []const u8;	...	@@ -3,7 +3,7 @@ const string = []const u8;
3	const yaml = @import("yaml");	3	const yaml = @import("yaml");
4		4
5	const zigmod = @import("../lib.zig");	5	const zigmod = @import("../lib.zig");
6	const u = @import("index.zig");	6	const u = @import("funcs.zig");
7		7
8	//	8	//
9	//	9	//

src/util/module.zig+1-1

...	@@ -5,7 +5,7 @@ const yaml = @import("yaml");	...	@@ -5,7 +5,7 @@ const yaml = @import("yaml");
5	const extras = @import("extras");	5	const extras = @import("extras");
6		6
7	const zigmod = @import("../lib.zig");	7	const zigmod = @import("../lib.zig");
8	const u = @import("index.zig");	8	const u = @import("funcs.zig");
9	const common = @import("./../common.zig");	9	const common = @import("./../common.zig");
10		10
11	//	11	//