authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2025-09-25 10:52:21-07:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2025-09-25 10:54:28-07:00
logdd2f1cbebf5982c254e2e2ee7ba46c9aca32fd9e
tree6f925209bef3ee25f52c7608c0bf908c54346232
parentccaf82d243fda453940ebb5679d6683089ed2b34

std.mem: rename chomp to cut

2 files changed, 58 insertions(+), 58 deletions(-)

lib/std/mem.zig+8-8
......@@ -3080,23 +3080,23 @@ test endsWith {
30803080}
30813081
30823082/// If `slice` starts with `prefix`, returns the rest of `slice` starting at `prefix.len`.
3083pub fn chompPrefix(comptime T: type, slice: []const T, prefix: []const T) ?[]const T {
3083pub fn cutPrefix(comptime T: type, slice: []const T, prefix: []const T) ?[]const T {
30843084 return if (startsWith(T, slice, prefix)) slice[prefix.len..] else null;
30853085}
30863086
3087test chompPrefix {
3088 try testing.expectEqualStrings("foo", chompPrefix(u8, "--example=foo", "--example=").?);
3089 try testing.expectEqual(null, chompPrefix(u8, "--example=foo", "-example="));
3087test cutPrefix {
3088 try testing.expectEqualStrings("foo", cutPrefix(u8, "--example=foo", "--example=").?);
3089 try testing.expectEqual(null, cutPrefix(u8, "--example=foo", "-example="));
30903090}
30913091
30923092/// If `slice` ends with `suffix`, returns `slice` from beginning to start of `suffix`.
3093pub fn chompSuffix(comptime T: type, slice: []const T, suffix: []const T) ?[]const T {
3093pub fn cutSuffix(comptime T: type, slice: []const T, suffix: []const T) ?[]const T {
30943094 return if (endsWith(T, slice, suffix)) slice[0 .. slice.len - suffix.len] else null;
30953095}
30963096
3097test chompSuffix {
3098 try testing.expectEqualStrings("foo", chompSuffix(u8, "foobar", "bar").?);
3099 try testing.expectEqual(null, chompSuffix(u8, "foobar", "baz"));
3097test cutSuffix {
3098 try testing.expectEqualStrings("foo", cutSuffix(u8, "foobar", "bar").?);
3099 try testing.expectEqual(null, cutSuffix(u8, "foobar", "baz"));
31003100}
31013101
31023102/// Delimiter type for tokenization and splitting operations.
src/main.zig+50-50
......@@ -1037,7 +1037,7 @@ fn buildOutputType(
10371037
10381038 var file_ext: ?Compilation.FileExt = null;
10391039 args_loop: while (args_iter.next()) |arg| {
1040 if (mem.chompPrefix(u8, arg, "@")) |resp_file_path| {
1040 if (mem.cutPrefix(u8, arg, "@")) |resp_file_path| {
10411041 // This is a "compiler response file". We must parse the file and treat its
10421042 // contents as command line parameters.
10431043 args_iter.resp_file = initArgIteratorResponseFile(arena, resp_file_path) catch |err| {
......@@ -1076,7 +1076,7 @@ fn buildOutputType(
10761076 .key = key,
10771077 .value = value,
10781078 });
1079 } else if (mem.chompPrefix(u8, arg, "-M")) |rest| {
1079 } else if (mem.cutPrefix(u8, arg, "-M")) |rest| {
10801080 var it = mem.splitScalar(u8, rest, '=');
10811081 const mod_name = it.first();
10821082 const root_src_orig = if (it.peek() != null) it.rest() else null;
......@@ -1110,7 +1110,7 @@ fn buildOutputType(
11101110 }
11111111 } else if (mem.eql(u8, arg, "-rcincludes")) {
11121112 rc_includes = parseRcIncludes(args_iter.nextOrFatal());
1113 } else if (mem.chompPrefix(u8, arg, "-rcincludes=")) |rest| {
1113 } else if (mem.cutPrefix(u8, arg, "-rcincludes=")) |rest| {
11141114 rc_includes = parseRcIncludes(rest);
11151115 } else if (mem.eql(u8, arg, "-rcflags")) {
11161116 extra_rcflags.shrinkRetainingCapacity(0);
......@@ -1132,7 +1132,7 @@ fn buildOutputType(
11321132 color = std.meta.stringToEnum(Color, next_arg) orelse {
11331133 fatal("expected [auto|on|off] after --color, found '{s}'", .{next_arg});
11341134 };
1135 } else if (mem.chompPrefix(u8, arg, "-j")) |str| {
1135 } else if (mem.cutPrefix(u8, arg, "-j")) |str| {
11361136 const num = std.fmt.parseUnsigned(u32, str, 10) catch |err| {
11371137 fatal("unable to parse jobs count '{s}': {s}", .{
11381138 str, @errorName(err),
......@@ -1146,7 +1146,7 @@ fn buildOutputType(
11461146 subsystem = try parseSubSystem(args_iter.nextOrFatal());
11471147 } else if (mem.eql(u8, arg, "-O")) {
11481148 mod_opts.optimize_mode = parseOptimizeMode(args_iter.nextOrFatal());
1149 } else if (mem.chompPrefix(u8, arg, "-fentry=")) |rest| {
1149 } else if (mem.cutPrefix(u8, arg, "-fentry=")) |rest| {
11501150 entry = .{ .named = rest };
11511151 } else if (mem.eql(u8, arg, "--force_undefined")) {
11521152 try force_undefined_symbols.put(arena, args_iter.nextOrFatal(), {});
......@@ -1174,7 +1174,7 @@ fn buildOutputType(
11741174 try create_module.frameworks.put(arena, args_iter.nextOrFatal(), .{ .needed = true });
11751175 } else if (mem.eql(u8, arg, "-install_name")) {
11761176 install_name = args_iter.nextOrFatal();
1177 } else if (mem.chompPrefix(u8, arg, "--compress-debug-sections=")) |param| {
1177 } else if (mem.cutPrefix(u8, arg, "--compress-debug-sections=")) |param| {
11781178 linker_compress_debug_sections = std.meta.stringToEnum(link.File.Lld.Elf.CompressDebugSections, param) orelse {
11791179 fatal("expected --compress-debug-sections=[none|zlib|zstd], found '{s}'", .{param});
11801180 };
......@@ -1272,7 +1272,7 @@ fn buildOutputType(
12721272 try cc_argv.appendSlice(arena, &.{ arg, args_iter.nextOrFatal() });
12731273 } else if (mem.eql(u8, arg, "-I")) {
12741274 try cssan.addIncludePath(arena, &cc_argv, .I, arg, args_iter.nextOrFatal(), false);
1275 } else if (mem.chompPrefix(u8, arg, "--embed-dir=")) |rest| {
1275 } else if (mem.cutPrefix(u8, arg, "--embed-dir=")) |rest| {
12761276 try cssan.addIncludePath(arena, &cc_argv, .embed_dir, arg, rest, true);
12771277 } else if (mem.eql(u8, arg, "-isystem")) {
12781278 try cssan.addIncludePath(arena, &cc_argv, .isystem, arg, args_iter.nextOrFatal(), false);
......@@ -1300,13 +1300,13 @@ fn buildOutputType(
13001300 target_mcpu = args_iter.nextOrFatal();
13011301 } else if (mem.eql(u8, arg, "-mcmodel")) {
13021302 mod_opts.code_model = parseCodeModel(args_iter.nextOrFatal());
1303 } else if (mem.chompPrefix(u8, arg, "-mcmodel=")) |rest| {
1303 } else if (mem.cutPrefix(u8, arg, "-mcmodel=")) |rest| {
13041304 mod_opts.code_model = parseCodeModel(rest);
1305 } else if (mem.chompPrefix(u8, arg, "-ofmt=")) |rest| {
1305 } else if (mem.cutPrefix(u8, arg, "-ofmt=")) |rest| {
13061306 create_module.object_format = rest;
1307 } else if (mem.chompPrefix(u8, arg, "-mcpu=")) |rest| {
1307 } else if (mem.cutPrefix(u8, arg, "-mcpu=")) |rest| {
13081308 target_mcpu = rest;
1309 } else if (mem.chompPrefix(u8, arg, "-O")) |rest| {
1309 } else if (mem.cutPrefix(u8, arg, "-O")) |rest| {
13101310 mod_opts.optimize_mode = parseOptimizeMode(rest);
13111311 } else if (mem.eql(u8, arg, "--dynamic-linker")) {
13121312 create_module.dynamic_linker = args_iter.nextOrFatal();
......@@ -1405,7 +1405,7 @@ fn buildOutputType(
14051405 create_module.opts.pie = false;
14061406 } else if (mem.eql(u8, arg, "-flto")) {
14071407 create_module.opts.lto = .full;
1408 } else if (mem.chompPrefix(u8, arg, "-flto=")) |mode| {
1408 } else if (mem.cutPrefix(u8, arg, "-flto=")) |mode| {
14091409 if (mem.eql(u8, mode, "full")) {
14101410 create_module.opts.lto = .full;
14111411 } else if (mem.eql(u8, mode, "thin")) {
......@@ -1439,7 +1439,7 @@ fn buildOutputType(
14391439 mod_opts.omit_frame_pointer = false;
14401440 } else if (mem.eql(u8, arg, "-fsanitize-c")) {
14411441 mod_opts.sanitize_c = .full;
1442 } else if (mem.chompPrefix(u8, arg, "-fsanitize-c=")) |mode| {
1442 } else if (mem.cutPrefix(u8, arg, "-fsanitize-c=")) |mode| {
14431443 if (mem.eql(u8, mode, "trap")) {
14441444 mod_opts.sanitize_c = .trap;
14451445 } else if (mem.eql(u8, mode, "full")) {
......@@ -1487,7 +1487,7 @@ fn buildOutputType(
14871487 create_module.opts.san_cov_trace_pc_guard = false;
14881488 } else if (mem.eql(u8, arg, "-freference-trace")) {
14891489 reference_trace = 256;
1490 } else if (mem.chompPrefix(u8, arg, "-freference-trace=")) |num| {
1490 } else if (mem.cutPrefix(u8, arg, "-freference-trace=")) |num| {
14911491 reference_trace = std.fmt.parseUnsigned(u32, num, 10) catch |err| {
14921492 fatal("unable to parse reference_trace count '{s}': {s}", .{ num, @errorName(err) });
14931493 };
......@@ -1501,50 +1501,50 @@ fn buildOutputType(
15011501 create_module.opts.rdynamic = true;
15021502 } else if (mem.eql(u8, arg, "-fsoname")) {
15031503 soname = .yes_default_value;
1504 } else if (mem.chompPrefix(u8, arg, "-fsoname=")) |rest| {
1504 } else if (mem.cutPrefix(u8, arg, "-fsoname=")) |rest| {
15051505 soname = .{ .yes = rest };
15061506 } else if (mem.eql(u8, arg, "-fno-soname")) {
15071507 soname = .no;
15081508 } else if (mem.eql(u8, arg, "-femit-bin")) {
15091509 emit_bin = .yes_default_path;
1510 } else if (mem.chompPrefix(u8, arg, "-femit-bin=")) |rest| {
1510 } else if (mem.cutPrefix(u8, arg, "-femit-bin=")) |rest| {
15111511 emit_bin = .{ .yes = rest };
15121512 } else if (mem.eql(u8, arg, "-fno-emit-bin")) {
15131513 emit_bin = .no;
15141514 } else if (mem.eql(u8, arg, "-femit-h")) {
15151515 emit_h = .yes_default_path;
1516 } else if (mem.chompPrefix(u8, arg, "-femit-h=")) |rest| {
1516 } else if (mem.cutPrefix(u8, arg, "-femit-h=")) |rest| {
15171517 emit_h = .{ .yes = rest };
15181518 } else if (mem.eql(u8, arg, "-fno-emit-h")) {
15191519 emit_h = .no;
15201520 } else if (mem.eql(u8, arg, "-femit-asm")) {
15211521 emit_asm = .yes_default_path;
1522 } else if (mem.chompPrefix(u8, arg, "-femit-asm=")) |rest| {
1522 } else if (mem.cutPrefix(u8, arg, "-femit-asm=")) |rest| {
15231523 emit_asm = .{ .yes = rest };
15241524 } else if (mem.eql(u8, arg, "-fno-emit-asm")) {
15251525 emit_asm = .no;
15261526 } else if (mem.eql(u8, arg, "-femit-llvm-ir")) {
15271527 emit_llvm_ir = .yes_default_path;
1528 } else if (mem.chompPrefix(u8, arg, "-femit-llvm-ir=")) |rest| {
1528 } else if (mem.cutPrefix(u8, arg, "-femit-llvm-ir=")) |rest| {
15291529 emit_llvm_ir = .{ .yes = rest };
15301530 } else if (mem.eql(u8, arg, "-fno-emit-llvm-ir")) {
15311531 emit_llvm_ir = .no;
15321532 } else if (mem.eql(u8, arg, "-femit-llvm-bc")) {
15331533 emit_llvm_bc = .yes_default_path;
1534 } else if (mem.chompPrefix(u8, arg, "-femit-llvm-bc=")) |rest| {
1534 } else if (mem.cutPrefix(u8, arg, "-femit-llvm-bc=")) |rest| {
15351535 emit_llvm_bc = .{ .yes = rest };
15361536 } else if (mem.eql(u8, arg, "-fno-emit-llvm-bc")) {
15371537 emit_llvm_bc = .no;
15381538 } else if (mem.eql(u8, arg, "-femit-docs")) {
15391539 emit_docs = .yes_default_path;
1540 } else if (mem.chompPrefix(u8, arg, "-femit-docs=")) |rest| {
1540 } else if (mem.cutPrefix(u8, arg, "-femit-docs=")) |rest| {
15411541 emit_docs = .{ .yes = rest };
15421542 } else if (mem.eql(u8, arg, "-fno-emit-docs")) {
15431543 emit_docs = .no;
15441544 } else if (mem.eql(u8, arg, "-femit-implib")) {
15451545 emit_implib = .yes_default_path;
15461546 emit_implib_arg_provided = true;
1547 } else if (mem.chompPrefix(u8, arg, "-femit-implib=")) |rest| {
1547 } else if (mem.cutPrefix(u8, arg, "-femit-implib=")) |rest| {
15481548 emit_implib = .{ .yes = rest };
15491549 emit_implib_arg_provided = true;
15501550 } else if (mem.eql(u8, arg, "-fno-emit-implib")) {
......@@ -1595,7 +1595,7 @@ fn buildOutputType(
15951595 mod_opts.no_builtin = false;
15961596 } else if (mem.eql(u8, arg, "-fno-builtin")) {
15971597 mod_opts.no_builtin = true;
1598 } else if (mem.chompPrefix(u8, arg, "-fopt-bisect-limit=")) |next_arg| {
1598 } else if (mem.cutPrefix(u8, arg, "-fopt-bisect-limit=")) |next_arg| {
15991599 llvm_opt_bisect_limit = std.fmt.parseInt(c_int, next_arg, 0) catch |err|
16001600 fatal("unable to parse '{s}': {s}", .{ arg, @errorName(err) });
16011601 } else if (mem.eql(u8, arg, "--eh-frame-hdr")) {
......@@ -1670,7 +1670,7 @@ fn buildOutputType(
16701670 create_module.opts.shared_memory = true;
16711671 } else if (prefixedIntArg(arg, "--global-base=")) |int| {
16721672 linker_global_base = int;
1673 } else if (mem.chompPrefix(u8, arg, "--export=")) |rest| {
1673 } else if (mem.cutPrefix(u8, arg, "--export=")) |rest| {
16741674 try linker_export_symbol_names.append(arena, rest);
16751675 } else if (mem.eql(u8, arg, "-Bsymbolic")) {
16761676 linker_bind_global_refs_locally = true;
......@@ -1680,7 +1680,7 @@ fn buildOutputType(
16801680 linker_gc_sections = false;
16811681 } else if (mem.eql(u8, arg, "--build-id")) {
16821682 build_id = .fast;
1683 } else if (mem.chompPrefix(u8, arg, "--build-id=")) |style| {
1683 } else if (mem.cutPrefix(u8, arg, "--build-id=")) |style| {
16841684 build_id = std.zig.BuildId.parse(style) catch |err| {
16851685 fatal("unable to parse --build-id style '{s}': {s}", .{
16861686 style, @errorName(err),
......@@ -1704,21 +1704,21 @@ fn buildOutputType(
17041704 verbose_generic_instances = true;
17051705 } else if (mem.eql(u8, arg, "--verbose-llvm-ir")) {
17061706 verbose_llvm_ir = "-";
1707 } else if (mem.chompPrefix(u8, arg, "--verbose-llvm-ir=")) |rest| {
1707 } else if (mem.cutPrefix(u8, arg, "--verbose-llvm-ir=")) |rest| {
17081708 verbose_llvm_ir = rest;
1709 } else if (mem.chompPrefix(u8, arg, "--verbose-llvm-bc=")) |rest| {
1709 } else if (mem.cutPrefix(u8, arg, "--verbose-llvm-bc=")) |rest| {
17101710 verbose_llvm_bc = rest;
17111711 } else if (mem.eql(u8, arg, "--verbose-cimport")) {
17121712 verbose_cimport = true;
17131713 } else if (mem.eql(u8, arg, "--verbose-llvm-cpu-features")) {
17141714 verbose_llvm_cpu_features = true;
1715 } else if (mem.chompPrefix(u8, arg, "-T")) |rest| {
1715 } else if (mem.cutPrefix(u8, arg, "-T")) |rest| {
17161716 linker_script = rest;
1717 } else if (mem.chompPrefix(u8, arg, "-L")) |rest| {
1717 } else if (mem.cutPrefix(u8, arg, "-L")) |rest| {
17181718 try create_module.lib_dir_args.append(arena, rest);
1719 } else if (mem.chompPrefix(u8, arg, "-F")) |rest| {
1719 } else if (mem.cutPrefix(u8, arg, "-F")) |rest| {
17201720 try create_module.framework_dirs.append(arena, rest);
1721 } else if (mem.chompPrefix(u8, arg, "-l")) |name| {
1721 } else if (mem.cutPrefix(u8, arg, "-l")) |name| {
17221722 // We don't know whether this library is part of libc
17231723 // or libc++ until we resolve the target, so we append
17241724 // to the list for now.
......@@ -1732,7 +1732,7 @@ fn buildOutputType(
17321732 .allow_so_scripts = allow_so_scripts,
17331733 },
17341734 } });
1735 } else if (mem.chompPrefix(u8, arg, "-needed-l")) |name| {
1735 } else if (mem.cutPrefix(u8, arg, "-needed-l")) |name| {
17361736 try create_module.cli_link_inputs.append(arena, .{ .name_query = .{
17371737 .name = name,
17381738 .query = .{
......@@ -1743,7 +1743,7 @@ fn buildOutputType(
17431743 .allow_so_scripts = allow_so_scripts,
17441744 },
17451745 } });
1746 } else if (mem.chompPrefix(u8, arg, "-weak-l")) |name| {
1746 } else if (mem.cutPrefix(u8, arg, "-weak-l")) |name| {
17471747 try create_module.cli_link_inputs.append(arena, .{ .name_query = .{
17481748 .name = name,
17491749 .query = .{
......@@ -1756,9 +1756,9 @@ fn buildOutputType(
17561756 } });
17571757 } else if (mem.startsWith(u8, arg, "-D")) {
17581758 try cc_argv.append(arena, arg);
1759 } else if (mem.chompPrefix(u8, arg, "-I")) |rest| {
1759 } else if (mem.cutPrefix(u8, arg, "-I")) |rest| {
17601760 try cssan.addIncludePath(arena, &cc_argv, .I, arg, rest, true);
1761 } else if (mem.chompPrefix(u8, arg, "-x")) |rest| {
1761 } else if (mem.cutPrefix(u8, arg, "-x")) |rest| {
17621762 const lang = if (rest.len == 0) args_iter.nextOrFatal() else rest;
17631763 if (mem.eql(u8, lang, "none")) {
17641764 file_ext = null;
......@@ -1767,7 +1767,7 @@ fn buildOutputType(
17671767 } else {
17681768 fatal("language not recognized: '{s}'", .{lang});
17691769 }
1770 } else if (mem.chompPrefix(u8, arg, "-mexec-model=")) |rest| {
1770 } else if (mem.cutPrefix(u8, arg, "-mexec-model=")) |rest| {
17711771 create_module.opts.wasi_exec_model = parseWasiExecModel(rest);
17721772 } else if (mem.eql(u8, arg, "-municode")) {
17731773 mingw_unicode_entry_point = true;
......@@ -2446,7 +2446,7 @@ fn buildOutputType(
24462446 linker_enable_new_dtags = false;
24472447 } else if (mem.eql(u8, arg, "-O")) {
24482448 linker_optimization = linker_args_it.nextOrFatal();
2449 } else if (mem.chompPrefix(u8, arg, "-O")) |rest| {
2449 } else if (mem.cutPrefix(u8, arg, "-O")) |rest| {
24502450 linker_optimization = rest;
24512451 } else if (mem.eql(u8, arg, "-pagezero_size")) {
24522452 const next_arg = linker_args_it.nextOrFatal();
......@@ -2529,7 +2529,7 @@ fn buildOutputType(
25292529 linker_compress_debug_sections = std.meta.stringToEnum(link.File.Lld.Elf.CompressDebugSections, arg1) orelse {
25302530 fatal("expected [none|zlib|zstd] after --compress-debug-sections, found '{s}'", .{arg1});
25312531 };
2532 } else if (mem.chompPrefix(u8, arg, "-z")) |z_rest| {
2532 } else if (mem.cutPrefix(u8, arg, "-z")) |z_rest| {
25332533 const z_arg = if (z_rest.len == 0) linker_args_it.nextOrFatal() else z_rest;
25342534 if (mem.eql(u8, z_arg, "nodelete")) {
25352535 linker_z_nodelete = true;
......@@ -2553,7 +2553,7 @@ fn buildOutputType(
25532553 linker_z_relro = true;
25542554 } else if (mem.eql(u8, z_arg, "norelro")) {
25552555 linker_z_relro = false;
2556 } else if (mem.chompPrefix(u8, z_arg, "stack-size=")) |rest| {
2556 } else if (mem.cutPrefix(u8, z_arg, "stack-size=")) |rest| {
25572557 stack_size = parseStackSize(rest);
25582558 } else if (prefixedIntArg(z_arg, "common-page-size=")) |int| {
25592559 linker_z_common_page_size = int;
......@@ -2672,7 +2672,7 @@ fn buildOutputType(
26722672 .allow_so_scripts = allow_so_scripts,
26732673 },
26742674 } });
2675 } else if (mem.chompPrefix(u8, arg, "-weak-l")) |rest| {
2675 } else if (mem.cutPrefix(u8, arg, "-weak-l")) |rest| {
26762676 try create_module.cli_link_inputs.append(arena, .{ .name_query = .{
26772677 .name = rest,
26782678 .query = .{
......@@ -3769,7 +3769,7 @@ fn createModule(
37693769 try mcpu_buffer.appendSlice(cli_mod.target_mcpu orelse "baseline");
37703770
37713771 for (create_module.llvm_m_args.items) |llvm_m_arg| {
3772 if (mem.chompPrefix(u8, llvm_m_arg, "mno-")) |llvm_name| {
3772 if (mem.cutPrefix(u8, llvm_m_arg, "mno-")) |llvm_name| {
37733773 const zig_name = llvm_to_zig_name.get(llvm_name) orelse {
37743774 fatal("target architecture {s} has no LLVM CPU feature named '{s}'", .{
37753775 @tagName(cpu_arch), llvm_name,
......@@ -3777,7 +3777,7 @@ fn createModule(
37773777 };
37783778 try mcpu_buffer.append('-');
37793779 try mcpu_buffer.appendSlice(zig_name);
3780 } else if (mem.chompPrefix(u8, llvm_m_arg, "m")) |llvm_name| {
3780 } else if (mem.cutPrefix(u8, llvm_m_arg, "m")) |llvm_name| {
37813781 const zig_name = llvm_to_zig_name.get(llvm_name) orelse {
37823782 fatal("target architecture {s} has no LLVM CPU feature named '{s}'", .{
37833783 @tagName(cpu_arch), llvm_name,
......@@ -4964,7 +4964,7 @@ fn cmdBuild(gpa: Allocator, arena: Allocator, args: []const []const u8) !void {
49644964 reference_trace = 256;
49654965 } else if (mem.eql(u8, arg, "--fetch")) {
49664966 fetch_only = true;
4967 } else if (mem.chompPrefix(u8, arg, "--fetch=")) |sub_arg| {
4967 } else if (mem.cutPrefix(u8, arg, "--fetch=")) |sub_arg| {
49684968 fetch_only = true;
49694969 fetch_mode = std.meta.stringToEnum(Package.Fetch.JobQueue.Mode, sub_arg) orelse
49704970 fatal("expected [needed|all] after '--fetch=', found '{s}'", .{
......@@ -4976,7 +4976,7 @@ fn cmdBuild(gpa: Allocator, arena: Allocator, args: []const []const u8) !void {
49764976 system_pkg_dir_path = args[i];
49774977 try child_argv.append("--system");
49784978 continue;
4979 } else if (mem.chompPrefix(u8, arg, "-freference-trace=")) |num| {
4979 } else if (mem.cutPrefix(u8, arg, "-freference-trace=")) |num| {
49804980 reference_trace = std.fmt.parseUnsigned(u32, num, 10) catch |err| {
49814981 fatal("unable to parse reference_trace count '{s}': {s}", .{ num, @errorName(err) });
49824982 };
......@@ -5026,9 +5026,9 @@ fn cmdBuild(gpa: Allocator, arena: Allocator, args: []const []const u8) !void {
50265026 verbose_generic_instances = true;
50275027 } else if (mem.eql(u8, arg, "--verbose-llvm-ir")) {
50285028 verbose_llvm_ir = "-";
5029 } else if (mem.chompPrefix(u8, arg, "--verbose-llvm-ir=")) |rest| {
5029 } else if (mem.cutPrefix(u8, arg, "--verbose-llvm-ir=")) |rest| {
50305030 verbose_llvm_ir = rest;
5031 } else if (mem.chompPrefix(u8, arg, "--verbose-llvm-bc=")) |rest| {
5031 } else if (mem.cutPrefix(u8, arg, "--verbose-llvm-bc=")) |rest| {
50325032 verbose_llvm_bc = rest;
50335033 } else if (mem.eql(u8, arg, "--verbose-cimport")) {
50345034 verbose_cimport = true;
......@@ -5042,7 +5042,7 @@ fn cmdBuild(gpa: Allocator, arena: Allocator, args: []const []const u8) !void {
50425042 };
50435043 try child_argv.appendSlice(&.{ arg, args[i] });
50445044 continue;
5045 } else if (mem.chompPrefix(u8, arg, "-j")) |str| {
5045 } else if (mem.cutPrefix(u8, arg, "-j")) |str| {
50465046 const num = std.fmt.parseUnsigned(u32, str, 10) catch |err| {
50475047 fatal("unable to parse jobs count '{s}': {s}", .{
50485048 str, @errorName(err),
......@@ -6618,7 +6618,7 @@ fn eatIntPrefix(arg: []const u8, base: u8) []const u8 {
66186618}
66196619
66206620fn prefixedIntArg(arg: []const u8, prefix: []const u8) ?u64 {
6621 const number = mem.chompPrefix(u8, arg, prefix) orelse return null;
6621 const number = mem.cutPrefix(u8, arg, prefix) orelse return null;
66226622 return std.fmt.parseUnsigned(u64, number, 0) catch |err| fatal("unable to parse '{s}': {t}", .{ arg, err });
66236623}
66246624
......@@ -6946,11 +6946,11 @@ fn cmdFetch(
69466946 debug_hash = true;
69476947 } else if (mem.eql(u8, arg, "--save")) {
69486948 save = .{ .yes = null };
6949 } else if (mem.chompPrefix(u8, arg, "--save=")) |rest| {
6949 } else if (mem.cutPrefix(u8, arg, "--save=")) |rest| {
69506950 save = .{ .yes = rest };
69516951 } else if (mem.eql(u8, arg, "--save-exact")) {
69526952 save = .{ .exact = null };
6953 } else if (mem.chompPrefix(u8, arg, "--save-exact=")) |rest| {
6953 } else if (mem.cutPrefix(u8, arg, "--save-exact=")) |rest| {
69546954 save = .{ .exact = rest };
69556955 } else {
69566956 fatal("unrecognized parameter: '{s}'", .{arg});