Commit e970ba3719c15792529200a1df3d64277b343687 | zigmod

author	Meghan Denny <hello@nektro.net> 2021-08-14 00:56:14 -07:00
committer	Meghan Denny <hello@nektro.net> 2021-08-14 00:56:14 -07:00
log	e970ba3719c15792529200a1df3d64277b343687
tree	7be4a7ed4e60481e24bd6fbe059f531c01996a5b
parent	0ee7496fe5f5f05afbb00349d8cbc23c37b0a167

fix usage of std.ArrayList

9 files changed, 29 insertions(+), 29 deletions(-)

src/cmd/fetch.zig+9-9

...	...	@@ -26,14 +26,14 @@ pub fn execute(args: [][]u8) !void {
26	26	};
27	27	const top_module = try common.collect_deps_deep(dir, "zig.mod", &options);
28	28
29		const list = &std.ArrayList(u.Module).init(gpa);
30		try common.collect_pkgs(top_module, list);
	29	var list = std.ArrayList(u.Module).init(gpa);
	30	try common.collect_pkgs(top_module, &list);
31	31
32		try create_depszig(dir, top_module, list);
	32	try create_depszig(dir, top_module, &list);
33	33
34	34	if (bootstrap) return;
35	35
36		try create_lockfile(list, dir);
	36	try create_lockfile(&list, dir);
37	37
38	38	try diff_lockfile();
39	39	}
...	...	@@ -92,14 +92,14 @@ pub fn create_depszig(dir: string, top_module: u.Module, list: *std.ArrayList(u.
92	92	try w.writeAll("};\n\n");
93	93
94	94	try w.writeAll("pub const package_data = struct {\n");
95		const duped = &std.ArrayList(u.Module).init(gpa);
	95	var duped = std.ArrayList(u.Module).init(gpa);
96	96	for (list.items) \|mod\| {
97	97	if (mod.is_sys_lib) {
98	98	continue;
99	99	}
100	100	try duped.append(mod);
101	101	}
102		try print_pkg_data_to(w, duped, &std.ArrayList(u.Module).init(gpa));
	102	try print_pkg_data_to(w, &duped, &std.ArrayList(u.Module).init(gpa));
103	103	try w.writeAll("};\n\n");
104	104
105	105	try w.writeAll("pub const packages = ");
...	...	@@ -149,15 +149,15 @@ fn diff_lockfile() !void {
149	149	if (std.mem.startsWith(u8, line, "@@")) break;
150	150	}
151	151
152		const rems = &std.ArrayList(string).init(gpa);
153		const adds = &std.ArrayList(string).init(gpa);
	152	var rems = std.ArrayList(string).init(gpa);
	153	var adds = std.ArrayList(string).init(gpa);
154	154	while (try r.readUntilDelimiterOrEofAlloc(gpa, '\n', max)) \|line\| {
155	155	if (line[0] == ' ') continue;
156	156	if (line[0] == '-') try rems.append(line[1..]);
157	157	if (line[0] == '+') if (line[1] == '2') continue else try adds.append(line[1..]);
158	158	}
159	159
160		const changes = &std.StringHashMap(DiffChange).init(gpa);
	160	var changes = std.StringHashMap(DiffChange).init(gpa);
161	161
162	162	var i: usize = 0;
163	163	while (i < rems.items.len) {

src/cmd/sum.zig+2-2

...	...	@@ -24,8 +24,8 @@ pub fn execute(args: [][]u8) !void {
24	24	const w = f.writer();
25	25
26	26	//
27		const module_list = &std.ArrayList(u.Module).init(gpa);
28		try common.collect_pkgs(top_module, module_list);
	27	var module_list = std.ArrayList(u.Module).init(gpa);
	28	try common.collect_pkgs(top_module, &module_list);
29	29
30	30	for (module_list.items) \|m\| {
31	31	if (m.clean_path.len == 0) {

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

...	...	@@ -19,7 +19,7 @@ pub fn execute(args: [][]u8) !void {
19	19	const url = try std.mem.join(gpa, "/", &.{ zpm.server_root, "packages" });
20	20	const val = try zpm.server_fetch(url);
21	21
22		const arr = &std.ArrayList(zpm.Package).init(gpa);
	22	var arr = std.ArrayList(zpm.Package).init(gpa);
23	23	defer arr.deinit();
24	24
25	25	for (val.Array) \|item\| {

src/common.zig+3-3

...	...	@@ -30,7 +30,7 @@ pub const CollectOptions = struct {
30	30	pub fn collect_deps_deep(dir: []const u8, mpath: []const u8, options: *CollectOptions) !u.Module {
31	31	const m = try u.ModFile.init(gpa, mpath);
32	32	try options.init();
33		const moduledeps = &std.ArrayList(u.Module).init(gpa);
	33	var moduledeps = std.ArrayList(u.Module).init(gpa);
34	34	defer moduledeps.deinit();
35	35	try std.fs.cwd().makePath(".zigmod/deps/files");
36	36	if (m.root_files.len > 0) {
...	...	@@ -56,7 +56,7 @@ pub fn collect_deps_deep(dir: []const u8, mpath: []const u8, options: *CollectOp
56	56
57	57	pub fn collect_deps(dir: []const u8, mpath: []const u8, options: *CollectOptions) anyerror!u.Module {
58	58	const m = try u.ModFile.init(gpa, mpath);
59		const moduledeps = &std.ArrayList(u.Module).init(gpa);
	59	var moduledeps = std.ArrayList(u.Module).init(gpa);
60	60	defer moduledeps.deinit();
61	61	if (m.files.len > 0) {
62	62	try moduledeps.append(try add_files_package(m.id, m.files, m.name));
...	...	@@ -336,7 +336,7 @@ pub fn add_files_package(pkg_name: []const u8, dirs: []const []const u8, parent_
336	336	}
337	337
338	338	pub fn parse_lockfile(path: []const u8) ![]const [4][]const u8 {
339		const list = &std.ArrayList([4][]const u8).init(gpa);
	339	var list = std.ArrayList([4][]const u8).init(gpa);
340	340	const max = std.math.maxInt(usize);
341	341	const f = try std.fs.cwd().openFile(path, .{});
342	342	const r = f.reader();

src/main.zig+1-1

...	...	@@ -53,7 +53,7 @@ pub fn main() !void {
53	53	}
54	54	}
55	55
56		var sub_cmd_args = &std.ArrayList([]const u8).init(gpa);
	56	var sub_cmd_args = std.ArrayList([]const u8).init(gpa);
57	57	try sub_cmd_args.append(try std.fmt.allocPrint(gpa, "zigmod-{s}", .{args[0]}));
58	58	for (args[1..]) \|item\| {
59	59	try sub_cmd_args.append(item);

src/util/funcs.zig+3-3

...	...	@@ -33,7 +33,7 @@ pub fn try_index(comptime T: type, array: []T, n: usize, def: T) T {
33	33	}
34	34
35	35	pub fn split(in: []const u8, delim: []const u8) ![][]const u8 {
36		const list = &std.ArrayList([]const u8).init(gpa);
	36	var list = std.ArrayList([]const u8).init(gpa);
37	37	defer list.deinit();
38	38	const iter = &std.mem.split(in, delim);
39	39	while (iter.next()) \|str\| {
...	...	@@ -90,7 +90,7 @@ pub fn trim_suffix(in: []const u8, suffix: []const u8) []const u8 {
90	90	}
91	91
92	92	pub fn repeat(s: []const u8, times: i32) ![]const u8 {
93		const list = &std.ArrayList([]const u8).init(gpa);
	93	var list = std.ArrayList([]const u8).init(gpa);
94	94	var i: i32 = 0;
95	95	while (i < times) : (i += 1) {
96	96	try list.append(s);
...	...	@@ -175,7 +175,7 @@ pub fn run_cmd(dir: ?[]const u8, args: []const []const u8) !u32 {
175	175	}
176	176
177	177	pub fn list_remove(input: [][]const u8, search: []const u8) ![][]const u8 {
178		const list = &std.ArrayList([]const u8).init(gpa);
	178	var list = std.ArrayList([]const u8).init(gpa);
179	179	defer list.deinit();
180	180	for (input) \|item\| {
181	181	if (!std.mem.eql(u8, item, search)) {

src/util/modfile.zig+1-1

...	...	@@ -68,7 +68,7 @@ pub const ModFile = struct {
68	68	}
69	69
70	70	fn dep_list_by_name(alloc: *std.mem.Allocator, mapping: yaml.Mapping, prop: []const u8) anyerror![]u.Dep {
71		const dep_list = &std.ArrayList(u.Dep).init(alloc);
	71	var dep_list = std.ArrayList(u.Dep).init(alloc);
72	72	if (mapping.get(prop)) \|dep_seq\| {
73	73	if (dep_seq == .sequence) {
74	74	for (dep_seq.sequence) \|item\| {

src/util/module.zig+4-4

...	...	@@ -25,7 +25,7 @@ pub const Module = struct {
25	25	dep: ?u.Dep,
26	26
27	27	pub fn from(dep: u.Dep, dir: []const u8, options: *common.CollectOptions) !Module {
28		const moddeps = &std.ArrayList(Module).init(gpa);
	28	var moddeps = std.ArrayList(Module).init(gpa);
29	29	defer moddeps.deinit();
30	30	for (dep.deps) \|*d\| {
31	31	if (try common.get_module_from_dep(d, dir, dep.name, options)) \|founddep\| {
...	...	@@ -54,11 +54,11 @@ pub const Module = struct {
54	54	}
55	55
56	56	pub fn get_hash(self: Module, cdpath: []const u8) ![]const u8 {
57		const file_list_1 = &std.ArrayList([]const u8).init(gpa);
	57	var file_list_1 = std.ArrayList([]const u8).init(gpa);
58	58	defer file_list_1.deinit();
59		try u.file_list(try u.concat(&.{ cdpath, "/", self.clean_path }), file_list_1);
	59	try u.file_list(try u.concat(&.{ cdpath, "/", self.clean_path }), &file_list_1);
60	60
61		const file_list_2 = &std.ArrayList([]const u8).init(gpa);
	61	var file_list_2 = std.ArrayList([]const u8).init(gpa);
62	62	defer file_list_2.deinit();
63	63	for (file_list_1.items) \|item\| {
64	64	const _a = u.trim_prefix(item, cdpath);

src/util/yaml.zig+5-5

...	...	@@ -112,7 +112,7 @@ pub const Mapping = struct {
112	112	}
113	113
114	114	pub fn get_string_array(self: Mapping, alloc: *std.mem.Allocator, k: []const u8) ![][]const u8 {
115		const list = &std.ArrayList([]const u8).init(alloc);
	115	var list = std.ArrayList([]const u8).init(alloc);
116	116	defer list.deinit();
117	117	if (self.get(k)) \|val\| {
118	118	if (val == .sequence) {
...	...	@@ -154,7 +154,7 @@ pub fn parse(alloc: *std.mem.Allocator, input: []const u8) !Document {
154	154
155	155	_ = c.yaml_parser_set_input_string(&parser, input.ptr, input.len);
156	156
157		const all_events = &std.ArrayList(Token).init(alloc);
	157	var all_events = std.ArrayList(Token).init(alloc);
158	158	var event: Token = undefined;
159	159	while (true) {
160	160	const p = c.yaml_parser_parse(&parser, &event);
...	...	@@ -220,7 +220,7 @@ fn parse_item(p: *Parser, start: ?Token) Error!Item {
220	220	}
221	221
222	222	fn parse_stream(p: *Parser) Error!Stream {
223		const res = &std.ArrayList(Document).init(p.alloc);
	223	var res = std.ArrayList(Document).init(p.alloc);
224	224	defer res.deinit();
225	225
226	226	while (true) {
...	...	@@ -250,7 +250,7 @@ fn parse_document(p: *Parser) Error!Document {
250	250	}
251	251
252	252	fn parse_mapping(p: *Parser) Error!Mapping {
253		const res = &std.ArrayList(Key).init(p.alloc);
	253	var res = std.ArrayList(Key).init(p.alloc);
254	254	defer res.deinit();
255	255
256	256	while (true) {
...	...	@@ -279,7 +279,7 @@ fn parse_value(p: *Parser) Error!Value {
279	279	}
280	280
281	281	fn parse_sequence(p: *Parser) Error!Sequence {
282		const res = &std.ArrayList(Item).init(p.alloc);
	282	var res = std.ArrayList(Item).init(p.alloc);
283	283	defer res.deinit();
284	284
285	285	while (true) {