diff options
| author | Ryan Liptak <squeek502@hotmail.com> | 2023-05-04 18:15:50 -0700 |
|---|---|---|
| committer | Ryan Liptak <squeek502@hotmail.com> | 2023-05-13 13:45:05 -0700 |
| commit | 2129f28953b72da2f1bb58ff063a044d737c59c4 (patch) | |
| tree | d8b12c947b4936cd96f753537c6effd36b2cb0c2 /lib/std | |
| parent | 815e53b147a321d0bdb47dc008aa8181f57175ac (diff) | |
| download | zig-2129f28953b72da2f1bb58ff063a044d737c59c4.tar.gz zig-2129f28953b72da2f1bb58ff063a044d737c59c4.zip | |
Update all std.mem.split calls to their appropriate function
Everywhere that can now use `splitScalar` should get a nice little performance boost.
Diffstat (limited to 'lib/std')
| -rw-r--r-- | lib/std/Build/Step/Compile.zig | 2 | ||||
| -rw-r--r-- | lib/std/Build/Step/ConfigHeader.zig | 4 | ||||
| -rw-r--r-- | lib/std/SemanticVersion.zig | 10 | ||||
| -rw-r--r-- | lib/std/builtin.zig | 2 | ||||
| -rw-r--r-- | lib/std/crypto/Certificate.zig | 4 | ||||
| -rw-r--r-- | lib/std/crypto/phc_encoding.zig | 9 | ||||
| -rw-r--r-- | lib/std/crypto/scrypt.zig | 2 | ||||
| -rw-r--r-- | lib/std/http/Client.zig | 2 | ||||
| -rw-r--r-- | lib/std/http/Server.zig | 2 | ||||
| -rw-r--r-- | lib/std/net.zig | 6 | ||||
| -rw-r--r-- | lib/std/process.zig | 2 | ||||
| -rw-r--r-- | lib/std/zig/CrossTarget.zig | 12 | ||||
| -rw-r--r-- | lib/std/zig/ErrorBundle.zig | 2 | ||||
| -rw-r--r-- | lib/std/zig/render.zig | 2 | ||||
| -rw-r--r-- | lib/std/zig/system/NativeTargetInfo.zig | 2 |
15 files changed, 33 insertions, 30 deletions
diff --git a/lib/std/Build/Step/Compile.zig b/lib/std/Build/Step/Compile.zig index 6a05adc1a6..3355d7ccc5 100644 --- a/lib/std/Build/Step/Compile.zig +++ b/lib/std/Build/Step/Compile.zig @@ -2140,7 +2140,7 @@ fn checkCompileErrors(self: *Compile) !void { // Render the expected lines into a string that we can compare verbatim. var expected_generated = std.ArrayList(u8).init(arena); - var actual_line_it = mem.split(u8, actual_stderr, "\n"); + var actual_line_it = mem.splitScalar(u8, actual_stderr, '\n'); for (self.expect_errors) |expect_line| { const actual_line = actual_line_it.next() orelse { try expected_generated.appendSlice(expect_line); diff --git a/lib/std/Build/Step/ConfigHeader.zig b/lib/std/Build/Step/ConfigHeader.zig index cd97367218..4b76e24b26 100644 --- a/lib/std/Build/Step/ConfigHeader.zig +++ b/lib/std/Build/Step/ConfigHeader.zig @@ -250,7 +250,7 @@ fn render_autoconf( var any_errors = false; var line_index: u32 = 0; - var line_it = std.mem.split(u8, contents, "\n"); + var line_it = std.mem.splitScalar(u8, contents, '\n'); while (line_it.next()) |line| : (line_index += 1) { if (!std.mem.startsWith(u8, line, "#")) { try output.appendSlice(line); @@ -297,7 +297,7 @@ fn render_cmake( var any_errors = false; var line_index: u32 = 0; - var line_it = std.mem.split(u8, contents, "\n"); + var line_it = std.mem.splitScalar(u8, contents, '\n'); while (line_it.next()) |line| : (line_index += 1) { if (!std.mem.startsWith(u8, line, "#")) { try output.appendSlice(line); diff --git a/lib/std/SemanticVersion.zig b/lib/std/SemanticVersion.zig index 26f6f581c8..4d505b4e30 100644 --- a/lib/std/SemanticVersion.zig +++ b/lib/std/SemanticVersion.zig @@ -42,8 +42,8 @@ pub fn order(lhs: Version, rhs: Version) std.math.Order { if (lhs.pre == null and rhs.pre != null) return .gt; // Iterate over pre-release identifiers until a difference is found. - var lhs_pre_it = std.mem.split(u8, lhs.pre.?, "."); - var rhs_pre_it = std.mem.split(u8, rhs.pre.?, "."); + var lhs_pre_it = std.mem.splitScalar(u8, lhs.pre.?, '.'); + var rhs_pre_it = std.mem.splitScalar(u8, rhs.pre.?, '.'); while (true) { const next_lid = lhs_pre_it.next(); const next_rid = rhs_pre_it.next(); @@ -86,7 +86,7 @@ pub fn parse(text: []const u8) !Version { // Parse the required major, minor, and patch numbers. const extra_index = std.mem.indexOfAny(u8, text, "-+"); const required = text[0..(extra_index orelse text.len)]; - var it = std.mem.split(u8, required, "."); + var it = std.mem.splitScalar(u8, required, '.'); var ver = Version{ .major = try parseNum(it.first()), .minor = try parseNum(it.next() orelse return error.InvalidVersion), @@ -108,7 +108,7 @@ pub fn parse(text: []const u8) !Version { // Check validity of optional pre-release identifiers. // See: https://semver.org/#spec-item-9 if (ver.pre) |pre| { - it = std.mem.split(u8, pre, "."); + it = std.mem.splitScalar(u8, pre, '.'); while (it.next()) |id| { // Identifiers MUST NOT be empty. if (id.len == 0) return error.InvalidVersion; @@ -127,7 +127,7 @@ pub fn parse(text: []const u8) !Version { // Check validity of optional build metadata identifiers. // See: https://semver.org/#spec-item-10 if (ver.build) |build| { - it = std.mem.split(u8, build, "."); + it = std.mem.splitScalar(u8, build, '.'); while (it.next()) |id| { // Identifiers MUST NOT be empty. if (id.len == 0) return error.InvalidVersion; diff --git a/lib/std/builtin.zig b/lib/std/builtin.zig index 684432bd40..7fe295123e 100644 --- a/lib/std/builtin.zig +++ b/lib/std/builtin.zig @@ -531,7 +531,7 @@ pub const Version = struct { // found no digits or '.' before unexpected character if (end == 0) return error.InvalidVersion; - var it = std.mem.split(u8, text[0..end], "."); + var it = std.mem.splitScalar(u8, text[0..end], '.'); // substring is not empty, first call will succeed const major = it.first(); if (major.len == 0) return error.InvalidVersion; diff --git a/lib/std/crypto/Certificate.zig b/lib/std/crypto/Certificate.zig index 113d169cbc..3da4269ba2 100644 --- a/lib/std/crypto/Certificate.zig +++ b/lib/std/crypto/Certificate.zig @@ -337,8 +337,8 @@ pub const Parsed = struct { return true; // exact match } - var it_host = std.mem.split(u8, host_name, "."); - var it_dns = std.mem.split(u8, dns_name, "."); + var it_host = std.mem.splitScalar(u8, host_name, '.'); + var it_dns = std.mem.splitScalar(u8, dns_name, '.'); const len_match = while (true) { const host = it_host.next(); diff --git a/lib/std/crypto/phc_encoding.zig b/lib/std/crypto/phc_encoding.zig index cc0f10e395..1eeee39a5a 100644 --- a/lib/std/crypto/phc_encoding.zig +++ b/lib/std/crypto/phc_encoding.zig @@ -7,9 +7,12 @@ const mem = std.mem; const meta = std.meta; const fields_delimiter = "$"; +const fields_delimiter_scalar = '$'; const version_param_name = "v"; const params_delimiter = ","; +const params_delimiter_scalar = ','; const kv_delimiter = "="; +const kv_delimiter_scalar = '='; pub const Error = std.crypto.errors.EncodingError || error{NoSpaceLeft}; @@ -73,7 +76,7 @@ pub fn BinValue(comptime max_len: usize) type { /// Other fields will also be deserialized from the function parameters section. pub fn deserialize(comptime HashResult: type, str: []const u8) Error!HashResult { var out = mem.zeroes(HashResult); - var it = mem.split(u8, str, fields_delimiter); + var it = mem.splitScalar(u8, str, fields_delimiter_scalar); var set_fields: usize = 0; while (true) { @@ -104,7 +107,7 @@ pub fn deserialize(comptime HashResult: type, str: []const u8) Error!HashResult // Read optional parameters var has_params = false; - var it_params = mem.split(u8, field, params_delimiter); + var it_params = mem.splitScalar(u8, field, params_delimiter_scalar); while (it_params.next()) |params| { const param = kvSplit(params) catch break; var found = false; @@ -252,7 +255,7 @@ fn serializeTo(params: anytype, out: anytype) !void { // Split a `key=value` string into `key` and `value` fn kvSplit(str: []const u8) !struct { key: []const u8, value: []const u8 } { - var it = mem.split(u8, str, kv_delimiter); + var it = mem.splitScalar(u8, str, kv_delimiter_scalar); const key = it.first(); const value = it.next() orelse return Error.InvalidEncoding; const ret = .{ .key = key, .value = value }; diff --git a/lib/std/crypto/scrypt.zig b/lib/std/crypto/scrypt.zig index 077de3b510..b8e8ef55e2 100644 --- a/lib/std/crypto/scrypt.zig +++ b/lib/std/crypto/scrypt.zig @@ -287,7 +287,7 @@ const crypt_format = struct { out.r = try Codec.intDecode(u30, str[4..9]); out.p = try Codec.intDecode(u30, str[9..14]); - var it = mem.split(u8, str[14..], "$"); + var it = mem.splitScalar(u8, str[14..], '$'); const salt = it.first(); if (@hasField(T, "salt")) out.salt = salt; diff --git a/lib/std/http/Client.zig b/lib/std/http/Client.zig index 5626864ceb..9aaf13d333 100644 --- a/lib/std/http/Client.zig +++ b/lib/std/http/Client.zig @@ -426,7 +426,7 @@ pub const Response = struct { } else if (std.ascii.eqlIgnoreCase(header_name, "transfer-encoding")) { // Transfer-Encoding: second, first // Transfer-Encoding: deflate, chunked - var iter = mem.splitBackwards(u8, header_value, ","); + var iter = mem.splitBackwardsScalar(u8, header_value, ','); if (iter.next()) |first| { const trimmed = mem.trim(u8, first, " "); diff --git a/lib/std/http/Server.zig b/lib/std/http/Server.zig index 51ab6c086b..1af64805b3 100644 --- a/lib/std/http/Server.zig +++ b/lib/std/http/Server.zig @@ -277,7 +277,7 @@ pub const Request = struct { } else if (std.ascii.eqlIgnoreCase(header_name, "transfer-encoding")) { // Transfer-Encoding: second, first // Transfer-Encoding: deflate, chunked - var iter = mem.splitBackwards(u8, header_value, ","); + var iter = mem.splitBackwardsScalar(u8, header_value, ','); if (iter.next()) |first| { const trimmed = mem.trim(u8, first, " "); diff --git a/lib/std/net.zig b/lib/std/net.zig index 4360cc29f4..4e72ed3256 100644 --- a/lib/std/net.zig +++ b/lib/std/net.zig @@ -1263,7 +1263,7 @@ fn linuxLookupNameFromHosts( }, else => |e| return e, }) |line| { - var split_it = mem.split(u8, line, "#"); + var split_it = mem.splitScalar(u8, line, '#'); const no_comment_line = split_it.first(); var line_it = mem.tokenizeAny(u8, no_comment_line, " \t"); @@ -1465,7 +1465,7 @@ fn getResolvConf(allocator: mem.Allocator, rc: *ResolvConf) !void { else => |e| return e, }) |line| { const no_comment_line = no_comment_line: { - var split = mem.split(u8, line, "#"); + var split = mem.splitScalar(u8, line, '#'); break :no_comment_line split.first(); }; var line_it = mem.tokenizeAny(u8, no_comment_line, " \t"); @@ -1473,7 +1473,7 @@ fn getResolvConf(allocator: mem.Allocator, rc: *ResolvConf) !void { const token = line_it.next() orelse continue; if (mem.eql(u8, token, "options")) { while (line_it.next()) |sub_tok| { - var colon_it = mem.split(u8, sub_tok, ":"); + var colon_it = mem.splitScalar(u8, sub_tok, ':'); const name = colon_it.first(); const value_txt = colon_it.next() orelse continue; const value = std.fmt.parseInt(u8, value_txt, 10) catch |err| switch (err) { diff --git a/lib/std/process.zig b/lib/std/process.zig index c33fd92db6..80be705187 100644 --- a/lib/std/process.zig +++ b/lib/std/process.zig @@ -310,7 +310,7 @@ pub fn getEnvMap(allocator: Allocator) !EnvMap { for (environ) |env| { const pair = mem.sliceTo(env, 0); - var parts = mem.split(u8, pair, "="); + var parts = mem.splitScalar(u8, pair, '='); const key = parts.first(); const value = parts.rest(); try result.put(key, value); diff --git a/lib/std/zig/CrossTarget.zig b/lib/std/zig/CrossTarget.zig index 93b6d97d75..d072a4dbad 100644 --- a/lib/std/zig/CrossTarget.zig +++ b/lib/std/zig/CrossTarget.zig @@ -239,7 +239,7 @@ pub fn parse(args: ParseOptions) !CrossTarget { .dynamic_linker = DynamicLinker.init(args.dynamic_linker), }; - var it = mem.split(u8, args.arch_os_abi, "-"); + var it = mem.splitScalar(u8, args.arch_os_abi, '-'); const arch_name = it.first(); const arch_is_native = mem.eql(u8, arch_name, "native"); if (!arch_is_native) { @@ -257,7 +257,7 @@ pub fn parse(args: ParseOptions) !CrossTarget { const opt_abi_text = it.next(); if (opt_abi_text) |abi_text| { - var abi_it = mem.split(u8, abi_text, "."); + var abi_it = mem.splitScalar(u8, abi_text, '.'); const abi = std.meta.stringToEnum(Target.Abi, abi_it.first()) orelse return error.UnknownApplicationBinaryInterface; result.abi = abi; @@ -343,7 +343,7 @@ pub fn parse(args: ParseOptions) !CrossTarget { /// This is intended to be used if the API user of CrossTarget needs to learn the /// target CPU architecture in order to fully populate `ParseOptions`. pub fn parseCpuArch(args: ParseOptions) ?Target.Cpu.Arch { - var it = mem.split(u8, args.arch_os_abi, "-"); + var it = mem.splitScalar(u8, args.arch_os_abi, '-'); const arch_name = it.first(); const arch_is_native = mem.eql(u8, arch_name, "native"); if (arch_is_native) { @@ -645,7 +645,7 @@ pub fn updateCpuFeatures(self: CrossTarget, set: *Target.Cpu.Feature.Set) void { } fn parseOs(result: *CrossTarget, diags: *ParseOptions.Diagnostics, text: []const u8) !void { - var it = mem.split(u8, text, "."); + var it = mem.splitScalar(u8, text, '.'); const os_name = it.first(); diags.os_name = os_name; const os_is_native = mem.eql(u8, os_name, "native"); @@ -706,7 +706,7 @@ fn parseOs(result: *CrossTarget, diags: *ParseOptions.Diagnostics, text: []const .linux, .dragonfly, => { - var range_it = mem.split(u8, version_text, "..."); + var range_it = mem.splitFull(u8, version_text, "..."); const min_text = range_it.next().?; const min_ver = SemVer.parse(min_text) catch |err| switch (err) { @@ -726,7 +726,7 @@ fn parseOs(result: *CrossTarget, diags: *ParseOptions.Diagnostics, text: []const }, .windows => { - var range_it = mem.split(u8, version_text, "..."); + var range_it = mem.splitFull(u8, version_text, "..."); const min_text = range_it.first(); const min_ver = std.meta.stringToEnum(Target.Os.WindowsVersion, min_text) orelse diff --git a/lib/std/zig/ErrorBundle.zig b/lib/std/zig/ErrorBundle.zig index ffe748203e..fe0ae3c0f6 100644 --- a/lib/std/zig/ErrorBundle.zig +++ b/lib/std/zig/ErrorBundle.zig @@ -294,7 +294,7 @@ fn renderErrorMessageToWriter( /// /// This is used to split the message in `@compileError("hello\nworld")` for example. fn writeMsg(eb: ErrorBundle, err_msg: ErrorMessage, stderr: anytype, indent: usize) !void { - var lines = std.mem.split(u8, eb.nullTerminatedString(err_msg.msg), "\n"); + var lines = std.mem.splitScalar(u8, eb.nullTerminatedString(err_msg.msg), '\n'); while (lines.next()) |line| { try stderr.writeAll(line); if (lines.index == null) break; diff --git a/lib/std/zig/render.zig b/lib/std/zig/render.zig index e1ccc8e0e8..83fa68567f 100644 --- a/lib/std/zig/render.zig +++ b/lib/std/zig/render.zig @@ -1995,7 +1995,7 @@ fn renderArrayInit( if (!expr_newlines[i]) { try ais.writer().writeAll(expr_text); } else { - var by_line = std.mem.split(u8, expr_text, "\n"); + var by_line = std.mem.splitScalar(u8, expr_text, '\n'); var last_line_was_empty = false; try ais.writer().writeAll(by_line.first()); while (by_line.next()) |line| { diff --git a/lib/std/zig/system/NativeTargetInfo.zig b/lib/std/zig/system/NativeTargetInfo.zig index 808a1bda8d..5cbc274ffd 100644 --- a/lib/std/zig/system/NativeTargetInfo.zig +++ b/lib/std/zig/system/NativeTargetInfo.zig @@ -556,7 +556,7 @@ fn glibcVerFromSoFile(file: fs.File) !std.builtin.Version { const dynstr_size = @intCast(usize, dynstr.size); const dynstr_bytes = buf[0..dynstr_size]; _ = try preadMin(file, dynstr_bytes, dynstr.offset, dynstr_bytes.len); - var it = mem.split(u8, dynstr_bytes, &.{0}); + var it = mem.splitScalar(u8, dynstr_bytes, 0); var max_ver: std.builtin.Version = .{ .major = 2, .minor = 2, .patch = 5 }; while (it.next()) |s| { if (mem.startsWith(u8, s, "GLIBC_2.")) { |
