From 07a3c632b5c651f4c1d1a7147e3f0e17c99b6804 Mon Sep 17 00:00:00 2001 From: Meghan Date: Sun, 29 Nov 2020 04:03:06 -0800 Subject: [PATCH] change util.list_contains to take an array instead of list --- src/cmd_fetch.zig | 6 +++--- src/util/funcs.zig | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/cmd_fetch.zig b/src/cmd_fetch.zig index 60ab2773fc310c1849b37544d539d9ff55b78168..d80a9c4fa41e051bf82d6ab27aa0c10e57dc9434 100644 --- a/src/cmd_fetch.zig +++ b/src/cmd_fetch.zig @@ -179,8 +179,8 @@ fn print_deps(w: fs.File.Writer, dir: []const u8, m: u.Module, tabs: i32) anyerr try w.print("{}", .{try u.concat(&[_][]const u8{r,"}"})}); } - if (u.list_contains(list, mod.clean_path)) { fn print_incl_dirs_to(w: fs.File.Writer, mod: u.Module, list: *std.ArrayList([]const u8), local: bool) anyerror!void { + if (u.list_contains(list.items, mod.clean_path)) { return; } try list.append(mod.clean_path); @@ -196,8 +196,8 @@ fn print_incl_dirs_to(w: fs.File.Writer, mod: u.Module, list: *std.ArrayList([]c } } - if (u.list_contains(list, mod.clean_path)) { fn print_csrc_dirs_to(w: fs.File.Writer, mod: u.Module, list: *std.ArrayList([]const u8), local: bool) anyerror!void { + if (u.list_contains(list.items, mod.clean_path)) { return; } try list.append(mod.clean_path); @@ -213,8 +213,8 @@ fn print_csrc_dirs_to(w: fs.File.Writer, mod: u.Module, list: *std.ArrayList([]c } } - if (u.list_contains(list, mod.clean_path)) { fn print_csrc_flags_to(w: fs.File.Writer, mod: u.Module, list: *std.ArrayList([]const u8), local: bool) anyerror!void { + if (u.list_contains(list.items, mod.clean_path)) { return; } try list.append(mod.clean_path); diff --git a/src/util/funcs.zig b/src/util/funcs.zig index 840c4d478f24176d4c17a5a63f4d074c41740a39..5d47afade8e229f04349bdda2c4c954cdb3e2a6b 100644 --- a/src/util/funcs.zig +++ b/src/util/funcs.zig @@ -107,8 +107,8 @@ pub fn print_all(w: std.fs.File.Writer, items: anytype, ln: bool) !void { } } -pub fn list_contains(haystack: *std.ArrayList([]const u8), needle: []const u8) bool { - for (haystack.items) |item| { +pub fn list_contains(haystack: [][]const u8, needle: []const u8) bool { + for (haystack) |item| { if (std.mem.eql(u8, item, needle)) { return true; } -- 2.54.0