Commit 871fced6184a0b08d52532c20554008e46b27834 | zigmod

author	Meghan Denny <hello@nektro.net> 2021-12-24 19:03:28 -08:00
committer	Meghan Denny <hello@nektro.net> 2021-12-24 19:03:28 -08:00
log	871fced6184a0b08d52532c20554008e46b27834
tree	faa45d25157a741a269f016cf97b540cc799e52d
parent	3963f4a00d3283500db05895bf3c9c1d52f16a8d

update to Zig 0.9.0

closes #40

14 files changed, 47 insertions(+), 47 deletions(-)

.circleci/config.yml+1-1

...	...	@@ -15,7 +15,7 @@ jobs:
15	15	- run: git submodule update --init --recursive
16	16
17	17	- run: apt -y install xz-utils jq
18		- run: ./download_zig.sh 0.9.0-dev.1815+20e19e75f
	18	- run: ./download_zig.sh 0.9.0
19	19	- run: zig version
20	20	- run: zig env
21	21	- run: zig build -Dbootstrap

.github/workflows/nightly.yml+1-1

...	...	@@ -28,7 +28,7 @@ jobs:
28	28	- name: Setup Zig
29	29	uses: goto-bus-stop/setup-zig@v1
30	30	with:
31		version: 0.9.0-dev.1815+20e19e75f
	31	version: "0.9.0"
32	32
33	33	- run: zig version
34	34	- run: zig env

README.md+1-1

...	...	@@ -17,7 +17,7 @@ A package manager for the Zig programming language.
17	17	- https://github.com/nektro/zigmod/releases
18	18
19	19	## Built With
20		- Zig master `0.9.0-dev.1524+d2f9646d9`
	20	- Zig master `0.9.0`
21	21	- See [`zig.mod`](./zig.mod)
22	22
23	23	### Build from Source

docs/README.md+1-1

...	...	@@ -10,7 +10,7 @@ The rest of this documentation will assume you already have Zig installed.
10	10
11	11	As Zig is still in development itself, if you plan to contribute to Zigmod you will need a master download of Zig. Those can be obtained from https://ziglang.org/download/#release-master.
12	12
13		The earliest Zig release this Zigmod was verified to work with is `0.9.0-dev.1524+d2f9646d9`.
	13	The earliest Zig release this Zigmod was verified to work with is `0.9.0`.
14	14
15	15	## Download
16	16	You may download a precompiled binary from https://github.com/nektro/zigmod/releases or build the project from source.

src/cmd/aq.zig+1-1

...	...	@@ -20,7 +20,7 @@ pub const server_root = "https://aquila.red";
20	20
21	21	pub fn execute(args: [][]u8) !void {
22	22	if (args.len == 0) {
23		std.debug.warn("{s}\n", .{
	23	std.debug.print("{s}\n", .{
24	24	\\This is a subcommand for use with https://github.com/nektro/aquila instances but has no default behavior on its own aside from showing you this nice help text.
25	25	\\
26	26	\\The default remote is https://aquila.red.

src/cmd/zpm.zig+1-1

...	...	@@ -30,7 +30,7 @@ pub const Package = struct {
30	30
31	31	pub fn execute(args: [][]u8) !void {
32	32	if (args.len == 0) {
33		std.debug.warn("{s}\n", .{
	33	std.debug.print("{s}\n", .{
34	34	\\This is a subcommand for use with https://github.com/zigtools/zpm-server instances but has no default behavior on its own aside from showing you this nice help text.
35	35	\\
36	36	\\The default remote is https://zpm.random-projects.net/.

src/common.zig+4-4

...	...	@@ -19,7 +19,7 @@ pub const CollectOptions = struct {
19	19	log: bool,
20	20	update: bool,
21	21	lock: ?[]const [4]string = null,
22		alloc: *std.mem.Allocator,
	22	alloc: std.mem.Allocator,
23	23	already_fetched: *std.ArrayList(string) = undefined,
24	24
25	25	pub fn init(self: *CollectOptions) !void {
...	...	@@ -286,7 +286,7 @@ pub fn get_module_from_dep(d: zigmod.Dep, cachepath: string, options: CollectO
286	286	}
287	287	}
288	288
289		pub fn add_files_package(alloc: *std.mem.Allocator, cachepath: string, pkg_name: string, mdir: std.fs.Dir, dirs: []const string) !zigmod.Module {
	289	pub fn add_files_package(alloc: std.mem.Allocator, cachepath: string, pkg_name: string, mdir: std.fs.Dir, dirs: []const string) !zigmod.Module {
290	290	const fname = try std.mem.join(alloc, "", &.{ pkg_name, ".zig" });
291	291
292	292	const map = &std.StringHashMap(string).init(alloc);
...	...	@@ -300,7 +300,7 @@ pub fn add_files_package(alloc: *std.mem.Allocator, cachepath: string, pkg_name:
300	300	if (p.kind == .Directory) {
301	301	continue;
302	302	}
303		const path = try std.mem.dupe(alloc, u8, p.path);
	303	const path = try alloc.dupe(u8, p.path);
304	304	try map.put(path, try std.fmt.allocPrint(alloc, "{s}/{s}", .{ dir_path, path }));
305	305	}
306	306	}
...	...	@@ -350,7 +350,7 @@ pub fn add_files_package(alloc: *std.mem.Allocator, cachepath: string, pkg_name:
350	350	return (try get_module_from_dep(&d, filesdestpath, &options)).?;
351	351	}
352	352
353		pub fn parse_lockfile(alloc: *std.mem.Allocator, dir: std.fs.Dir) ![]const [4]string {
	353	pub fn parse_lockfile(alloc: std.mem.Allocator, dir: std.fs.Dir) ![]const [4]string {
354	354	var list = std.ArrayList([4]string).init(alloc);
355	355	const max = std.math.maxInt(usize);
356	356	const f = try dir.openFile("zigmod.lock", .{});

src/util/dep.zig+1-1

...	...	@@ -12,7 +12,7 @@ const yaml = @import("./yaml.zig");
12	12	pub const Dep = struct {
13	13	const Self = @This();
14	14
15		alloc: *std.mem.Allocator,
	15	alloc: std.mem.Allocator,
16	16	type: zigmod.DepType,
17	17	path: string,
18	18	id: string,

src/util/dep_type.zig+3-3

...	...	@@ -32,7 +32,7 @@ pub const DepType = enum {
32	32	// hypercore, // https://hypercore-protocol.org/
33	33
34	34	// zig fmt: on
35		pub fn pull(self: DepType, alloc: *std.mem.Allocator, rpath: string, dpath: string) !void {
	35	pub fn pull(self: DepType, alloc: std.mem.Allocator, rpath: string, dpath: string) !void {
36	36	switch (self) {
37	37	.local => {},
38	38	.system_lib => {},
...	...	@@ -57,7 +57,7 @@ pub const DepType = enum {
57	57	}
58	58
59	59	// zig fmt: on
60		pub fn update(self: DepType, alloc: *std.mem.Allocator, dpath: string, rpath: string) !void {
	60	pub fn update(self: DepType, alloc: std.mem.Allocator, dpath: string, rpath: string) !void {
61	61	_ = rpath;
62	62
63	63	switch (self) {
...	...	@@ -77,7 +77,7 @@ pub const DepType = enum {
77	77	}
78	78
79	79	// zig fmt: on
80		pub fn exact_version(self: DepType, alloc: *std.mem.Allocator, mpath: string) !string {
	80	pub fn exact_version(self: DepType, alloc: std.mem.Allocator, mpath: string) !string {
81	81	var mdir = try std.fs.cwd().openDir(mpath, .{});
82	82	defer mdir.close();
83	83	return switch (self) {

src/util/funcs.zig+11-11

...	...	@@ -37,7 +37,7 @@ pub fn try_index(comptime T: type, array: []T, n: usize, def: T) T {
37	37	return array[n];
38	38	}
39	39
40		pub fn split(alloc: *std.mem.Allocator, in: string, delim: string) ![]string {
	40	pub fn split(alloc: std.mem.Allocator, in: string, delim: string) ![]string {
41	41	var list = std.ArrayList(string).init(alloc);
42	42	defer list.deinit();
43	43
...	...	@@ -113,7 +113,7 @@ pub fn list_contains_gen(comptime T: type, haystack: []const T, needle: T) bool
113	113	return false;
114	114	}
115	115
116		pub fn file_list(alloc: *std.mem.Allocator, dpath: string) ![]const string {
	116	pub fn file_list(alloc: std.mem.Allocator, dpath: string) ![]const string {
117	117	var list = std.ArrayList(string).init(alloc);
118	118	defer list.deinit();
119	119
...	...	@@ -133,7 +133,7 @@ pub fn file_list(alloc: *std.mem.Allocator, dpath: string) ![]const string {
133	133	return list.toOwnedSlice();
134	134	}
135	135
136		pub fn run_cmd_raw(alloc: *std.mem.Allocator, dir: ?string, args: []const string) !std.ChildProcess.ExecResult {
	136	pub fn run_cmd_raw(alloc: std.mem.Allocator, dir: ?string, args: []const string) !std.ChildProcess.ExecResult {
137	137	return std.ChildProcess.exec(.{ .allocator = alloc, .cwd = dir, .argv = args, .max_output_bytes = std.math.maxInt(usize) }) catch \|e\| switch (e) {
138	138	error.FileNotFound => {
139	139	u.fail("\"{s}\" command not found", .{args[0]});
...	...	@@ -142,14 +142,14 @@ pub fn run_cmd_raw(alloc: *std.mem.Allocator, dir: ?string, args: []const string
142	142	};
143	143	}
144	144
145		pub fn run_cmd(alloc: *std.mem.Allocator, dir: ?string, args: []const string) !u32 {
	145	pub fn run_cmd(alloc: std.mem.Allocator, dir: ?string, args: []const string) !u32 {
146	146	const result = try run_cmd_raw(alloc, dir, args);
147	147	alloc.free(result.stdout);
148	148	alloc.free(result.stderr);
149	149	return result.term.Exited;
150	150	}
151	151
152		pub fn list_remove(alloc: *std.mem.Allocator, input: []string, search: string) ![]string {
	152	pub fn list_remove(alloc: std.mem.Allocator, input: []string, search: string) ![]string {
153	153	var list = std.ArrayList(string).init(alloc);
154	154	defer list.deinit();
155	155	for (input) \|item\| {
...	...	@@ -169,7 +169,7 @@ pub fn last(in: []string) !string {
169	169
170	170	const alphabet = "0123456789abcdefghijklmnopqrstuvwxyz";
171	171
172		pub fn random_string(alloc: *std.mem.Allocator, len: usize) !string {
	172	pub fn random_string(alloc: std.mem.Allocator, len: usize) !string {
173	173	const now = @intCast(u64, std.time.nanoTimestamp());
174	174	var rand = std.rand.DefaultPrng.init(now);
175	175	const r = &rand.random();
...	...	@@ -206,7 +206,7 @@ pub const HashFn = enum {
206	206	sha512,
207	207	};
208	208
209		pub fn validate_hash(alloc: *std.mem.Allocator, input: string, file_path: string) !bool {
	209	pub fn validate_hash(alloc: std.mem.Allocator, input: string, file_path: string) !bool {
210	210	const hash = parse_split(HashFn, "-").do(input) catch return false;
211	211	const file = try std.fs.cwd().openFile(file_path, .{});
212	212	defer file.close();
...	...	@@ -224,7 +224,7 @@ pub fn validate_hash(alloc: *std.mem.Allocator, input: string, file_path: string
224	224	return result;
225	225	}
226	226
227		pub fn do_hash(alloc: *std.mem.Allocator, comptime algo: type, data: string) !string {
	227	pub fn do_hash(alloc: std.mem.Allocator, comptime algo: type, data: string) !string {
228	228	const h = &algo.init(.{});
229	229	var out: [algo.digest_length]u8 = undefined;
230	230	h.update(data);
...	...	@@ -234,7 +234,7 @@ pub fn do_hash(alloc: *std.mem.Allocator, comptime algo: type, data: string) !st
234	234	}
235	235
236	236	/// Returns the result of running `git rev-parse HEAD`
237		pub fn git_rev_HEAD(alloc: *std.mem.Allocator, dir: std.fs.Dir) !string {
	237	pub fn git_rev_HEAD(alloc: std.mem.Allocator, dir: std.fs.Dir) !string {
238	238	const max = std.math.maxInt(usize);
239	239	const dirg = try dir.openDir(".git", .{});
240	240	const h = std.mem.trim(u8, try dirg.readFileAlloc(alloc, "HEAD", max), "\n");
...	...	@@ -248,7 +248,7 @@ pub fn slice(comptime T: type, input: []const T, from: usize, to: usize) []const
248	248	return input[f..t];
249	249	}
250	250
251		pub fn detect_pkgname(alloc: *std.mem.Allocator, override: string, dir: string) !string {
	251	pub fn detect_pkgname(alloc: std.mem.Allocator, override: string, dir: string) !string {
252	252	if (override.len > 0) {
253	253	return override;
254	254	}
...	...	@@ -264,7 +264,7 @@ pub fn detect_pkgname(alloc: *std.mem.Allocator, override: string, dir: string)
264	264	return name;
265	265	}
266	266
267		pub fn detct_mainfile(alloc: *std.mem.Allocator, override: string, dir: ?std.fs.Dir, name: string) !string {
	267	pub fn detct_mainfile(alloc: std.mem.Allocator, override: string, dir: ?std.fs.Dir, name: string) !string {
268	268	if (override.len > 0) {
269	269	if (try does_file_exist(dir, override)) {
270	270	if (std.mem.endsWith(u8, override, ".zig")) {

src/util/modfile.zig+4-4

...	...	@@ -28,7 +28,7 @@ pub const ModFile = struct {
28	28	rootdeps: []zigmod.Dep,
29	29	builddeps: []zigmod.Dep,
30	30
31		pub fn init(alloc: *std.mem.Allocator, mpath: string) !Self {
	31	pub fn init(alloc: std.mem.Allocator, mpath: string) !Self {
32	32	const file = try std.fs.cwd().openFile(mpath, .{});
33	33	defer file.close();
34	34	const input = try file.reader().readAllAlloc(alloc, mb);
...	...	@@ -36,7 +36,7 @@ pub const ModFile = struct {
36	36	return from_mapping(alloc, doc.mapping);
37	37	}
38	38
39		pub fn from_dir(alloc: *std.mem.Allocator, dir: std.fs.Dir) !Self {
	39	pub fn from_dir(alloc: std.mem.Allocator, dir: std.fs.Dir) !Self {
40	40	const file = try dir.openFile("zig.mod", .{});
41	41	defer file.close();
42	42	const input = try file.reader().readAllAlloc(alloc, mb);
...	...	@@ -44,7 +44,7 @@ pub const ModFile = struct {
44	44	return from_mapping(alloc, doc.mapping);
45	45	}
46	46
47		pub fn from_mapping(alloc: *std.mem.Allocator, mapping: yaml.Mapping) !Self {
	47	pub fn from_mapping(alloc: std.mem.Allocator, mapping: yaml.Mapping) !Self {
48	48	const id = mapping.get_string("id");
49	49	const name = mapping.get("name").?.string;
50	50	const main = mapping.get_string("main");
...	...	@@ -69,7 +69,7 @@ pub const ModFile = struct {
69	69	};
70	70	}
71	71
72		fn dep_list_by_name(alloc: *std.mem.Allocator, mapping: yaml.Mapping, props: []const string, for_build: bool) anyerror![]zigmod.Dep {
	72	fn dep_list_by_name(alloc: std.mem.Allocator, mapping: yaml.Mapping, props: []const string, for_build: bool) anyerror![]zigmod.Dep {
73	73	var dep_list = std.ArrayList(zigmod.Dep).init(alloc);
74	74	defer dep_list.deinit();
75	75

src/util/module.zig+2-2

...	...	@@ -11,7 +11,7 @@ const common = @import("./../common.zig");
11	11	//
12	12
13	13	pub const Module = struct {
14		alloc: *std.mem.Allocator,
	14	alloc: std.mem.Allocator,
15	15	is_sys_lib: bool,
16	16	id: string,
17	17	name: string,
...	...	@@ -27,7 +27,7 @@ pub const Module = struct {
27	27	dep: ?zigmod.Dep,
28	28	for_build: bool = false,
29	29
30		pub fn from(alloc: std.mem.Allocator, dep: zigmod.Dep, modpath: string, options: common.CollectOptions) !Module {
	30	pub fn from(alloc: std.mem.Allocator, dep: zigmod.Dep, modpath: string, options: *common.CollectOptions) !Module {
31	31	var moddeps = std.ArrayList(Module).init(alloc);
32	32	defer moddeps.deinit();
33	33

src/util/yaml.zig+3-3

...	...	@@ -110,7 +110,7 @@ pub const Mapping = struct {
110	110	return if (self.get(k)) \|v\| v.string else "";
111	111	}
112	112
113		pub fn get_string_array(self: Mapping, alloc: *std.mem.Allocator, k: string) ![]string {
	113	pub fn get_string_array(self: Mapping, alloc: std.mem.Allocator, k: string) ![]string {
114	114	var list = std.ArrayList(string).init(alloc);
115	115	defer list.deinit();
116	116	if (self.get(k)) \|val\| {
...	...	@@ -145,7 +145,7 @@ pub const TokenList = []const Token;
145	145	//
146	146	//
147	147
148		pub fn parse(alloc: *std.mem.Allocator, input: string) !Document {
	148	pub fn parse(alloc: std.mem.Allocator, input: string) !Document {
149	149	var parser: c.yaml_parser_t = undefined;
150	150	_ = c.yaml_parser_initialize(&parser);
151	151	defer c.yaml_parser_delete(&parser);
...	...	@@ -182,7 +182,7 @@ pub fn parse(alloc: *std.mem.Allocator, input: string) !Document {
182	182	}
183	183
184	184	pub const Parser = struct {
185		alloc: *std.mem.Allocator,
	185	alloc: std.mem.Allocator,
186	186	tokens: TokenList,
187	187	lines: []const string,
188	188	index: usize,

zigmod.lock+13-13

...	...	@@ -1,20 +1,20 @@
1	1	2
2	2	git https://github.com/yaml/libyaml tag-0.2.5
3		git https://github.com/nektro/iguanaTLS commit-a48976beb7135b472ce8aa2f276df3b8eb775440
	3	git https://github.com/nektro/iguanaTLS commit-d49c382a52c2c10dee940d22c3e0a034d0cbac5a
4	4	git https://github.com/nektro/zig-ansi commit-d4a53bcac5b87abecc65491109ec22aaf5f3dc2f
5		git https://github.com/ziglibs/known-folders commit-f299244d787a02dd49bc8b10b8c2722a13655c48
	5	git https://github.com/ziglibs/known-folders commit-9db1b99219c767d5e24994b1525273fe4031e464
6	6	git https://github.com/nektro/zig-licenses commit-c9b8cbf3565675a056ad4e9b57cb4f84020e7680
7		git https://github.com/truemedian/zfetch commit-77fdd34e90db02f1224cdc7e5231ecd004ff1200
8		git https://github.com/truemedian/hzzp commit-91ab8e741992e8db30b3ee1cd9e7cd5a072ca294
9		git https://github.com/MasterQ32/zig-network commit-7b0be9a4cde7169531872ee1ca6a75ad3f15cc7c
10		git https://github.com/MasterQ32/zig-uri commit-52cdd2061bec0579519f0d30280597f3a1db8b75
11		git https://github.com/nektro/zig-json commit-7f0e661371d41cfdc8b1649ed00e7a750c82e57a
12		git https://github.com/nektro/zig-extras commit-090ee5f1834af4ed7714101b24d7daec84572390
	7	git https://github.com/truemedian/zfetch commit-d7c0424d4251f23c9e3f87878e4d8687128a5d13
	8	git https://github.com/truemedian/hzzp commit-bf5aaf224e94561e035a631c3c40fbf02faa27d2
	9	git https://github.com/MasterQ32/zig-network commit-b9c52822f3bb3ce25164a2f1f6eedee4d1c0a279
	10	git https://github.com/MasterQ32/zig-uri commit-01155026c8362bb75dcab10bafc31abff0c8bac4
	11	git https://github.com/nektro/zig-json commit-908ecfa6d611f3ee0d9d89434e7494a653cfd5e1
	12	git https://github.com/nektro/zig-extras commit-3db31a0787846ce5b3133fe02f9cbcaa815ae80b
13	13	git https://github.com/nektro/zig-range commit-890ca308fe09b3d5c866d5cfb3b3d7a95dbf939f
14		git https://github.com/nektro/zig-detect-license commit-d4544410f811c402b866f21f63588d1aae1b2d90
	14	git https://github.com/nektro/zig-detect-license commit-fe045f9399c532d01ff87d956d8387017636f675
15	15	git https://github.com/nektro/zig-licenses-text commit-3c07c6e4eb0965dafd0b029c632f823631b3169c
16		git https://github.com/nektro/zig-leven commit-8e9f827117ab1418578b692a2325754cc3ee692d
	16	git https://github.com/nektro/zig-leven commit-ab852cf74fa0b4edc530d925f0654b62c60365bf
17	17	git https://github.com/nektro/zig-fs-check commit-dcd8da90fcb8bf3c9887e713bf0ec072bc897dd5
18		git https://github.com/nektro/zig-inquirer commit-9a068122c59ac2785f330c37bf4412aed644ed37
19		git https://github.com/arqv/ini commit-0880475514e8b73dee515843cb4db3ee663174e8
20		git https://github.com/marlersoft/zigwin32 commit-7685bb92610ba4f34e0077eb2b6263fa6f1f36c5
	18	git https://github.com/nektro/zig-inquirer commit-14c3492c46f9765c3e77436741794d1a3118cbee
	19	git https://github.com/arqv/ini commit-b93f5b5ff9449f9af68ae3081f6a5e858b6698d9
	20	git https://github.com/marlersoft/zigwin32 commit-a74c9dae6a1ccd361eb9a1d146a09c08d22f02b0