diff --git a/src/cmd/license.zig b/src/cmd/license.zig index db2c0635c5989c624999ea780fbcdcfd526f5049..675c5e1ab9e1417e959694fca53ebfb8e78dddcd 100644 --- a/src/cmd/license.zig +++ b/src/cmd/license.zig @@ -2,6 +2,7 @@ const std = @import("std"); const gpa = std.heap.c_allocator; const style = @import("ansi").style; const licenses = @import("licenses"); +const extras = @import("extras"); const zigmod = @import("../lib.zig"); const u = @import("./../util/index.zig"); @@ -77,7 +78,7 @@ pub fn execute(args: [][]u8) !void { first = false; try writer.writeAll(Bold); try writer.print("{s}:\n", .{entry.key_ptr.*}); - if (u.list_contains(licenses.spdx, entry.key_ptr.*)) { + if (extras.containsString(licenses.spdx, entry.key_ptr.*)) { try writer.writeAll(Faint); try writer.print("= {s}{s}\n", .{ "https://spdx.org/licenses/", entry.key_ptr.* }); } diff --git a/src/common.zig b/src/common.zig index 0fea28a9a286a79df078ef7885f69b4d465eb0de..0a2930a8638c22adc90bc4db4291b95cefe56c0f 100644 --- a/src/common.zig +++ b/src/common.zig @@ -104,8 +104,8 @@ pub fn get_modpath(cachepath: string, d: zigmod.Dep, options: *CollectOptions) ! const pv = try std.fs.path.join(options.alloc, &.{ cachepath, try d.clean_path_v(options.alloc) }); const nocache = d.type.isLocal(); - if (!nocache and u.list_contains(options.already_fetched.items, p)) return p; - if (!nocache and u.list_contains(options.already_fetched.items, pv)) return pv; + if (!nocache and extras.containsString(options.already_fetched.items, p)) return p; + if (!nocache and extras.containsString(options.already_fetched.items, pv)) return pv; if (options.log and d.type != .local) { std.debug.print("fetch: {s}: {s}\n", .{ @tagName(d.type), d.path }); diff --git a/src/util/dep.zig b/src/util/dep.zig index b111202eb8dc82413b58842d6428f9f74b98dcc4..e9dcf85c2a413508a73a3114b0598a44bc6bb970 100644 --- a/src/util/dep.zig +++ b/src/util/dep.zig @@ -56,10 +56,10 @@ pub const Dep = struct { pub fn is_for_this(self: Dep) bool { const os = @tagName(builtin.os.tag); if (self.only_os.len > 0) { - return u.list_contains(self.only_os, os); + return extras.containsString(self.only_os, os); } if (self.except_os.len > 0) { - return !u.list_contains(self.except_os, os); + return !extras.containsString(self.except_os, os); } return true; } diff --git a/src/util/funcs.zig b/src/util/funcs.zig index 8cb0b073c0e6412dab0c3f77fdc7ec748ffa0aba..08880c66e53e814ac5b6dce2edf8f4ae1103fe21 100644 --- a/src/util/funcs.zig +++ b/src/util/funcs.zig @@ -75,15 +75,6 @@ pub fn trim_suffix(in: string, suffix: string) string { return in; } -pub fn list_contains(haystack: []const string, needle: string) bool { - for (haystack) |item| { - if (std.mem.eql(u8, item, needle)) { - return true; - } - } - return false; -} - pub fn list_contains_gen(comptime T: type, haystack: []const T, needle: T) bool { for (haystack) |item| { if (item.eql(needle)) { diff --git a/src/util/module.zig b/src/util/module.zig index 600edbddd2b386df213903ea2d6139d72bd7b22d..958a9cc26bfc46311aa464b60ac78d616d71c520 100644 --- a/src/util/module.zig +++ b/src/util/module.zig @@ -98,10 +98,10 @@ pub const Module = struct { pub fn is_for_this(self: Module) bool { const os = @tagName(builtin.os.tag); if (self.only_os.len > 0) { - return u.list_contains(self.only_os, os); + return extras.containsString(self.only_os, os); } if (self.except_os.len > 0) { - return !u.list_contains(self.except_os, os); + return !extras.containsString(self.except_os, os); } return true; }