From 08ac5e4e5ea84a9b8c529715595cfc4d940a1db5 Mon Sep 17 00:00:00 2001 From: Meghan Denny Date: Fri, 22 Oct 2021 18:24:33 -0700 Subject: [PATCH] remove util.concat --- src/util/funcs.zig | 6 +----- src/util/module.zig | 2 +- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/src/util/funcs.zig b/src/util/funcs.zig index 479f06abd67151fac20b849587ff232e1b3fb01d..a0b27bc5482f187556325a58f4f97bda865c1a79 100644 --- a/src/util/funcs.zig +++ b/src/util/funcs.zig @@ -101,11 +101,7 @@ pub fn repeat(s: string, times: i32) !string { while (i < times) : (i += 1) { try list.append(s); } - return try concat(list.items); -} - -pub fn concat(items: []string) !string { - return std.mem.join(gpa, "", items); + return try std.mem.join(gpa, "", list.items); } pub fn list_contains(haystack: []const string, needle: string) bool { diff --git a/src/util/module.zig b/src/util/module.zig index bd7e64e8a1390cc109673504d0265b817a0c3cbe..dd2b528ee41181ec258a1f655d0a92aa4647ae55 100644 --- a/src/util/module.zig +++ b/src/util/module.zig @@ -57,7 +57,7 @@ pub const Module = struct { pub fn get_hash(self: Module, cdpath: string) !string { var file_list_1 = std.ArrayList(string).init(gpa); defer file_list_1.deinit(); - try u.file_list(try u.concat(&.{ cdpath, "/", self.clean_path }), &file_list_1); + try u.file_list(try std.mem.concat(gpa, u8, &.{ cdpath, "/", self.clean_path }), &file_list_1); var file_list_2 = std.ArrayList(string).init(gpa); defer file_list_2.deinit(); -- 2.54.0