diff --git a/src/common.zig b/src/common.zig index f0e3a814de9a6fae75349791d04ae70d94d30580..5d83eb0106a8de4c7bacbb663a86c185f3d98e15 100644 --- a/src/common.zig +++ b/src/common.zig @@ -127,10 +127,10 @@ pub fn get_modpath(cachepath: string, d: zigmod.Dep, options: *CollectOptions) ! }, .git => { if (d.version.len > 0) { - const vers = u.parse_split(zigmod.Dep.Type.Version.Git, "-").do(d.version) catch |e| switch (e) { + const vers = u.parse_split(zigmod.Dep.Type.Version.Git, '-').do(d.version) catch |e| switch (e) { error.IterEmpty => unreachable, error.NoMemberFound => { - const vtype = d.version[0..std.mem.indexOf(u8, d.version, "-").?]; + const vtype = d.version[0..std.mem.indexOfScalar(u8, d.version, '-').?]; u.fail("fetch: git: version type '{s}' is invalid.", .{vtype}); }, }; @@ -179,7 +179,7 @@ pub fn get_modpath(cachepath: string, d: zigmod.Dep, options: *CollectOptions) ! if (try extras.doesFolderExist(null, pv)) { return pv; } - const file_name = u.last(try u.split(options.alloc, d.path, "/")).?; + const file_name = u.last(try u.split(options.alloc, d.path, '/')).?; if (d.version.len > 0) { if (try extras.doesFolderExist(null, pv)) { return pv; @@ -338,7 +338,7 @@ pub fn parse_lockfile(alloc: std.mem.Allocator, dir: std.fs.Dir) ![]const [4]str } switch (v) { 1 => { - var iter = std.mem.split(u8, line, " "); + var iter = std.mem.splitScalar(u8, line, ' '); try list.append([4]string{ iter.next().?, iter.next().?, @@ -347,7 +347,7 @@ pub fn parse_lockfile(alloc: std.mem.Allocator, dir: std.fs.Dir) ![]const [4]str }); }, 2 => { - var iter = std.mem.split(u8, line, " "); + var iter = std.mem.splitScalar(u8, line, ' '); const asdep = zigmod.Dep{ .type = std.meta.stringToEnum(zigmod.Dep.Type, iter.next().?).?, .path = iter.next().?, diff --git a/src/util/dep.zig b/src/util/dep.zig index 532c09f81af04f1b348ce4063bbb6557d4dcf13a..bc5ce4aa05fe414f2582c3d3fda603ae16790379 100644 --- a/src/util/dep.zig +++ b/src/util/dep.zig @@ -71,7 +71,7 @@ pub const Dep = struct { } return switch (self.type) { .git => blk: { - const vers = try u.parse_split(zigmod.Dep.Type.Version.Git, "-").do(self.version); + const vers = try u.parse_split(zigmod.Dep.Type.Version.Git, '-').do(self.version); if (vers.id.frozen()) break :blk self.version; break :blk try self.type.exact_version(alloc, dpath); }, diff --git a/src/util/funcs.zig b/src/util/funcs.zig index 36659a5e1ee44b37281d3ec4a06ba571f36d8f1c..10d146d2b58d6621d3643989d36317e4ea1acb78 100644 --- a/src/util/funcs.zig +++ b/src/util/funcs.zig @@ -36,11 +36,11 @@ pub fn try_index(comptime T: type, array: []T, n: usize, def: T) T { return array[n]; } -pub fn split(alloc: std.mem.Allocator, in: string, delim: string) ![]string { +pub fn split(alloc: std.mem.Allocator, in: string, delim: u8) ![]string { var list = std.ArrayList(string).init(alloc); errdefer list.deinit(); - var iter = std.mem.split(u8, in, delim); + var iter = std.mem.splitScalar(u8, in, delim); while (iter.next()) |str| { try list.append(str); } @@ -99,7 +99,7 @@ pub fn random_string(comptime len: usize) [len]u8 { return buf; } -pub fn parse_split(comptime T: type, comptime delim: string) type { +pub fn parse_split(comptime T: type, comptime delim: u8) type { return struct { const Self = @This(); @@ -107,7 +107,7 @@ pub fn parse_split(comptime T: type, comptime delim: string) type { string: string, pub fn do(input: string) !Self { - var iter = std.mem.split(u8, input, delim); + var iter = std.mem.splitScalar(u8, input, delim); const start = iter.next() orelse return error.IterEmpty; const id = std.meta.stringToEnum(T, start) orelse return error.NoMemberFound; return Self{ @@ -125,7 +125,7 @@ pub const HashFn = enum { }; pub fn validate_hash(alloc: std.mem.Allocator, input: string, file_path: string) !bool { - const hash = parse_split(HashFn, "-").do(input) catch return false; + const hash = parse_split(HashFn, '-').do(input) catch return false; const file = try std.fs.cwd().openFile(file_path, .{}); defer file.close(); const data = try file.reader().readAllAlloc(alloc, gb); @@ -169,7 +169,7 @@ pub fn detect_pkgname(alloc: std.mem.Allocator, override: string, dir: string) ! return error.NoBuildZig; } const dpath = try std.fs.realpathAlloc(alloc, try std.fs.path.join(alloc, &.{ dir, "build.zig" })); - const splitP = try split(alloc, dpath, std.fs.path.sep_str); + const splitP = try split(alloc, dpath, std.fs.path.sep); var name = splitP[splitP.len - 2]; name = extras.trimPrefix(name, "zig-"); assert(name.len > 0, "package name must not be an empty string", .{}); diff --git a/src/util/modfile.zig b/src/util/modfile.zig index f7adf0a3a4cd00f6ffc572d266d17f5f7796c333..e381fbbea2a2c4ce1e9f293ef38740c1b1e5b4a3 100644 --- a/src/util/modfile.zig +++ b/src/util/modfile.zig @@ -93,7 +93,7 @@ pub const ModFile = struct { var main = item.mapping.get_string("main") orelse ""; if (item.mapping.get("src")) |val| { - var src_iter = std.mem.tokenize(u8, val.string, " "); + var src_iter = std.mem.tokenizeScalar(u8, val.string, ' '); dtype = src_iter.next().?; path = src_iter.next().?; if (src_iter.next()) |dver| { @@ -130,8 +130,8 @@ pub const ModFile = struct { .c_include_dirs = try item.mapping.get_string_array(alloc, "c_include_dirs"), .c_source_flags = try item.mapping.get_string_array(alloc, "c_source_flags"), .c_source_files = try item.mapping.get_string_array(alloc, "c_source_files"), - .only_os = try u.list_remove(alloc, try u.split(alloc, item.mapping.get_string("only_os") orelse "", ","), ""), - .except_os = try u.list_remove(alloc, try u.split(alloc, item.mapping.get_string("except_os") orelse "", ","), ""), + .only_os = try u.list_remove(alloc, try u.split(alloc, item.mapping.get_string("only_os") orelse "", ','), ""), + .except_os = try u.list_remove(alloc, try u.split(alloc, item.mapping.get_string("except_os") orelse "", ','), ""), .yaml = item.mapping, .deps = try dep_list_by_name(alloc, item.mapping, &.{"dependencies"}, for_build), .keep = std.mem.eql(u8, "true", item.mapping.get_string("keep") orelse ""),