archives/zig
1
0
Fork 0
mirror of https://codeberg.org/ziglang/zig.git synced 2026-03-08 01:24:49 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

rename env_map to environ_map

Browse source 
For naming consistency with `std.process.Environ.Map`.
This commit is contained in:
Andrew Kelley 2026-01-02 21:57:47 -08:00
parent f25de4c7a2
commit 1070c2a71a
37 changed files with 290 additions and 291 deletions
Download patch file Download diff file Expand all files Collapse all files

38
tools/doctest.zig
View file

@ -32,10 +32,10 @@ const usage =
pub fn main(init: std.process.Init) !void {
const arena = init.arena.allocator();
const io = init.io;
const env_map = init.env_map;
const environ_map = init.environ_map;
const cwd_path = try std.process.getCwdAlloc(arena);
try env_map.put("CLICOLOR_FORCE", "1");
try environ_map.put("CLICOLOR_FORCE", "1");
var args_it = try init.minimal.args.iterateAllocator(arena);
if (!args_it.skip()) fatal("missing argv[0]", .{});
@ -101,13 +101,13 @@ pub fn main(init: std.process.Init) !void {
out,
code,
tmp_dir_path,
try Dir.path.relative(arena, cwd_path, env_map, tmp_dir_path, zig_path),
try Dir.path.relative(arena, cwd_path, env_map, tmp_dir_path, input_path),
try Dir.path.relative(arena, cwd_path, environ_map, tmp_dir_path, zig_path),
try Dir.path.relative(arena, cwd_path, environ_map, tmp_dir_path, input_path),
if (opt_zig_lib_dir) |zig_lib_dir|
try Dir.path.relative(arena, cwd_path, env_map, tmp_dir_path, zig_lib_dir)
try Dir.path.relative(arena, cwd_path, environ_map, tmp_dir_path, zig_lib_dir)
else
null,
env_map,
environ_map,
);
try out_file_writer.end();
@ -126,7 +126,7 @@ fn printOutput(
input_path: []const u8,
/// Relative to `tmp_dir_path`.
opt_zig_lib_dir: ?[]const u8,
env_map: *const process.Environ.Map,
environ_map: *const process.Environ.Map,
) !void {
const host = try std.zig.system.resolveTargetQuery(io, .{});
const obj_ext = builtin.object_format.fileExt(builtin.cpu.arch);
@ -199,7 +199,7 @@ fn printOutput(
const result = try process.run(arena, io, .{
.argv = build_args.items,
.cwd = tmp_dir_path,
.env_map = env_map,
.environ_map = environ_map,
.max_output_bytes = max_doc_file_size,
});
switch (result.term) {
@ -221,7 +221,7 @@ fn printOutput(
try shell_out.writeAll(colored_stderr);
break :code_block;
}
const exec_result = run(arena, io, env_map, tmp_dir_path, build_args.items) catch
const exec_result = run(arena, io, environ_map, tmp_dir_path, build_args.items) catch
fatal("example failed to compile", .{});
if (code.verbose_cimport) {
@ -254,7 +254,7 @@ fn printOutput(
const result = if (expected_outcome == .fail) blk: {
const result = try process.run(arena, io, .{
.argv = run_args,
.env_map = env_map,
.environ_map = environ_map,
.cwd = tmp_dir_path,
.max_output_bytes = max_doc_file_size,
});
@ -271,7 +271,7 @@ fn printOutput(
}
break :blk result;
} else blk: {
break :blk run(arena, io, env_map, tmp_dir_path, run_args) catch
break :blk run(arena, io, environ_map, tmp_dir_path, run_args) catch
fatal("example crashed", .{});
};
@ -340,7 +340,7 @@ fn printOutput(
}
}
const result = run(arena, io, env_map, tmp_dir_path, test_args.items) catch
const result = run(arena, io, environ_map, tmp_dir_path, test_args.items) catch
fatal("test failed", .{});
const escaped_stderr = try escapeHtml(arena, result.stderr);
const escaped_stdout = try escapeHtml(arena, result.stdout);
@ -373,7 +373,7 @@ fn printOutput(
}
const result = try process.run(arena, io, .{
.argv = test_args.items,
.env_map = env_map,
.environ_map = environ_map,
.cwd = tmp_dir_path,
.max_output_bytes = max_doc_file_size,
});
@ -429,7 +429,7 @@ fn printOutput(
const result = try process.run(arena, io, .{
.argv = test_args.items,
.env_map = env_map,
.environ_map = environ_map,
.cwd = tmp_dir_path,
.max_output_bytes = max_doc_file_size,
});
@ -505,7 +505,7 @@ fn printOutput(
if (maybe_error_match) |error_match| {
const result = try process.run(arena, io, .{
.argv = build_args.items,
.env_map = env_map,
.environ_map = environ_map,
.cwd = tmp_dir_path,
.max_output_bytes = max_doc_file_size,
});
@ -531,7 +531,7 @@ fn printOutput(
const colored_stderr = try termColor(arena, escaped_stderr);
try shell_out.print("\n{s} ", .{colored_stderr});
} else {
_ = run(arena, io, env_map, tmp_dir_path, build_args.items) catch fatal("example failed to compile", .{});
_ = run(arena, io, environ_map, tmp_dir_path, build_args.items) catch fatal("example failed to compile", .{});
}
try shell_out.writeAll("\n");
},
@ -590,7 +590,7 @@ fn printOutput(
try test_args.append(option);
try shell_out.print("{s} ", .{option});
}
const result = run(arena, io, env_map, tmp_dir_path, test_args.items) catch fatal("test failed", .{});
const result = run(arena, io, environ_map, tmp_dir_path, test_args.items) catch fatal("test failed", .{});
const escaped_stderr = try escapeHtml(arena, result.stderr);
const escaped_stdout = try escapeHtml(arena, result.stdout);
try shell_out.print("\n{s}{s}\n", .{ escaped_stderr, escaped_stdout });
@ -1123,13 +1123,13 @@ fn in(slice: []const u8, number: u8) bool {
fn run(
allocator: Allocator,
io: Io,
env_map: *const process.Environ.Map,
environ_map: *const process.Environ.Map,
cwd: []const u8,
args: []const []const u8,
) !process.RunResult {
const result = try process.run(allocator, io, .{
.argv = args,
.env_map = env_map,
.environ_map = environ_map,
.cwd = cwd,
.max_output_bytes = max_doc_file_size,
});

8
tools/incr-check.zig
View file

@ -31,7 +31,7 @@ pub fn main(init: std.process.Init) !void {
const fatal = std.process.fatal;
const arena = init.arena.allocator();
const io = init.io;
const env_map = init.env_map;
const environ_map = init.environ_map;
const cwd_path = try std.process.getCwdAlloc(arena);
var opt_zig_exe: ?[]const u8 = null;
@ -113,9 +113,9 @@ pub fn main(init: std.process.Init) !void {
}
// Convert paths to be relative to the cwd of the subprocess.
const resolved_zig_exe = try Dir.path.relative(arena, cwd_path, env_map, tmp_dir_path, zig_exe);
const resolved_zig_exe = try Dir.path.relative(arena, cwd_path, environ_map, tmp_dir_path, zig_exe);
const opt_resolved_lib_dir = if (opt_lib_dir) |lib_dir|
try Dir.path.relative(arena, cwd_path, env_map, tmp_dir_path, lib_dir)
try Dir.path.relative(arena, cwd_path, environ_map, tmp_dir_path, lib_dir)
else
null;
@ -176,7 +176,7 @@ pub fn main(init: std.process.Init) !void {
var cc_child_args: std.ArrayList([]const u8) = .empty;
if (target.backend == .cbe) {
const resolved_cc_zig_exe = if (opt_cc_zig) |cc_zig_exe|
try Dir.path.relative(arena, cwd_path, env_map, tmp_dir_path, cc_zig_exe)
try Dir.path.relative(arena, cwd_path, environ_map, tmp_dir_path, cc_zig_exe)
else
resolved_zig_exe;

4
tools/process_headers.zig
View file

@ -132,7 +132,7 @@ pub fn main(init: std.process.Init) !void {
const io = init.io;
const args = try init.minimal.args.toSlice(arena);
const cwd_path = try std.process.getCwdAlloc(arena);
const env_map = init.env_map;
const environ_map = init.environ_map;
var search_paths = std.array_list.Managed([]const u8).init(arena);
var opt_out_dir: ?[]const u8 = null;
@ -256,7 +256,7 @@ pub fn main(init: std.process.Init) !void {
switch (entry.kind) {
.directory => try dir_stack.append(full_path),
.file, .sym_link => {
const rel_path = try Dir.path.relative(arena, cwd_path, env_map, target_include_dir, full_path);
const rel_path = try Dir.path.relative(arena, cwd_path, environ_map, target_include_dir, full_path);
const max_size = 2 * 1024 * 1024 * 1024;
const raw_bytes = try Dir.cwd().readFileAlloc(io, full_path, arena, .limited(max_size));
const trimmed = std.mem.trim(u8, raw_bytes, " \r\n\t");

4
tools/update-linux-headers.zig
View file

@ -145,7 +145,7 @@ pub fn main(init: std.process.Init) !void {
const arena = init.arena.allocator();
const io = init.io;
const args = try init.minimal.args.toSlice(arena);
const env_map = init.env_map;
const environ_map = init.environ_map;
const cwd = try std.process.getCwdAlloc(arena);
var search_paths = std.array_list.Managed([]const u8).init(arena);
@ -209,7 +209,7 @@ pub fn main(init: std.process.Init) !void {
switch (entry.kind) {
.directory => try dir_stack.append(full_path),
.file => {
const rel_path = try Dir.path.relative(arena, cwd, env_map, target_include_dir, full_path);
const rel_path = try Dir.path.relative(arena, cwd, environ_map, target_include_dir, full_path);
const max_size = 2 * 1024 * 1024 * 1024;
const raw_bytes = try Dir.cwd().readFileAlloc(io, full_path, arena, .limited(max_size));
const trimmed = std.mem.trim(u8, raw_bytes, " \r\n\t");