Commit 928e8883003aa02de7f66d29fee86f0bcdd8e090 | zigmod | Meg's Code Collection

author	Meghan Denny <hello@nektro.net> 2022-09-18 11:47:43 -07:00
committer	Meghan Denny <hello@nektro.net> 2022-09-18 11:47:43 -07:00
log	928e8883003aa02de7f66d29fee86f0bcdd8e090
tree	ba211604f136859f49ad929378874937a1ba6ecf
parent	3db48d1a413cc05116643dee257649a1c0a7aa3c

use errdefer for std.ArrayList deinit

4 files changed, 7 insertions(+), 7 deletions(-)

src/common.zig+2-2

...	...	@@ -29,7 +29,7 @@ pub fn collect_deps_deep(cachepath: string, mdir: std.fs.Dir, options: *CollectO
29	29	const m = try zigmod.ModFile.from_dir(options.alloc, mdir);
30	30	try options.init();
31	31	var moduledeps = std.ArrayList(zigmod.Module).init(options.alloc);
32		defer moduledeps.deinit();
	32	errdefer moduledeps.deinit();
33	33	if (m.root_files.len > 0) {
34	34	try moduledeps.append(try add_files_package(options.alloc, cachepath, "root", mdir, m.root_files));
35	35	}
...	...	@@ -63,7 +63,7 @@ pub fn collect_deps(cachepath: string, mdir: std.fs.Dir, dtype: zigmod.Dep.Type,
63	63
64	64	const m = try zigmod.ModFile.from_dir(options.alloc, mdir);
65	65	var moduledeps = std.ArrayList(zigmod.Module).init(options.alloc);
66		defer moduledeps.deinit();
	66	errdefer moduledeps.deinit();
67	67	if (m.files.len > 0) {
68	68	try moduledeps.append(try add_files_package(options.alloc, cachepath, m.id, mdir, m.files));
69	69	}

src/util/funcs.zig+2-2

...	...	@@ -36,7 +36,7 @@ pub fn try_index(comptime T: type, array: []T, n: usize, def: T) T {
36	36
37	37	pub fn split(alloc: std.mem.Allocator, in: string, delim: string) ![]string {
38	38	var list = std.ArrayList(string).init(alloc);
39		defer list.deinit();
	39	errdefer list.deinit();
40	40
41	41	var iter = std.mem.split(u8, in, delim);
42	42	while (iter.next()) \|str\| {
...	...	@@ -122,7 +122,7 @@ pub fn run_cmd(alloc: std.mem.Allocator, dir: ?string, args: []const string) !u3
122	122
123	123	pub fn list_remove(alloc: std.mem.Allocator, input: []string, search: string) ![]string {
124	124	var list = std.ArrayList(string).init(alloc);
125		defer list.deinit();
	125	errdefer list.deinit();
126	126	for (input) \|item\| {
127	127	if (!std.mem.eql(u8, item, search)) {
128	128	try list.append(item);

src/util/modfile.zig+1-1

...	...	@@ -81,7 +81,7 @@ pub const ModFile = struct {
81	81
82	82	fn dep_list_by_name(alloc: std.mem.Allocator, mapping: yaml.Mapping, props: []const string, for_build: bool) std.mem.Allocator.Error![]zigmod.Dep {
83	83	var dep_list = std.ArrayList(zigmod.Dep).init(alloc);
84		defer dep_list.deinit();
	84	errdefer dep_list.deinit();
85	85
86	86	for (props) \|prop\| {
87	87	if (mapping.get(prop)) \|dep_seq\| {

src/util/module.zig+2-2

...	...	@@ -31,7 +31,7 @@ pub const Module = struct {
31	31
32	32	pub fn from(alloc: std.mem.Allocator, dep: zigmod.Dep, modpath: string, options: *common.CollectOptions) !Module {
33	33	var moddeps = std.ArrayList(Module).init(alloc);
34		defer moddeps.deinit();
	34	errdefer moddeps.deinit();
35	35
36	36	for (dep.deps) \|*d\| {
37	37	if (try common.get_module_from_dep(d, modpath, options)) \|founddep\| {
...	...	@@ -66,7 +66,7 @@ pub const Module = struct {
66	66	const file_list_1 = try u.file_list(alloc, try std.mem.concat(alloc, u8, &.{ cdpath, "/", self.clean_path }));
67	67
68	68	var file_list_2 = std.ArrayList(string).init(alloc);
69		defer file_list_2.deinit();
	69	errdefer file_list_2.deinit();
70	70	for (file_list_1) \|item\| {
71	71	const _a = extras.trimPrefix(item, cdpath);
72	72	const _b = extras.trimPrefix(_a, self.clean_path);