From 2e97ffbdeda9c737f12b819fbf052b629cfbd6bd Mon Sep 17 00:00:00 2001 From: Meghan Denny Date: Thu, 28 Oct 2021 03:52:03 -0700 Subject: [PATCH] remove global allocator from u.list_remove --- src/util/funcs.zig | 4 ++-- src/util/modfile.zig | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/util/funcs.zig b/src/util/funcs.zig index 878df7ff97196f3e5331683ea2013b6e3be6e944..6d41ac3b244bef9ffdf856aa95929d125529128a 100644 --- a/src/util/funcs.zig +++ b/src/util/funcs.zig @@ -150,8 +150,8 @@ pub fn run_cmd(alloc: *std.mem.Allocator, dir: ?string, args: []const string) !u return result.term.Exited; } -pub fn list_remove(input: []string, search: string) ![]string { - var list = std.ArrayList(string).init(gpa); +pub fn list_remove(alloc: *std.mem.Allocator, input: []string, search: string) ![]string { + var list = std.ArrayList(string).init(alloc); defer list.deinit(); for (input) |item| { if (!std.mem.eql(u8, item, search)) { diff --git a/src/util/modfile.zig b/src/util/modfile.zig index ecee6d009659124cca801b3b7ac00dc105aafd08..5291ef0657e7e08ca96740679da4c5694c17c0eb 100644 --- a/src/util/modfile.zig +++ b/src/util/modfile.zig @@ -118,8 +118,8 @@ pub const ModFile = struct { .c_include_dirs = try item.mapping.get_string_array(alloc, "c_include_dirs"), .c_source_flags = try item.mapping.get_string_array(alloc, "c_source_flags"), .c_source_files = try item.mapping.get_string_array(alloc, "c_source_files"), - .only_os = try u.list_remove(try u.split(alloc, item.mapping.get_string("only_os"), ","), ""), - .except_os = try u.list_remove(try u.split(alloc, item.mapping.get_string("except_os"), ","), ""), + .only_os = try u.list_remove(alloc, try u.split(alloc, item.mapping.get_string("only_os"), ","), ""), + .except_os = try u.list_remove(alloc, try u.split(alloc, item.mapping.get_string("except_os"), ","), ""), .yaml = item.mapping, .deps = try dep_list_by_name(alloc, item.mapping, "dependencies"), }); -- 2.54.0