authorgravatar for hello@nektro.netMeghan Denny <hello@nektro.net> 2021-10-28 03:35:09 -07:00
committergravatar for hello@nektro.netMeghan Denny <hello@nektro.net> 2021-10-28 03:35:09 -07:00
log0f4f337b97136536157fd06be77eb61dfb870aba
treed45818c71845862cefb489aa67228275315c1774
parent5eeb1f37ad0f488b2c9b615b9590650ef4fd0f82

remove global allocator from u.split

4 files changed, 8 insertions(+), 7 deletions(-)

src/common.zig+1-1
...@@ -174,7 +174,7 @@ pub fn get_modpath(cachepath: string, d: zigmod.Dep, options: *CollectOptions) !...@@ -174,7 +174,7 @@ pub fn get_modpath(cachepath: string, d: zigmod.Dep, options: *CollectOptions) !
174 if (try u.does_folder_exist(pv)) {174 if (try u.does_folder_exist(pv)) {
175 return pv;175 return pv;
176 }176 }
177 const file_name = try u.last(try u.split(d.path, "/"));177 const file_name = try u.last(try u.split(gpa, d.path, "/"));
178 if (d.version.len > 0) {178 if (d.version.len > 0) {
179 if (try u.does_folder_exist(pv)) {179 if (try u.does_folder_exist(pv)) {
180 return pv;180 return pv;
src/util/funcs.zig+4-3
...@@ -38,9 +38,10 @@ pub fn try_index(comptime T: type, array: []T, n: usize, def: T) T {...@@ -38,9 +38,10 @@ pub fn try_index(comptime T: type, array: []T, n: usize, def: T) T {
38 return array[n];38 return array[n];
39}39}
4040
41pub fn split(in: string, delim: string) ![]string {41pub fn split(alloc: *std.mem.Allocator, in: string, delim: string) ![]string {
42 var list = std.ArrayList(string).init(gpa);42 var list = std.ArrayList(string).init(alloc);
43 defer list.deinit();43 defer list.deinit();
44
44 var iter = std.mem.split(u8, in, delim);45 var iter = std.mem.split(u8, in, delim);
45 while (iter.next()) |str| {46 while (iter.next()) |str| {
46 try list.append(str);47 try list.append(str);
...@@ -267,7 +268,7 @@ pub fn detect_pkgname(override: string, dir: string) !string {...@@ -267,7 +268,7 @@ pub fn detect_pkgname(override: string, dir: string) !string {
267 return error.NoBuildZig;268 return error.NoBuildZig;
268 }269 }
269 const dpath = try std.fs.realpathAlloc(gpa, try std.mem.concat(gpa, u8, &.{ dir, "build.zig" }));270 const dpath = try std.fs.realpathAlloc(gpa, try std.mem.concat(gpa, u8, &.{ dir, "build.zig" }));
270 const splitP = try split(dpath, std.fs.path.sep_str);271 const splitP = try split(gpa, dpath, std.fs.path.sep_str);
271 var name = splitP[splitP.len - 2];272 var name = splitP[splitP.len - 2];
272 name = trim_prefix(name, "zig-");273 name = trim_prefix(name, "zig-");
273 assert(name.len > 0, "package name must not be an empty string", .{});274 assert(name.len > 0, "package name must not be an empty string", .{});
src/util/modfile.zig+2-2
...@@ -118,8 +118,8 @@ pub const ModFile = struct {...@@ -118,8 +118,8 @@ pub const ModFile = struct {
118 .c_include_dirs = try item.mapping.get_string_array(alloc, "c_include_dirs"),118 .c_include_dirs = try item.mapping.get_string_array(alloc, "c_include_dirs"),
119 .c_source_flags = try item.mapping.get_string_array(alloc, "c_source_flags"),119 .c_source_flags = try item.mapping.get_string_array(alloc, "c_source_flags"),
120 .c_source_files = try item.mapping.get_string_array(alloc, "c_source_files"),120 .c_source_files = try item.mapping.get_string_array(alloc, "c_source_files"),
121 .only_os = try u.list_remove(try u.split(item.mapping.get_string("only_os"), ","), ""),121 .only_os = try u.list_remove(try u.split(alloc, item.mapping.get_string("only_os"), ","), ""),
122 .except_os = try u.list_remove(try u.split(item.mapping.get_string("except_os"), ","), ""),122 .except_os = try u.list_remove(try u.split(alloc, item.mapping.get_string("except_os"), ","), ""),
123 .yaml = item.mapping,123 .yaml = item.mapping,
124 .deps = try dep_list_by_name(alloc, item.mapping, "dependencies"),124 .deps = try dep_list_by_name(alloc, item.mapping, "dependencies"),
125 });125 });
src/util/yaml.zig+1-1
...@@ -150,7 +150,7 @@ pub fn parse(alloc: *std.mem.Allocator, input: string) !Document {...@@ -150,7 +150,7 @@ pub fn parse(alloc: *std.mem.Allocator, input: string) !Document {
150 _ = c.yaml_parser_initialize(&parser);150 _ = c.yaml_parser_initialize(&parser);
151 defer c.yaml_parser_delete(&parser);151 defer c.yaml_parser_delete(&parser);
152152
153 const lines = try u.split(input, "\n");153 const lines = try u.split(alloc, input, "\n");
154154
155 _ = c.yaml_parser_set_input_string(&parser, input.ptr, input.len);155 _ = c.yaml_parser_set_input_string(&parser, input.ptr, input.len);
156156