From 51c7736bc1e0fcefe4c86059c176acf505ea5280 Mon Sep 17 00:00:00 2001 From: Meghan Denny Date: Sun, 18 Jul 2021 18:08:00 -0700 Subject: [PATCH] util- make trim_suffix always use u8 --- src/util/dep.zig | 2 +- src/util/funcs.zig | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/util/dep.zig b/src/util/dep.zig index e3ab5ae8d306d74edbd19abdfdb5d6ebdbe1b09a..486487fdc9218ce7318b7bc2b50c67bb8c44da60 100644 --- a/src/util/dep.zig +++ b/src/util/dep.zig @@ -34,7 +34,7 @@ pub const Dep = struct { p = u.trim_prefix(p, "http://"); p = u.trim_prefix(p, "https://"); p = u.trim_prefix(p, "git://"); - p = u.trim_suffix(u8, p, ".git"); + p = u.trim_suffix(p, ".git"); p = try std.mem.join(gpa, "/", &.{ @tagName(self.type), p }); return p; } diff --git a/src/util/funcs.zig b/src/util/funcs.zig index aa327aeff46da35d74f7a06045e60cf934d926d6..0ed68ef3c3809614e5fd941cc3037455c89e0e99 100644 --- a/src/util/funcs.zig +++ b/src/util/funcs.zig @@ -82,8 +82,8 @@ pub fn _join(comptime delim: []const u8, comptime xs: [][]const u8) []const u8 { return buf; } -pub fn trim_suffix(comptime T: type, in: []const T, suffix: []const T) []const T { - if (std.mem.endsWith(T, in, suffix)) { +pub fn trim_suffix(in: []const u8, suffix: []const u8) []const u8 { + if (std.mem.endsWith(u8, in, suffix)) { return in[0 .. in.len - suffix.len]; } return in; -- 2.54.0