Commit e3424332d3fa1264e1f6861b76bb0d1b2996728d | zig

doc/langref/Assembly Syntax Explained.zig +36-36

doc/langref/build.zig+1-1

...	@@ -4,7 +4,7 @@ pub fn build(b: *std.Build) void {	...	@@ -4,7 +4,7 @@ pub fn build(b: *std.Build) void {
4	const optimize = b.standardOptimizeOption(.{});	4	const optimize = b.standardOptimizeOption(.{});
5	const exe = b.addExecutable(.{	5	const exe = b.addExecutable(.{
6	.name = "example",	6	.name = "example",
7	.root_source_file = .{ .path = "example.zig" },	7	.root_source_file = b.path("example.zig"),
8	.optimize = optimize,	8	.optimize = optimize,
9	});	9	});
10	b.default_step.dependOn(&exe.step);	10	b.default_step.dependOn(&exe.step);

doc/langref/build_c.zig+2-2

...	@@ -3,13 +3,13 @@ const std = @import("std");	...	@@ -3,13 +3,13 @@ const std = @import("std");
3	pub fn build(b: *std.Build) void {	3	pub fn build(b: *std.Build) void {
4	const lib = b.addSharedLibrary(.{	4	const lib = b.addSharedLibrary(.{
5	.name = "mathtest",	5	.name = "mathtest",
6	.root_source_file = .{ .path = "mathtest.zig" },	6	.root_source_file = b.path("mathtest.zig"),
7	.version = .{ .major = 1, .minor = 0, .patch = 0 },	7	.version = .{ .major = 1, .minor = 0, .patch = 0 },
8	});	8	});
9	const exe = b.addExecutable(.{	9	const exe = b.addExecutable(.{
10	.name = "test",	10	.name = "test",
11	});	11	});
12	exe.addCSourceFile(.{ .file = .{ .path = "test.c" }, .flags = &.{"-std=c99"} });	12	exe.addCSourceFile(.{ .file = b.path("test.c"), .flags = &.{"-std=c99"} });
13	exe.linkLibrary(lib);	13	exe.linkLibrary(lib);
14	exe.linkSystemLibrary("c");	14	exe.linkSystemLibrary("c");
15		15

doc/langref/build_object.zig+2-2

...	@@ -3,13 +3,13 @@ const std = @import("std");	...	@@ -3,13 +3,13 @@ const std = @import("std");
3	pub fn build(b: *std.Build) void {	3	pub fn build(b: *std.Build) void {
4	const obj = b.addObject(.{	4	const obj = b.addObject(.{
5	.name = "base64",	5	.name = "base64",
6	.root_source_file = .{ .path = "base64.zig" },	6	.root_source_file = b.path("base64.zig"),
7	});	7	});
8		8
9	const exe = b.addExecutable(.{	9	const exe = b.addExecutable(.{
10	.name = "test",	10	.name = "test",
11	});	11	});
12	exe.addCSourceFile(.{ .file = .{ .path = "test.c" }, .flags = &.{"-std=c99",} });	12	exe.addCSourceFile(.{ .file = b.path("test.c"), .flags = &.{"-std=c99"} });
13	exe.addObject(obj);	13	exe.addObject(obj);
14	exe.linkSystemLibrary("c");	14	exe.linkSystemLibrary("c");
15	b.installArtifact(exe);	15	b.installArtifact(exe);

doc/langref/checking_null_in_zig.zig+5-3

 @@ -1,11 +1,13 @@
-const Foo = struct{};
+const Foo = struct {};
-fn doSomethingWithFoo(foo: *Foo) void { _ = foo; }
+fn doSomethingWithFoo(foo: *Foo) void {
+    _ = foo;
+}
 fn doAThing(optional_foo: ?*Foo) void {
     // do some stuff
     if (optional_foo) |foo| {
-      doSomethingWithFoo(foo);
+        doSomethingWithFoo(foo);
     }
     // do some stuff

doc/langref/doc_comments.zig+1-1

...	@@ -2,7 +2,7 @@	...	@@ -2,7 +2,7 @@
2	/// multiline doc comment).	2	/// multiline doc comment).
3	const Timestamp = struct {	3	const Timestamp = struct {
4	/// The number of seconds since the epoch (this is also a doc comment).	4	/// The number of seconds since the epoch (this is also a doc comment).
5	seconds: i64, // signed so we can represent pre-1970 (not a doc comment)	5	seconds: i64, // signed so we can represent pre-1970 (not a doc comment)
6	/// The number of nanoseconds past the second (doc comment again).	6	/// The number of nanoseconds past the second (doc comment again).
7	nanos: u32,	7	nanos: u32,
8		8

doc/langref/enum_export.zig+3-1

...	@@ -1,4 +1,6 @@	...	@@ -1,4 +1,6 @@
1	const Foo = enum(c_int) { a, b, c };	1	const Foo = enum(c_int) { a, b, c };
2	export fn entry(foo: Foo) void { _ = foo; }	2	export fn entry(foo: Foo) void {
		3	_ = foo;
		4	}
3		5
4	// obj	6	// obj

doc/langref/enum_export_error.zig+3-1

...	@@ -1,4 +1,6 @@	...	@@ -1,4 +1,6 @@
1	const Foo = enum { a, b, c };	1	const Foo = enum { a, b, c };
2	export fn entry(foo: Foo) void { _ = foo; }	2	export fn entry(foo: Foo) void {
		3	_ = foo;
		4	}
3		5
4	// obj=parameter of type 'enum_export_error.Foo' not allowed in function with calling convention 'C'	6	// obj=parameter of type 'enum_export_error.Foo' not allowed in function with calling convention 'C'

doc/langref/error_union_parsing_u64.zig+3-3

...	@@ -26,9 +26,9 @@ pub fn parseU64(buf: []const u8, radix: u8) !u64 {	...	@@ -26,9 +26,9 @@ pub fn parseU64(buf: []const u8, radix: u8) !u64 {
26		26
27	fn charToDigit(c: u8) u8 {	27	fn charToDigit(c: u8) u8 {
28	return switch (c) {	28	return switch (c) {
29	'0' ... '9' => c - '0',	29	'0'...'9' => c - '0',
30	'A' ... 'Z' => c - 'A' + 10,	30	'A'...'Z' => c - 'A' + 10,
31	'a' ... 'z' => c - 'a' + 10,	31	'a'...'z' => c - 'a' + 10,
32	else => maxInt(u8),	32	else => maxInt(u8),
33	};	33	};
34	}	34	}

doc/langref/identifiers.zig+2-2

...	@@ -6,8 +6,8 @@ pub extern "c" fn @"error"() void;	...	@@ -6,8 +6,8 @@ pub extern "c" fn @"error"() void;
6	pub extern "c" fn @"fstat$INODE64"(fd: c.fd_t, buf: *c.Stat) c_int;	6	pub extern "c" fn @"fstat$INODE64"(fd: c.fd_t, buf: *c.Stat) c_int;
7		7
8	const Color = enum {	8	const Color = enum {
9	red,	9	red,
10	@"really red",	10	@"really red",
11	};	11	};
12	const color: Color = .@"really red";	12	const color: Color = .@"really red";
13		13

doc/langref/print.zig+1-1

...	@@ -4,7 +4,7 @@ const a_number: i32 = 1234;	...	@@ -4,7 +4,7 @@ const a_number: i32 = 1234;
4	const a_string = "foobar";	4	const a_string = "foobar";
5		5
6	pub fn main() void {	6	pub fn main() void {
7	print("here is a string: '{s}' here is a number: {}\n", .{a_string, a_number});	7	print("here is a string: '{s}' here is a number: {}\n", .{ a_string, a_number });
8	}	8	}
9		9
10	// exe=succeed	10	// exe=succeed

doc/langref/print_comptime-known_format.zig+1-1

...	@@ -5,7 +5,7 @@ const a_string = "foobar";	...	@@ -5,7 +5,7 @@ const a_string = "foobar";
5	const fmt = "here is a string: '{s}' here is a number: {}\n";	5	const fmt = "here is a string: '{s}' here is a number: {}\n";
6		6
7	pub fn main() void {	7	pub fn main() void {
8	print(fmt, .{a_string, a_number});	8	print(fmt, .{ a_string, a_number });
9	}	9	}
10		10
11	// exe=succeed	11	// exe=succeed

doc/langref/single_value_error_set.zig+1-1

...	@@ -1,3 +1,3 @@	...	@@ -1,3 +1,3 @@
1	const err = (error {FileNotFound}).FileNotFound;	1	const err = (error{FileNotFound}).FileNotFound;
2		2
3	// syntax	3	// syntax

doc/langref/string_literals.zig+10-10

doc/langref/test_call_builtin.zig+1-1

...	@@ -1,7 +1,7 @@	...	@@ -1,7 +1,7 @@
1	const expect = @import("std").testing.expect;	1	const expect = @import("std").testing.expect;
2		2
3	test "noinline function call" {	3	test "noinline function call" {
4	try expect(@call(.auto, add, .{3, 9}) == 12);	4	try expect(@call(.auto, add, .{ 3, 9 }) == 12);
5	}	5	}
6		6
7	fn add(a: i32, b: i32) i32 {	7	fn add(a: i32, b: i32) i32 {

doc/langref/test_coerce_error_subset_to_superset.zig+2-2

...	@@ -1,12 +1,12 @@	...	@@ -1,12 +1,12 @@
1	const std = @import("std");	1	const std = @import("std");
2		2
3	const FileOpenError = error {	3	const FileOpenError = error{
4	AccessDenied,	4	AccessDenied,
5	OutOfMemory,	5	OutOfMemory,
6	FileNotFound,	6	FileNotFound,
7	};	7	};
8		8
9	const AllocationError = error {	9	const AllocationError = error{
10	OutOfMemory,	10	OutOfMemory,
11	};	11	};
12		12

doc/langref/test_coerce_error_superset_to_subset.zig+2-2

...	@@ -1,10 +1,10 @@	...	@@ -1,10 +1,10 @@
1	const FileOpenError = error {	1	const FileOpenError = error{
2	AccessDenied,	2	AccessDenied,
3	OutOfMemory,	3	OutOfMemory,
4	FileNotFound,	4	FileNotFound,
5	};	5	};
6		6
7	const AllocationError = error {	7	const AllocationError = error{
8	OutOfMemory,	8	OutOfMemory,
9	};	9	};
10		10

doc/langref/test_coerce_tuples_arrays.zig+4-4

...	@@ -1,11 +1,11 @@	...	@@ -1,11 +1,11 @@
1	const std = @import("std");	1	const std = @import("std");
2	const expect = std.testing.expect;	2	const expect = std.testing.expect;
3		3
4	const Tuple = struct{ u8, u8 };	4	const Tuple = struct { u8, u8 };
5	test "coercion from homogenous tuple to array" {	5	test "coercion from homogenous tuple to array" {
6	const tuple: Tuple = .{5, 6};	6	const tuple: Tuple = .{ 5, 6 };
7	const array: [2]u8 = tuple;	7	const array: [2]u8 = tuple;
8	_ = array;	8	_ = array;
9	}	9	}
10		10
11	// test	11	// test

doc/langref/test_comptime_evaluation.zig+13-7

 @@ -2,17 +2,23 @@ const expect = @import("std").testing.expect;
 const CmdFn = struct {
     name: []const u8,
-    func: fn(i32) i32,
+    func: fn (i32) i32,
 };
 const cmd_fns = [_]CmdFn{
-    CmdFn {.name = "one", .func = one},
+    CmdFn{ .name = "one", .func = one },
-    CmdFn {.name = "two", .func = two},
+    CmdFn{ .name = "two", .func = two },
-    CmdFn {.name = "three", .func = three},
+    CmdFn{ .name = "three", .func = three },
 };
-fn one(value: i32) i32 { return value + 1; }
+fn one(value: i32) i32 {
-fn two(value: i32) i32 { return value + 2; }
+    return value + 1;
-fn three(value: i32) i32 { return value + 3; }
+}
+fn two(value: i32) i32 {
+    return value + 2;
+}
+fn three(value: i32) i32 {
+    return value + 3;
+}
 fn performFn(comptime prefix_char: u8, start_value: i32) i32 {
     var result: i32 = start_value;

doc/langref/test_errdefer_loop.zig+1-3

 @@ -1,9 +1,7 @@
 const std = @import("std");
 const Allocator = std.mem.Allocator;
-const Foo = struct {
+const Foo = struct { data: *u32 };
-    data: *u32
-};
 fn getData() !u32 {
     return 666;

doc/langref/test_errdefer_loop_leak.zig+2-4

...	@@ -1,9 +1,7 @@	...	@@ -1,9 +1,7 @@
1	const std = @import("std");	1	const std = @import("std");
2	const Allocator = std.mem.Allocator;	2	const Allocator = std.mem.Allocator;
3		3
4	const Foo = struct {	4	const Foo = struct { data: *u32 };
5	data: *u32
6	};
7		5
8	fn getData() !u32 {	6	fn getData() !u32 {
9	return 666;	7	return 666;
...	@@ -19,7 +17,7 @@ fn genFoos(allocator: Allocator, num: usize) ![]Foo {	...	@@ -19,7 +17,7 @@ fn genFoos(allocator: Allocator, num: usize) ![]Foo {
19	errdefer allocator.destroy(foo.data);	17	errdefer allocator.destroy(foo.data);
20		18
21	// The data for the first 3 foos will be leaked	19	// The data for the first 3 foos will be leaked
22	if(i >= 3) return error.TooManyFoos;	20	if (i >= 3) return error.TooManyFoos;
23		21
24	foo.data.* = try getData();	22	foo.data.* = try getData();
25	}	23	}

doc/langref/test_for.zig+2-2

...	@@ -1,7 +1,7 @@	...	@@ -1,7 +1,7 @@
1	const expect = @import("std").testing.expect;	1	const expect = @import("std").testing.expect;
2		2
3	test "for basics" {	3	test "for basics" {
4	const items = [_]i32 { 4, 5, 3, 4, 0 };	4	const items = [_]i32{ 4, 5, 3, 4, 0 };
5	var sum: i32 = 0;	5	var sum: i32 = 0;
6		6
7	// For loops iterate over slices and arrays.	7	// For loops iterate over slices and arrays.
...	@@ -31,7 +31,7 @@ test "for basics" {	...	@@ -31,7 +31,7 @@ test "for basics" {
31		31
32	// To iterate over consecutive integers, use the range syntax.	32	// To iterate over consecutive integers, use the range syntax.
33	// Unbounded range is always a compile error.	33	// Unbounded range is always a compile error.
34	var sum3 : usize = 0;	34	var sum3: usize = 0;
35	for (0..5) \|i\| {	35	for (0..5) \|i\| {
36	sum3 += i;	36	sum3 += i;
37	}	37	}

doc/langref/test_functions.zig+7-3

 @@ -14,7 +14,9 @@ fn add(a: i8, b: i8) i8 {
 // The export specifier makes a function externally visible in the generated
 // object file, and makes it use the C ABI.
-export fn sub(a: i8, b: i8) i8 { return a - b; }
+export fn sub(a: i8, b: i8) i8 {
+    return a - b;
+}
 // The extern specifier is used to declare a function that will be resolved
 // at link time, when linking statically, or at runtime, when linking
 @@ -39,13 +41,15 @@ fn _start() callconv(.Naked) noreturn {
 // The inline calling convention forces a function to be inlined at all call sites.
 // If the function cannot be inlined, it is a compile-time error.
-fn shiftLeftOne(a: u32) callconv(.Inline) u32 {
+inline fn shiftLeftOne(a: u32) u32 {
     return a << 1;
 }
 // The pub specifier allows the function to be visible when importing.
 // Another file can use @import and call sub2
-pub fn sub2(a: i8, b: i8) i8 { return a - b; }
+pub fn sub2(a: i8, b: i8) i8 {
+    return a - b;
+}
 // Function pointers are prefixed with `*const `.
 const Call2Op = *const fn (a: i8, b: i8) i8;

doc/langref/test_inferred_error_sets.zig+1-1

...	@@ -12,7 +12,7 @@ pub fn add_explicit(comptime T: type, a: T, b: T) Error!T {	...	@@ -12,7 +12,7 @@ pub fn add_explicit(comptime T: type, a: T, b: T) Error!T {
12	return ov[0];	12	return ov[0];
13	}	13	}
14		14
15	const Error = error {	15	const Error = error{
16	Overflow,	16	Overflow,
17	};	17	};
18		18

doc/langref/test_inline_for.zig+1-1

...	@@ -1,7 +1,7 @@	...	@@ -1,7 +1,7 @@
1	const expect = @import("std").testing.expect;	1	const expect = @import("std").testing.expect;
2		2
3	test "inline for loop" {	3	test "inline for loop" {
4	const nums = [_]i32{2, 4, 6};	4	const nums = [_]i32{ 2, 4, 6 };
5	var sum: usize = 0;	5	var sum: usize = 0;
6	inline for (nums) \|i\| {	6	inline for (nums) \|i\| {
7	const T = switch (i) {	7	const T = switch (i) {

doc/langref/test_inline_switch_union_tag.zig+1-1

...	@@ -15,7 +15,7 @@ fn getNum(u: U) u32 {	...	@@ -15,7 +15,7 @@ fn getNum(u: U) u32 {
15	return @intFromFloat(num);	15	return @intFromFloat(num);
16	}	16	}
17	return num;	17	return num;
18	}	18	},
19	}	19	}
20	}	20	}
21		21

doc/langref/test_null_terminated_array.zig+2-2

...	@@ -2,7 +2,7 @@ const std = @import("std");	...	@@ -2,7 +2,7 @@ const std = @import("std");
2	const expect = std.testing.expect;	2	const expect = std.testing.expect;
3		3
4	test "0-terminated sentinel array" {	4	test "0-terminated sentinel array" {
5	const array = [_:0]u8 {1, 2, 3, 4};	5	const array = [_:0]u8{ 1, 2, 3, 4 };
6		6
7	try expect(@TypeOf(array) == [4:0]u8);	7	try expect(@TypeOf(array) == [4:0]u8);
8	try expect(array.len == 4);	8	try expect(array.len == 4);
...	@@ -11,7 +11,7 @@ test "0-terminated sentinel array" {	...	@@ -11,7 +11,7 @@ test "0-terminated sentinel array" {
11		11
12	test "extra 0s in 0-terminated sentinel array" {	12	test "extra 0s in 0-terminated sentinel array" {
13	// The sentinel value may appear earlier, but does not influence the compile-time 'len'.	13	// The sentinel value may appear earlier, but does not influence the compile-time 'len'.
14	const array = [_:0]u8 {1, 0, 0, 4};	14	const array = [_:0]u8{ 1, 0, 0, 4 };
15		15
16	try expect(@TypeOf(array) == [4:0]u8);	16	try expect(@TypeOf(array) == [4:0]u8);
17	try expect(array.len == 4);	17	try expect(array.len == 4);

doc/langref/test_struct_result.zig+1-1

...	@@ -1,7 +1,7 @@	...	@@ -1,7 +1,7 @@
1	const std = @import("std");	1	const std = @import("std");
2	const expect = std.testing.expect;	2	const expect = std.testing.expect;
3		3
4	const Point = struct {x: i32, y: i32};	4	const Point = struct { x: i32, y: i32 };
5		5
6	test "anonymous struct literal" {	6	test "anonymous struct literal" {
7	const pt: Point = .{	7	const pt: Point = .{

doc/langref/test_structs.zig+7-8

...	@@ -13,15 +13,14 @@ const Point2 = packed struct {	...	@@ -13,15 +13,14 @@ const Point2 = packed struct {
13	y: f32,	13	y: f32,
14	};	14	};
15		15
16
17	// Declare an instance of a struct.	16	// Declare an instance of a struct.
18	const p = Point {	17	const p = Point{
19	.x = 0.12,	18	.x = 0.12,
20	.y = 0.34,	19	.y = 0.34,
21	};	20	};
22		21
23	// Maybe we're not ready to fill out some of the fields.	22	// Maybe we're not ready to fill out some of the fields.
24	var p2 = Point {	23	var p2 = Point{
25	.x = 0.12,	24	.x = 0.12,
26	.y = undefined,	25	.y = undefined,
27	};	26	};
...	@@ -35,7 +34,7 @@ const Vec3 = struct {	...	@@ -35,7 +34,7 @@ const Vec3 = struct {
35	z: f32,	34	z: f32,
36		35
37	pub fn init(x: f32, y: f32, z: f32) Vec3 {	36	pub fn init(x: f32, y: f32, z: f32) Vec3 {
38	return Vec3 {	37	return Vec3{
39	.x = x,	38	.x = x,
40	.y = y,	39	.y = y,
41	.z = z,	40	.z = z,
...	@@ -69,7 +68,7 @@ test "struct namespaced variable" {	...	@@ -69,7 +68,7 @@ test "struct namespaced variable" {
69	try expect(@sizeOf(Empty) == 0);	68	try expect(@sizeOf(Empty) == 0);
70		69
71	// you can still instantiate an empty struct	70	// you can still instantiate an empty struct
72	const does_nothing = Empty {};	71	const does_nothing = Empty{};
73		72
74	_ = does_nothing;	73	_ = does_nothing;
75	}	74	}
...	@@ -81,7 +80,7 @@ fn setYBasedOnX(x: *f32, y: f32) void {	...	@@ -81,7 +80,7 @@ fn setYBasedOnX(x: *f32, y: f32) void {
81	point.y = y;	80	point.y = y;
82	}	81	}
83	test "field parent pointer" {	82	test "field parent pointer" {
84	var point = Point {	83	var point = Point{
85	.x = 0.1234,	84	.x = 0.1234,
86	.y = 0.5678,	85	.y = 0.5678,
87	};	86	};
...	@@ -100,8 +99,8 @@ fn LinkedList(comptime T: type) type {	...	@@ -100,8 +99,8 @@ fn LinkedList(comptime T: type) type {
100	};	99	};
101		100
102	first: ?*Node,	101	first: ?*Node,
103	last: ?*Node,	102	last: ?*Node,
104	len: usize,	103	len: usize,
105	};	104	};
106	}	105	}
107		106

doc/langref/test_switch_non-exhaustive.zig+1-2

...	@@ -12,8 +12,7 @@ test "switch on non-exhaustive enum" {	...	@@ -12,8 +12,7 @@ test "switch on non-exhaustive enum" {
12	const number = Number.one;	12	const number = Number.one;
13	const result = switch (number) {	13	const result = switch (number) {
14	.one => true,	14	.one => true,
15	.two,	15	.two, .three => false,
16	.three => false,
17	_ => false,	16	_ => false,
18	};	17	};
19	try expect(result);	18	try expect(result);

doc/langref/test_unresolved_comptime_value.zig+1-4

 @@ -5,10 +5,7 @@ test "try to pass a runtime type" {
     foo(false);
 }
 fn foo(condition: bool) void {
-    const result = max(
+    const result = max(if (condition) f32 else u64, 1234, 5678);
-        if (condition) f32 else u64,
-        1234,
-        5678);
     _ = result;
 }

doc/langref/test_while_continue_expression.zig+4-1

 @@ -9,7 +9,10 @@ test "while loop continue expression" {
 test "while loop continue expression, more complicated" {
     var i: usize = 1;
     var j: usize = 1;
-    while (i * j < 2000) : ({ i *= 2; j *= 3; }) {
+    while (i * j < 2000) : ({
+        i *= 2;
+        j *= 3;
+    }) {
         const my_ij = i * j;
         try expect(my_ij < 2000);
     }

doc/langref/values.zig+3-1

...	@@ -39,7 +39,9 @@ pub fn main() void {	...	@@ -39,7 +39,9 @@ pub fn main() void {
39	var number_or_error: anyerror!i32 = error.ArgNotFound;	39	var number_or_error: anyerror!i32 = error.ArgNotFound;
40		40
41	print("\nerror union 1\ntype: {}\nvalue: {!}\n", .{	41	print("\nerror union 1\ntype: {}\nvalue: {!}\n", .{
42	@TypeOf(number_or_error), number_or_error, });	42	@TypeOf(number_or_error),
		43	number_or_error,
		44	});
43		45
44	number_or_error = 1234;	46	number_or_error = 1234;
45		47

lib/std/Build.zig+188-194

 @@ -13,8 +13,7 @@ const Allocator = mem.Allocator;
 const Target = std.Target;
 const process = std.process;
 const EnvMap = std.process.EnvMap;
-const fmt_lib = std.fmt;
+const File = fs.File;
-const File = std.fs.File;
 const Sha256 = std.crypto.hash.sha2.Sha256;
 const Build = @This();
 @@ -149,15 +148,14 @@ const InitializedDepKey = struct {
 const InitializedDepContext = struct {
     allocator: Allocator,
-    pub fn hash(self: @This(), k: InitializedDepKey) u64 {
+    pub fn hash(ctx: @This(), k: InitializedDepKey) u64 {
         var hasher = std.hash.Wyhash.init(0);
         hasher.update(k.build_root_string);
-        hashUserInputOptionsMap(self.allocator, k.user_input_options, &hasher);
+        hashUserInputOptionsMap(ctx.allocator, k.user_input_options, &hasher);
         return hasher.final();
     }
-    pub fn eql(self: @This(), lhs: InitializedDepKey, rhs: InitializedDepKey) bool {
+    pub fn eql(_: @This(), lhs: InitializedDepKey, rhs: InitializedDepKey) bool {
-        _ = self;
         if (!std.mem.eql(u8, lhs.build_root_string, rhs.build_root_string))
             return false;
 @@ -229,7 +227,7 @@ const TypeId = enum {
 };
 const TopLevelStep = struct {
-    pub const base_id = .top_level;
+    pub const base_id: Step.Id = .top_level;
     step: Step,
     description: []const u8,
 @@ -251,8 +249,8 @@ pub fn create(
     const initialized_deps = try arena.create(InitializedDepMap);
     initialized_deps.* = InitializedDepMap.initContext(arena, .{ .allocator = arena });
-    const self = try arena.create(Build);
+    const b = try arena.create(Build);
-    self.* = .{
+    b.* = .{
         .graph = graph,
         .build_root = build_root,
         .cache_root = cache_root,
 @@ -280,17 +278,17 @@ pub fn create(
         .installed_files = ArrayList(InstalledFile).init(arena),
         .install_tls = .{
             .step = Step.init(.{
-                .id = .top_level,
+                .id = TopLevelStep.base_id,
                 .name = "install",
-                .owner = self,
+                .owner = b,
             }),
             .description = "Copy build artifacts to prefix path",
         },
         .uninstall_tls = .{
             .step = Step.init(.{
-                .id = .top_level,
+                .id = TopLevelStep.base_id,
                 .name = "uninstall",
-                .owner = self,
+                .owner = b,
                 .makeFn = makeUninstall,
             }),
             .description = "Remove build artifacts from prefix path",
 @@ -306,10 +304,10 @@ pub fn create(
         .available_deps = available_deps,
         .release_mode = .off,
     };
-    try self.top_level_steps.put(arena, self.install_tls.step.name, &self.install_tls);
+    try b.top_level_steps.put(arena, b.install_tls.step.name, &b.install_tls);
-    try self.top_level_steps.put(arena, self.uninstall_tls.step.name, &self.uninstall_tls);
+    try b.top_level_steps.put(arena, b.uninstall_tls.step.name, &b.uninstall_tls);
-    self.default_step = &self.install_tls.step;
+    b.default_step = &b.install_tls.step;
-    return self;
+    return b;
 }
 fn createChild(
 @@ -340,7 +338,7 @@ fn createChildOnly(
         .allocator = allocator,
         .install_tls = .{
             .step = Step.init(.{
-                .id = .top_level,
+                .id = TopLevelStep.base_id,
                 .name = "install",
                 .owner = child,
             }),
 @@ -348,7 +346,7 @@ fn createChildOnly(
         },
         .uninstall_tls = .{
             .step = Step.init(.{
-                .id = .top_level,
+                .id = TopLevelStep.base_id,
                 .name = "uninstall",
                 .owner = child,
                 .makeFn = makeUninstall,
 @@ -498,8 +496,8 @@ const OrderedUserValue = union(enum) {
         }
     };
-    fn hash(self: OrderedUserValue, hasher: *std.hash.Wyhash) void {
+    fn hash(val: OrderedUserValue, hasher: *std.hash.Wyhash) void {
-        switch (self) {
+        switch (val) {
             .flag => {},
             .scalar => |scalar| hasher.update(scalar),
             // lists are already ordered
 @@ -541,9 +539,9 @@ const OrderedUserInputOption = struct {
     value: OrderedUserValue,
     used: bool,
-    fn hash(self: OrderedUserInputOption, hasher: *std.hash.Wyhash) void {
+    fn hash(opt: OrderedUserInputOption, hasher: *std.hash.Wyhash) void {
-        hasher.update(self.name);
+        hasher.update(opt.name);
-        self.value.hash(hasher);
+        opt.value.hash(hasher);
     }
     fn fromUnordered(allocator: Allocator, user_input_option: UserInputOption) OrderedUserInputOption {
 @@ -593,38 +591,38 @@ fn determineAndApplyInstallPrefix(b: *Build) !void {
 }
 /// This function is intended to be called by lib/build_runner.zig, not a build.zig file.
-pub fn resolveInstallPrefix(self: *Build, install_prefix: ?[]const u8, dir_list: DirList) void {
+pub fn resolveInstallPrefix(b: *Build, install_prefix: ?[]const u8, dir_list: DirList) void {
-    if (self.dest_dir) |dest_dir| {
+    if (b.dest_dir) |dest_dir| {
-        self.install_prefix = install_prefix orelse "/usr";
+        b.install_prefix = install_prefix orelse "/usr";
-        self.install_path = self.pathJoin(&.{ dest_dir, self.install_prefix });
+        b.install_path = b.pathJoin(&.{ dest_dir, b.install_prefix });
     } else {
-        self.install_prefix = install_prefix orelse
+        b.install_prefix = install_prefix orelse
-            (self.build_root.join(self.allocator, &.{"zig-out"}) catch @panic("unhandled error"));
+            (b.build_root.join(b.allocator, &.{"zig-out"}) catch @panic("unhandled error"));
-        self.install_path = self.install_prefix;
+        b.install_path = b.install_prefix;
     }
-    var lib_list = [_][]const u8{ self.install_path, "lib" };
+    var lib_list = [_][]const u8{ b.install_path, "lib" };
-    var exe_list = [_][]const u8{ self.install_path, "bin" };
+    var exe_list = [_][]const u8{ b.install_path, "bin" };
-    var h_list = [_][]const u8{ self.install_path, "include" };
+    var h_list = [_][]const u8{ b.install_path, "include" };
     if (dir_list.lib_dir) |dir| {
-        if (fs.path.isAbsolute(dir)) lib_list[0] = self.dest_dir orelse "";
+        if (fs.path.isAbsolute(dir)) lib_list[0] = b.dest_dir orelse "";
         lib_list[1] = dir;
     }
     if (dir_list.exe_dir) |dir| {
-        if (fs.path.isAbsolute(dir)) exe_list[0] = self.dest_dir orelse "";
+        if (fs.path.isAbsolute(dir)) exe_list[0] = b.dest_dir orelse "";
         exe_list[1] = dir;
     }
     if (dir_list.include_dir) |dir| {
-        if (fs.path.isAbsolute(dir)) h_list[0] = self.dest_dir orelse "";
+        if (fs.path.isAbsolute(dir)) h_list[0] = b.dest_dir orelse "";
         h_list[1] = dir;
     }
-    self.lib_dir = self.pathJoin(&lib_list);
+    b.lib_dir = b.pathJoin(&lib_list);
-    self.exe_dir = self.pathJoin(&exe_list);
+    b.exe_dir = b.pathJoin(&exe_list);
-    self.h_dir = self.pathJoin(&h_list);
+    b.h_dir = b.pathJoin(&h_list);
 }
 /// Create a set of key-value pairs that can be converted into a Zig source
 @@ -632,8 +630,8 @@ pub fn resolveInstallPrefix(self: *Build, install_prefix: ?[]const u8, dir_list:
 /// In other words, this provides a way to expose build.zig values to Zig
 /// source code with `@import`.
 /// Related: `Module.addOptions`.
-pub fn addOptions(self: *Build) *Step.Options {
+pub fn addOptions(b: *Build) *Step.Options {
-    return Step.Options.create(self);
+    return Step.Options.create(b);
 }
 pub const ExecutableOptions = struct {
 @@ -959,9 +957,9 @@ pub fn createModule(b: *Build, options: Module.CreateOptions) *Module {
 /// `addArgs`, and `addArtifactArg`.
 /// Be careful using this function, as it introduces a system dependency.
 /// To run an executable built with zig build, see `Step.Compile.run`.
-pub fn addSystemCommand(self: *Build, argv: []const []const u8) *Step.Run {
+pub fn addSystemCommand(b: *Build, argv: []const []const u8) *Step.Run {
     assert(argv.len >= 1);
-    const run_step = Step.Run.create(self, self.fmt("run {s}", .{argv[0]}));
+    const run_step = Step.Run.create(b, b.fmt("run {s}", .{argv[0]}));
     run_step.addArgs(argv);
     return run_step;
 }
 @@ -1002,20 +1000,20 @@ pub fn addConfigHeader(
 }
 /// Allocator.dupe without the need to handle out of memory.
-pub fn dupe(self: *Build, bytes: []const u8) []u8 {
+pub fn dupe(b: *Build, bytes: []const u8) []u8 {
-    return self.allocator.dupe(u8, bytes) catch @panic("OOM");
+    return b.allocator.dupe(u8, bytes) catch @panic("OOM");
 }
 /// Duplicates an array of strings without the need to handle out of memory.
-pub fn dupeStrings(self: *Build, strings: []const []const u8) [][]u8 {
+pub fn dupeStrings(b: *Build, strings: []const []const u8) [][]u8 {
-    const array = self.allocator.alloc([]u8, strings.len) catch @panic("OOM");
+    const array = b.allocator.alloc([]u8, strings.len) catch @panic("OOM");
-    for (array, strings) |*dest, source| dest.* = self.dupe(source);
+    for (array, strings) |*dest, source| dest.* = b.dupe(source);
     return array;
 }
 /// Duplicates a path and converts all slashes to the OS's canonical path separator.
-pub fn dupePath(self: *Build, bytes: []const u8) []u8 {
+pub fn dupePath(b: *Build, bytes: []const u8) []u8 {
-    const the_copy = self.dupe(bytes);
+    const the_copy = b.dupe(bytes);
     for (the_copy) |*byte| {
         switch (byte.*) {
             '/', '\\' => byte.* = fs.path.sep,
 @@ -1025,8 +1023,8 @@ pub fn dupePath(self: *Build, bytes: []const u8) []u8 {
     return the_copy;
 }
-pub fn addWriteFile(self: *Build, file_path: []const u8, data: []const u8) *Step.WriteFile {
+pub fn addWriteFile(b: *Build, file_path: []const u8, data: []const u8) *Step.WriteFile {
-    const write_file_step = self.addWriteFiles();
+    const write_file_step = b.addWriteFiles();
     _ = write_file_step.add(file_path, data);
     return write_file_step;
 }
 @@ -1041,34 +1039,34 @@ pub fn addWriteFiles(b: *Build) *Step.WriteFile {
     return Step.WriteFile.create(b);
 }
-pub fn addRemoveDirTree(self: *Build, dir_path: []const u8) *Step.RemoveDir {
+pub fn addRemoveDirTree(b: *Build, dir_path: []const u8) *Step.RemoveDir {
-    return Step.RemoveDir.create(self, dir_path);
+    return Step.RemoveDir.create(b, dir_path);
 }
 pub fn addFmt(b: *Build, options: Step.Fmt.Options) *Step.Fmt {
     return Step.Fmt.create(b, options);
 }
-pub fn addTranslateC(self: *Build, options: Step.TranslateC.Options) *Step.TranslateC {
+pub fn addTranslateC(b: *Build, options: Step.TranslateC.Options) *Step.TranslateC {
-    return Step.TranslateC.create(self, options);
+    return Step.TranslateC.create(b, options);
 }
-pub fn getInstallStep(self: *Build) *Step {
+pub fn getInstallStep(b: *Build) *Step {
-    return &self.install_tls.step;
+    return &b.install_tls.step;
 }
-pub fn getUninstallStep(self: *Build) *Step {
+pub fn getUninstallStep(b: *Build) *Step {
-    return &self.uninstall_tls.step;
+    return &b.uninstall_tls.step;
 }
 fn makeUninstall(uninstall_step: *Step, prog_node: *std.Progress.Node) anyerror!void {
     _ = prog_node;
     const uninstall_tls: *TopLevelStep = @fieldParentPtr("step", uninstall_step);
-    const self: *Build = @fieldParentPtr("uninstall_tls", uninstall_tls);
+    const b: *Build = @fieldParentPtr("uninstall_tls", uninstall_tls);
-    for (self.installed_files.items) |installed_file| {
+    for (b.installed_files.items) |installed_file| {
-        const full_path = self.getInstallPath(installed_file.dir, installed_file.path);
+        const full_path = b.getInstallPath(installed_file.dir, installed_file.path);
-        if (self.verbose) {
+        if (b.verbose) {
             log.info("rm {s}", .{full_path});
         }
         fs.cwd().deleteTree(full_path) catch {};
 @@ -1082,13 +1080,13 @@ fn makeUninstall(uninstall_step: *Step, prog_node: *std.Progress.Node) anyerror!
 /// When a project depends on a Zig package as a dependency, it programmatically sets
 /// these options when calling the dependency's build.zig script as a function.
 /// `null` is returned when an option is left to default.
-pub fn option(self: *Build, comptime T: type, name_raw: []const u8, description_raw: []const u8) ?T {
+pub fn option(b: *Build, comptime T: type, name_raw: []const u8, description_raw: []const u8) ?T {
-    const name = self.dupe(name_raw);
+    const name = b.dupe(name_raw);
-    const description = self.dupe(description_raw);
+    const description = b.dupe(description_raw);
     const type_id = comptime typeToEnum(T);
     const enum_options = if (type_id == .@"enum") blk: {
         const fields = comptime std.meta.fields(T);
-        var options = ArrayList([]const u8).initCapacity(self.allocator, fields.len) catch @panic("OOM");
+        var options = ArrayList([]const u8).initCapacity(b.allocator, fields.len) catch @panic("OOM");
         inline for (fields) |field| {
             options.appendAssumeCapacity(field.name);
 @@ -1102,12 +1100,12 @@ pub fn option(self: *Build, comptime T: type, name_raw: []const u8, description_
         .description = description,
         .enum_options = enum_options,
     };
-    if ((self.available_options_map.fetchPut(name, available_option) catch @panic("OOM")) != null) {
+    if ((b.available_options_map.fetchPut(name, available_option) catch @panic("OOM")) != null) {
         panic("Option '{s}' declared twice", .{name});
     }
-    self.available_options_list.append(available_option) catch @panic("OOM");
+    b.available_options_list.append(available_option) catch @panic("OOM");
-    const option_ptr = self.user_input_options.getPtr(name) orelse return null;
+    const option_ptr = b.user_input_options.getPtr(name) orelse return null;
     option_ptr.used = true;
     switch (type_id) {
         .bool => switch (option_ptr.value) {
 @@ -1119,7 +1117,7 @@ pub fn option(self: *Build, comptime T: type, name_raw: []const u8, description_
                     return false;
                 } else {
                     log.err("Expected -D{s} to be a boolean, but received '{s}'", .{ name, s });
-                    self.markInvalidUserInput();
+                    b.markInvalidUserInput();
                     return null;
                 }
             },
 @@ -1127,7 +1125,7 @@ pub fn option(self: *Build, comptime T: type, name_raw: []const u8, description_
                 log.err("Expected -D{s} to be a boolean, but received a {s}.", .{
                     name, @tagName(option_ptr.value),
                 });
-                self.markInvalidUserInput();
+                b.markInvalidUserInput();
                 return null;
             },
         },
 @@ -1136,19 +1134,19 @@ pub fn option(self: *Build, comptime T: type, name_raw: []const u8, description_
                 log.err("Expected -D{s} to be an integer, but received a {s}.", .{
                     name, @tagName(option_ptr.value),
                 });
-                self.markInvalidUserInput();
+                b.markInvalidUserInput();
                 return null;
             },
             .scalar => |s| {
                 const n = std.fmt.parseInt(T, s, 10) catch |err| switch (err) {
                     error.Overflow => {
                         log.err("-D{s} value {s} cannot fit into type {s}.", .{ name, s, @typeName(T) });
-                        self.markInvalidUserInput();
+                        b.markInvalidUserInput();
                         return null;
                     },
                     else => {
                         log.err("Expected -D{s} to be an integer of type {s}.", .{ name, @typeName(T) });
-                        self.markInvalidUserInput();
+                        b.markInvalidUserInput();
                         return null;
                     },
                 };
 @@ -1160,13 +1158,13 @@ pub fn option(self: *Build, comptime T: type, name_raw: []const u8, description_
                 log.err("Expected -D{s} to be a float, but received a {s}.", .{
                     name, @tagName(option_ptr.value),
                 });
-                self.markInvalidUserInput();
+                b.markInvalidUserInput();
                 return null;
             },
             .scalar => |s| {
                 const n = std.fmt.parseFloat(T, s) catch {
                     log.err("Expected -D{s} to be a float of type {s}.", .{ name, @typeName(T) });
-                    self.markInvalidUserInput();
+                    b.markInvalidUserInput();
                     return null;
                 };
                 return n;
 @@ -1177,7 +1175,7 @@ pub fn option(self: *Build, comptime T: type, name_raw: []const u8, description_
                 log.err("Expected -D{s} to be an enum, but received a {s}.", .{
                     name, @tagName(option_ptr.value),
                 });
-                self.markInvalidUserInput();
+                b.markInvalidUserInput();
                 return null;
             },
             .scalar => |s| {
 @@ -1185,7 +1183,7 @@ pub fn option(self: *Build, comptime T: type, name_raw: []const u8, description_
                     return enum_lit;
                 } else {
                     log.err("Expected -D{s} to be of type {s}.", .{ name, @typeName(T) });
-                    self.markInvalidUserInput();
+                    b.markInvalidUserInput();
                     return null;
                 }
             },
 @@ -1195,7 +1193,7 @@ pub fn option(self: *Build, comptime T: type, name_raw: []const u8, description_
                 log.err("Expected -D{s} to be a string, but received a {s}.", .{
                     name, @tagName(option_ptr.value),
                 });
-                self.markInvalidUserInput();
+                b.markInvalidUserInput();
                 return null;
             },
             .scalar => |s| return s,
 @@ -1205,7 +1203,7 @@ pub fn option(self: *Build, comptime T: type, name_raw: []const u8, description_
                 log.err("Expected -D{s} to be an enum, but received a {s}.", .{
                     name, @tagName(option_ptr.value),
                 });
-                self.markInvalidUserInput();
+                b.markInvalidUserInput();
                 return null;
             },
             .scalar => |s| {
 @@ -1213,7 +1211,7 @@ pub fn option(self: *Build, comptime T: type, name_raw: []const u8, description_
                     return build_id;
                 } else |err| {
                     log.err("unable to parse option '-D{s}': {s}", .{ name, @errorName(err) });
-                    self.markInvalidUserInput();
+                    b.markInvalidUserInput();
                     return null;
                 }
             },
 @@ -1223,28 +1221,28 @@ pub fn option(self: *Build, comptime T: type, name_raw: []const u8, description_
                 log.err("Expected -D{s} to be a list, but received a {s}.", .{
                     name, @tagName(option_ptr.value),
                 });
-                self.markInvalidUserInput();
+                b.markInvalidUserInput();
                 return null;
             },
             .scalar => |s| {
-                return self.allocator.dupe([]const u8, &[_][]const u8{s}) catch @panic("OOM");
+                return b.allocator.dupe([]const u8, &[_][]const u8{s}) catch @panic("OOM");
             },
             .list => |lst| return lst.items,
         },
     }
 }
-pub fn step(self: *Build, name: []const u8, description: []const u8) *Step {
+pub fn step(b: *Build, name: []const u8, description: []const u8) *Step {
-    const step_info = self.allocator.create(TopLevelStep) catch @panic("OOM");
+    const step_info = b.allocator.create(TopLevelStep) catch @panic("OOM");
     step_info.* = .{
         .step = Step.init(.{
-            .id = .top_level,
+            .id = TopLevelStep.base_id,
             .name = name,
-            .owner = self,
+            .owner = b,
         }),
-        .description = self.dupe(description),
+        .description = b.dupe(description),
     };
-    const gop = self.top_level_steps.getOrPut(self.allocator, name) catch @panic("OOM");
+    const gop = b.top_level_steps.getOrPut(b.allocator, name) catch @panic("OOM");
     if (gop.found_existing) std.debug.panic("A top-level step with name \"{s}\" already exists", .{name});
     gop.key_ptr.* = step_info.step.name;
 @@ -1406,10 +1404,10 @@ pub fn standardTargetOptionsQueryOnly(b: *Build, args: StandardTargetOptionsArgs
     return args.default_target;
 }
-pub fn addUserInputOption(self: *Build, name_raw: []const u8, value_raw: []const u8) !bool {
+pub fn addUserInputOption(b: *Build, name_raw: []const u8, value_raw: []const u8) !bool {
-    const name = self.dupe(name_raw);
+    const name = b.dupe(name_raw);
-    const value = self.dupe(value_raw);
+    const value = b.dupe(value_raw);
-    const gop = try self.user_input_options.getOrPut(name);
+    const gop = try b.user_input_options.getOrPut(name);
     if (!gop.found_existing) {
         gop.value_ptr.* = UserInputOption{
             .name = name,
 @@ -1423,10 +1421,10 @@ pub fn addUserInputOption(self: *Build, name_raw: []const u8, value_raw: []const
     switch (gop.value_ptr.value) {
         .scalar => |s| {
             // turn it into a list
-            var list = ArrayList([]const u8).init(self.allocator);
+            var list = ArrayList([]const u8).init(b.allocator);
             try list.append(s);
             try list.append(value);
-            try self.user_input_options.put(name, .{
+            try b.user_input_options.put(name, .{
                 .name = name,
                 .value = .{ .list = list },
                 .used = false,
 @@ -1435,7 +1433,7 @@ pub fn addUserInputOption(self: *Build, name_raw: []const u8, value_raw: []const
         .list => |*list| {
             // append to the list
             try list.append(value);
-            try self.user_input_options.put(name, .{
+            try b.user_input_options.put(name, .{
                 .name = name,
                 .value = .{ .list = list.* },
                 .used = false,
 @@ -1454,9 +1452,9 @@ pub fn addUserInputOption(self: *Build, name_raw: []const u8, value_raw: []const
     return false;
 }
-pub fn addUserInputFlag(self: *Build, name_raw: []const u8) !bool {
+pub fn addUserInputFlag(b: *Build, name_raw: []const u8) !bool {
-    const name = self.dupe(name_raw);
+    const name = b.dupe(name_raw);
-    const gop = try self.user_input_options.getOrPut(name);
+    const gop = try b.user_input_options.getOrPut(name);
     if (!gop.found_existing) {
         gop.value_ptr.* = .{
             .name = name,
 @@ -1498,8 +1496,8 @@ fn typeToEnum(comptime T: type) TypeId {
     };
 }
-fn markInvalidUserInput(self: *Build) void {
+fn markInvalidUserInput(b: *Build) void {
-    self.invalid_user_input = true;
+    b.invalid_user_input = true;
 }
 pub fn validateUserInputDidItFail(b: *Build) bool {
 @@ -1532,18 +1530,18 @@ fn printCmd(ally: Allocator, cwd: ?[]const u8, argv: []const []const u8) void {
 /// This creates the install step and adds it to the dependencies of the
 /// top-level install step, using all the default options.
 /// See `addInstallArtifact` for a more flexible function.
-pub fn installArtifact(self: *Build, artifact: *Step.Compile) void {
+pub fn installArtifact(b: *Build, artifact: *Step.Compile) void {
-    self.getInstallStep().dependOn(&self.addInstallArtifact(artifact, .{}).step);
+    b.getInstallStep().dependOn(&b.addInstallArtifact(artifact, .{}).step);
 }
 /// This merely creates the step; it does not add it to the dependencies of the
 /// top-level install step.
 pub fn addInstallArtifact(
-    self: *Build,
+    b: *Build,
     artifact: *Step.Compile,
     options: Step.InstallArtifact.Options,
 ) *Step.InstallArtifact {
-    return Step.InstallArtifact.create(self, artifact, options);
+    return Step.InstallArtifact.create(b, artifact, options);
 }
 ///`dest_rel_path` is relative to prefix path
 @@ -1590,16 +1588,16 @@ pub fn addInstallHeaderFile(b: *Build, source: LazyPath, dest_rel_path: []const
 }
 pub fn addInstallFileWithDir(
-    self: *Build,
+    b: *Build,
     source: LazyPath,
     install_dir: InstallDir,
     dest_rel_path: []const u8,
 ) *Step.InstallFile {
-    return Step.InstallFile.create(self, source, install_dir, dest_rel_path);
+    return Step.InstallFile.create(b, source, install_dir, dest_rel_path);
 }
-pub fn addInstallDirectory(self: *Build, options: Step.InstallDir.Options) *Step.InstallDir {
+pub fn addInstallDirectory(b: *Build, options: Step.InstallDir.Options) *Step.InstallDir {
-    return Step.InstallDir.create(self, options);
+    return Step.InstallDir.create(b, options);
 }
 pub fn addCheckFile(
 @@ -1611,16 +1609,16 @@ pub fn addCheckFile(
 }
 /// deprecated: https://github.com/ziglang/zig/issues/14943
-pub fn pushInstalledFile(self: *Build, dir: InstallDir, dest_rel_path: []const u8) void {
+pub fn pushInstalledFile(b: *Build, dir: InstallDir, dest_rel_path: []const u8) void {
     const file = InstalledFile{
         .dir = dir,
         .path = dest_rel_path,
     };
-    self.installed_files.append(file.dupe(self)) catch @panic("OOM");
+    b.installed_files.append(file.dupe(b)) catch @panic("OOM");
 }
-pub fn truncateFile(self: *Build, dest_path: []const u8) !void {
+pub fn truncateFile(b: *Build, dest_path: []const u8) !void {
-    if (self.verbose) {
+    if (b.verbose) {
         log.info("truncate {s}", .{dest_path});
     }
     const cwd = fs.cwd();
 @@ -1652,50 +1650,54 @@ pub fn path(b: *Build, sub_path: []const u8) LazyPath {
 /// This is low-level implementation details of the build system, not meant to
 /// be called by users' build scripts. Even in the build system itself it is a
 /// code smell to call this function.
-pub fn pathFromRoot(b: *Build, p: []const u8) []u8 {
+pub fn pathFromRoot(b: *Build, sub_path: []const u8) []u8 {
-    return fs.path.resolve(b.allocator, &.{ b.build_root.path orelse ".", p }) catch @panic("OOM");
+    return b.pathResolve(&.{ b.build_root.path orelse ".", sub_path });
 }
-fn pathFromCwd(b: *Build, p: []const u8) []u8 {
+fn pathFromCwd(b: *Build, sub_path: []const u8) []u8 {
     const cwd = process.getCwdAlloc(b.allocator) catch @panic("OOM");
-    return fs.path.resolve(b.allocator, &.{ cwd, p }) catch @panic("OOM");
+    return b.pathResolve(&.{ cwd, sub_path });
 }
-pub fn pathJoin(self: *Build, paths: []const []const u8) []u8 {
+pub fn pathJoin(b: *Build, paths: []const []const u8) []u8 {
-    return fs.path.join(self.allocator, paths) catch @panic("OOM");
+    return fs.path.join(b.allocator, paths) catch @panic("OOM");
 }
-pub fn fmt(self: *Build, comptime format: []const u8, args: anytype) []u8 {
+pub fn pathResolve(b: *Build, paths: []const []const u8) []u8 {
-    return fmt_lib.allocPrint(self.allocator, format, args) catch @panic("OOM");
+    return fs.path.resolve(b.allocator, paths) catch @panic("OOM");
 }
-pub fn findProgram(self: *Build, names: []const []const u8, paths: []const []const u8) ![]const u8 {
+pub fn fmt(b: *Build, comptime format: []const u8, args: anytype) []u8 {
+    return std.fmt.allocPrint(b.allocator, format, args) catch @panic("OOM");
+}
+pub fn findProgram(b: *Build, names: []const []const u8, paths: []const []const u8) ![]const u8 {
     // TODO report error for ambiguous situations
-    const exe_extension = self.host.result.exeFileExt();
+    const exe_extension = b.host.result.exeFileExt();
-    for (self.search_prefixes.items) |search_prefix| {
+    for (b.search_prefixes.items) |search_prefix| {
         for (names) |name| {
             if (fs.path.isAbsolute(name)) {
                 return name;
             }
-            const full_path = self.pathJoin(&.{
+            const full_path = b.pathJoin(&.{
                 search_prefix,
                 "bin",
-                self.fmt("{s}{s}", .{ name, exe_extension }),
+                b.fmt("{s}{s}", .{ name, exe_extension }),
             });
-            return fs.realpathAlloc(self.allocator, full_path) catch continue;
+            return fs.realpathAlloc(b.allocator, full_path) catch continue;
         }
     }
-    if (self.graph.env_map.get("PATH")) |PATH| {
+    if (b.graph.env_map.get("PATH")) |PATH| {
         for (names) |name| {
             if (fs.path.isAbsolute(name)) {
                 return name;
             }
             var it = mem.tokenizeScalar(u8, PATH, fs.path.delimiter);
             while (it.next()) |p| {
-                const full_path = self.pathJoin(&.{
+                const full_path = b.pathJoin(&.{
-                    p, self.fmt("{s}{s}", .{ name, exe_extension }),
+                    p, b.fmt("{s}{s}", .{ name, exe_extension }),
                 });
-                return fs.realpathAlloc(self.allocator, full_path) catch continue;
+                return fs.realpathAlloc(b.allocator, full_path) catch continue;
             }
         }
     }
 @@ -1704,17 +1706,17 @@ pub fn findProgram(self: *Build, names: []const []const u8, paths: []const []con
             return name;
         }
         for (paths) |p| {
-            const full_path = self.pathJoin(&.{
+            const full_path = b.pathJoin(&.{
-                p, self.fmt("{s}{s}", .{ name, exe_extension }),
+                p, b.fmt("{s}{s}", .{ name, exe_extension }),
             });
-            return fs.realpathAlloc(self.allocator, full_path) catch continue;
+            return fs.realpathAlloc(b.allocator, full_path) catch continue;
         }
     }
     return error.FileNotFound;
 }
 pub fn runAllowFail(
-    self: *Build,
+    b: *Build,
     argv: []const []const u8,
     out_code: *u8,
     stderr_behavior: std.ChildProcess.StdIo,
 @@ -1725,18 +1727,18 @@ pub fn runAllowFail(
         return error.ExecNotSupported;
     const max_output_size = 400 * 1024;
-    var child = std.ChildProcess.init(argv, self.allocator);
+    var child = std.ChildProcess.init(argv, b.allocator);
     child.stdin_behavior = .Ignore;
     child.stdout_behavior = .Pipe;
     child.stderr_behavior = stderr_behavior;
-    child.env_map = &self.graph.env_map;
+    child.env_map = &b.graph.env_map;
     try child.spawn();
-    const stdout = child.stdout.?.reader().readAllAlloc(self.allocator, max_output_size) catch {
+    const stdout = child.stdout.?.reader().readAllAlloc(b.allocator, max_output_size) catch {
         return error.ReadFailure;
     };
-    errdefer self.allocator.free(stdout);
+    errdefer b.allocator.free(stdout);
     const term = try child.wait();
     switch (term) {
 @@ -1779,19 +1781,16 @@ pub fn addSearchPrefix(b: *Build, search_prefix: []const u8) void {
     b.search_prefixes.append(b.allocator, b.dupePath(search_prefix)) catch @panic("OOM");
 }
-pub fn getInstallPath(self: *Build, dir: InstallDir, dest_rel_path: []const u8) []const u8 {
+pub fn getInstallPath(b: *Build, dir: InstallDir, dest_rel_path: []const u8) []const u8 {
     assert(!fs.path.isAbsolute(dest_rel_path)); // Install paths must be relative to the prefix
     const base_dir = switch (dir) {
-        .prefix => self.install_path,
+        .prefix => b.install_path,
-        .bin => self.exe_dir,
+        .bin => b.exe_dir,
-        .lib => self.lib_dir,
+        .lib => b.lib_dir,
-        .header => self.h_dir,
+        .header => b.h_dir,
-        .custom => |p| self.pathJoin(&.{ self.install_path, p }),
+        .custom => |p| b.pathJoin(&.{ b.install_path, p }),
     };
-    return fs.path.resolve(
+    return b.pathResolve(&.{ base_dir, dest_rel_path });
-        self.allocator,
-        &[_][]const u8{ base_dir, dest_rel_path },
-    ) catch @panic("OOM");
 }
 pub const Dependency = struct {
 @@ -2092,11 +2091,11 @@ pub const GeneratedFile = struct {
     /// This value must be set in the `fn make()` of the `step` and must not be `null` afterwards.
     path: ?[]const u8 = null,
-    pub fn getPath(self: GeneratedFile) []const u8 {
+    pub fn getPath(gen: GeneratedFile) []const u8 {
-        return self.path orelse std.debug.panic(
+        return gen.step.owner.pathFromRoot(gen.path orelse std.debug.panic(
             "getPath() was called on a GeneratedFile that wasn't built yet. Is there a missing Step dependency on step '{s}'?",
-            .{self.step.name},
+            .{gen.step.name},
-        );
+        ));
     }
 };
 @@ -2170,9 +2169,9 @@ pub const LazyPath = union(enum) {
     },
     /// Deprecated. Call `path` instead.
-    pub fn relative(p: []const u8) LazyPath {
+    pub fn relative(sub_path: []const u8) LazyPath {
         std.log.warn("deprecated. call std.Build.path instead", .{});
-        return .{ .path = p };
+        return .{ .path = sub_path };
     }
     /// Returns a lazy path referring to the directory containing this path.
 @@ -2182,8 +2181,8 @@ pub const LazyPath = union(enum) {
     /// the dirname is not allowed to traverse outside of the build root.
     /// Similarly, if the path is a generated file inside zig-cache,
     /// the dirname is not allowed to traverse outside of zig-cache.
-    pub fn dirname(self: LazyPath) LazyPath {
+    pub fn dirname(lazy_path: LazyPath) LazyPath {
-        return switch (self) {
+        return switch (lazy_path) {
             .generated => |gen| .{ .generated_dirname = .{ .generated = gen, .up = 0 } },
             .generated_dirname => |gen| .{ .generated_dirname = .{ .generated = gen.generated, .up = gen.up + 1 } },
             .src_path => |sp| .{ .src_path = .{
 @@ -2193,20 +2192,20 @@ pub const LazyPath = union(enum) {
                     @panic("misconfigured build script");
                 },
             } },
-            .path => |p| .{
+            .path => |sub_path| .{
-                .path = dirnameAllowEmpty(p) orelse {
+                .path = dirnameAllowEmpty(sub_path) orelse {
                     dumpBadDirnameHelp(null, null, "dirname() attempted to traverse outside the build root\n", .{}) catch {};
                     @panic("misconfigured build script");
                 },
             },
-            .cwd_relative => |p| .{
+            .cwd_relative => |rel_path| .{
-                .cwd_relative = dirnameAllowEmpty(p) orelse {
+                .cwd_relative = dirnameAllowEmpty(rel_path) orelse {
                     // If we get null, it means one of two things:
-                    // - p was absolute, and is now root
+                    // - rel_path was absolute, and is now root
-                    // - p was relative, and is now ""
+                    // - rel_path was relative, and is now ""
                     // In either case, the build script tried to go too far
                     // and we should panic.
-                    if (fs.path.isAbsolute(p)) {
+                    if (fs.path.isAbsolute(rel_path)) {
                         dumpBadDirnameHelp(null, null,
                             \\dirname() attempted to traverse outside the root.
                             \\No more directories left to go up.
 @@ -2237,10 +2236,10 @@ pub const LazyPath = union(enum) {
     /// Returns a string that can be shown to represent the file source.
     /// Either returns the path or `"generated"`.
-    pub fn getDisplayName(self: LazyPath) []const u8 {
+    pub fn getDisplayName(lazy_path: LazyPath) []const u8 {
-        return switch (self) {
+        return switch (lazy_path) {
-            .src_path => |sp| sp.sub_path,
+            .src_path => |src_path| src_path.sub_path,
-            .path, .cwd_relative => |p| p,
+            .path, .cwd_relative => |sub_path| sub_path,
             .generated => "generated",
             .generated_dirname => "generated",
             .dependency => "dependency",
 @@ -2248,8 +2247,8 @@ pub const LazyPath = union(enum) {
     }
     /// Adds dependencies this file source implies to the given step.
-    pub fn addStepDependencies(self: LazyPath, other_step: *Step) void {
+    pub fn addStepDependencies(lazy_path: LazyPath, other_step: *Step) void {
-        switch (self) {
+        switch (lazy_path) {
             .src_path, .path, .cwd_relative, .dependency => {},
             .generated => |gen| other_step.dependOn(gen.step),
             .generated_dirname => |gen| other_step.dependOn(gen.generated.step),
 @@ -2258,8 +2257,8 @@ pub const LazyPath = union(enum) {
     /// Returns an absolute path.
     /// Intended to be used during the make phase only.
-    pub fn getPath(self: LazyPath, src_builder: *Build) []const u8 {
+    pub fn getPath(lazy_path: LazyPath, src_builder: *Build) []const u8 {
-        return getPath2(self, src_builder, null);
+        return getPath2(lazy_path, src_builder, null);
     }
     /// Returns an absolute path.
 @@ -2267,17 +2266,17 @@ pub const LazyPath = union(enum) {
     ///
     /// `asking_step` is only used for debugging purposes; it's the step being
     /// run that is asking for the path.
-    pub fn getPath2(self: LazyPath, src_builder: *Build, asking_step: ?*Step) []const u8 {
+    pub fn getPath2(lazy_path: LazyPath, src_builder: *Build, asking_step: ?*Step) []const u8 {
-        switch (self) {
+        switch (lazy_path) {
             .path => |p| return src_builder.pathFromRoot(p),
             .src_path => |sp| return sp.owner.pathFromRoot(sp.sub_path),
             .cwd_relative => |p| return src_builder.pathFromCwd(p),
-            .generated => |gen| return gen.path orelse {
+            .generated => |gen| return gen.step.owner.pathFromRoot(gen.path orelse {
                 std.debug.getStderrMutex().lock();
                 const stderr = std.io.getStdErr();
                 dumpBadGetPathHelp(gen.step, stderr, src_builder, asking_step) catch {};
                 @panic("misconfigured build script");
-            },
+            }),
             .generated_dirname => |gen| {
                 const cache_root_path = src_builder.cache_root.path orelse
                     (src_builder.cache_root.join(src_builder.allocator, &.{"."}) catch @panic("OOM"));
 @@ -2311,12 +2310,7 @@ pub const LazyPath = union(enum) {
                 }
                 return p;
             },
-            .dependency => |dep| {
+            .dependency => |dep| return dep.dependency.builder.pathFromRoot(dep.sub_path),
-                return dep.dependency.builder.pathJoin(&[_][]const u8{
-                    dep.dependency.builder.build_root.path.?,
-                    dep.sub_path,
-                });
-            },
         }
     }
 @@ -2324,8 +2318,8 @@ pub const LazyPath = union(enum) {
     ///
     /// The `b` parameter is only used for its allocator. All *Build instances
     /// share the same allocator.
-    pub fn dupe(self: LazyPath, b: *Build) LazyPath {
+    pub fn dupe(lazy_path: LazyPath, b: *Build) LazyPath {
-        return switch (self) {
+        return switch (lazy_path) {
             .src_path => |sp| .{ .src_path = .{
                 .owner = sp.owner,
                 .sub_path = sp.owner.dupePath(sp.sub_path),
 @@ -2425,11 +2419,11 @@ pub const InstallDir = union(enum) {
     custom: []const u8,
     /// Duplicates the install directory including the path if set to custom.
-    pub fn dupe(self: InstallDir, builder: *Build) InstallDir {
+    pub fn dupe(dir: InstallDir, builder: *Build) InstallDir {
-        if (self == .custom) {
+        if (dir == .custom) {
-            return .{ .custom = builder.dupe(self.custom) };
+            return .{ .custom = builder.dupe(dir.custom) };
         } else {
-            return self;
+            return dir;
         }
     }
 };
 @@ -2439,10 +2433,10 @@ pub const InstalledFile = struct {
     path: []const u8,
     /// Duplicates the installed file path and directory.
-    pub fn dupe(self: InstalledFile, builder: *Build) InstalledFile {
+    pub fn dupe(file: InstalledFile, builder: *Build) InstalledFile {
         return .{
-            .dir = self.dir.dupe(builder),
+            .dir = file.dir.dupe(builder),
-            .path = builder.dupe(self.path),
+            .path = builder.dupe(file.path),
         };
     }
 };

lib/std/Build/Module.zig+13-18

 @@ -89,10 +89,10 @@ pub const CSourceFile = struct {
     file: LazyPath,
     flags: []const []const u8 = &.{},
-    pub fn dupe(self: CSourceFile, b: *std.Build) CSourceFile {
+    pub fn dupe(file: CSourceFile, b: *std.Build) CSourceFile {
         return .{
-            .file = self.file.dupe(b),
+            .file = file.file.dupe(b),
-            .flags = b.dupeStrings(self.flags),
+            .flags = b.dupeStrings(file.flags),
         };
     }
 };
 @@ -115,12 +115,12 @@ pub const RcSourceFile = struct {
     /// as `/I <resolved path>`.
     include_paths: []const LazyPath = &.{},
-    pub fn dupe(self: RcSourceFile, b: *std.Build) RcSourceFile {
+    pub fn dupe(file: RcSourceFile, b: *std.Build) RcSourceFile {
-        const include_paths = b.allocator.alloc(LazyPath, self.include_paths.len) catch @panic("OOM");
+        const include_paths = b.allocator.alloc(LazyPath, file.include_paths.len) catch @panic("OOM");
-        for (include_paths, self.include_paths) |*dest, lazy_path| dest.* = lazy_path.dupe(b);
+        for (include_paths, file.include_paths) |*dest, lazy_path| dest.* = lazy_path.dupe(b);
         return .{
-            .file = self.file.dupe(b),
+            .file = file.file.dupe(b),
-            .flags = b.dupeStrings(self.flags),
+            .flags = b.dupeStrings(file.flags),
             .include_paths = include_paths,
         };
     }
 @@ -665,24 +665,19 @@ pub fn appendZigProcessFlags(
     for (m.include_dirs.items) |include_dir| {
         switch (include_dir) {
             .path => |include_path| {
-                try zig_args.append("-I");
+                try zig_args.appendSlice(&.{ "-I", include_path.getPath2(b, asking_step) });
-                try zig_args.append(include_path.getPath(b));
             },
             .path_system => |include_path| {
-                try zig_args.append("-isystem");
+                try zig_args.appendSlice(&.{ "-isystem", include_path.getPath2(b, asking_step) });
-                try zig_args.append(include_path.getPath(b));
             },
             .path_after => |include_path| {
-                try zig_args.append("-idirafter");
+                try zig_args.appendSlice(&.{ "-idirafter", include_path.getPath2(b, asking_step) });
-                try zig_args.append(include_path.getPath(b));
             },
             .framework_path => |include_path| {
-                try zig_args.append("-F");
+                try zig_args.appendSlice(&.{ "-F", include_path.getPath2(b, asking_step) });
-                try zig_args.append(include_path.getPath2(b, asking_step));
             },
             .framework_path_system => |include_path| {
-                try zig_args.append("-iframework");
+                try zig_args.appendSlice(&.{ "-iframework", include_path.getPath2(b, asking_step) });
-                try zig_args.append(include_path.getPath2(b, asking_step));
             },
             .other_step => |other| {
                 if (other.generated_h) |header| {

lib/std/Build/Step.zig+3-3

...	@@ -58,7 +58,7 @@ pub const TestResults = struct {	...	@@ -58,7 +58,7 @@ pub const TestResults = struct {
58	}	58	}
59	};	59	};
60		60
61	pub const MakeFn = const fn (self: Step, prog_node: *std.Progress.Node) anyerror!void;	61	pub const MakeFn = const fn (step: Step, prog_node: *std.Progress.Node) anyerror!void;
62		62
63	pub const State = enum {	63	pub const State = enum {
64	precheck_unstarted,	64	precheck_unstarted,
...	@@ -201,8 +201,8 @@ pub fn make(s: Step, prog_node: std.Progress.Node) error{ MakeFailed, MakeSkip	...	@@ -201,8 +201,8 @@ pub fn make(s: Step, prog_node: std.Progress.Node) error{ MakeFailed, MakeSkip
201	}	201	}
202	}	202	}
203		203
204	pub fn dependOn(self: Step, other: Step) void {	204	pub fn dependOn(step: Step, other: Step) void {
205	self.dependencies.append(other) catch @panic("OOM");	205	step.dependencies.append(other) catch @panic("OOM");
206	}	206	}
207		207
208	pub fn getStackTrace(s: *Step) ?std.builtin.StackTrace {	208	pub fn getStackTrace(s: *Step) ?std.builtin.StackTrace {

lib/std/Build/Step/CheckFile.zig+13-13

...	@@ -14,7 +14,7 @@ expected_exact: ?[]const u8,	...	@@ -14,7 +14,7 @@ expected_exact: ?[]const u8,
14	source: std.Build.LazyPath,	14	source: std.Build.LazyPath,
15	max_bytes: usize = 20 * 1024 * 1024,	15	max_bytes: usize = 20 * 1024 * 1024,
16		16
17	pub const base_id = .check_file;	17	pub const base_id: Step.Id = .check_file;
18		18
19	pub const Options = struct {	19	pub const Options = struct {
20	expected_matches: []const []const u8 = &.{},	20	expected_matches: []const []const u8 = &.{},
...	@@ -26,10 +26,10 @@ pub fn create(	...	@@ -26,10 +26,10 @@ pub fn create(
26	source: std.Build.LazyPath,	26	source: std.Build.LazyPath,
27	options: Options,	27	options: Options,
28	) *CheckFile {	28	) *CheckFile {
29	const self = owner.allocator.create(CheckFile) catch @panic("OOM");	29	const check_file = owner.allocator.create(CheckFile) catch @panic("OOM");
30	self.* = .{	30	check_file.* = .{
31	.step = Step.init(.{	31	.step = Step.init(.{
32	.id = .check_file,	32	.id = base_id,
33	.name = "CheckFile",	33	.name = "CheckFile",
34	.owner = owner,	34	.owner = owner,
35	.makeFn = make,	35	.makeFn = make,
...	@@ -38,27 +38,27 @@ pub fn create(	...	@@ -38,27 +38,27 @@ pub fn create(
38	.expected_matches = owner.dupeStrings(options.expected_matches),	38	.expected_matches = owner.dupeStrings(options.expected_matches),
39	.expected_exact = options.expected_exact,	39	.expected_exact = options.expected_exact,
40	};	40	};
41	self.source.addStepDependencies(&self.step);	41	check_file.source.addStepDependencies(&check_file.step);
42	return self;	42	return check_file;
43	}	43	}
44		44
45	pub fn setName(self: *CheckFile, name: []const u8) void {	45	pub fn setName(check_file: *CheckFile, name: []const u8) void {
46	self.step.name = name;	46	check_file.step.name = name;
47	}	47	}
48		48
49	fn make(step: Step, prog_node: std.Progress.Node) !void {	49	fn make(step: Step, prog_node: std.Progress.Node) !void {
50	_ = prog_node;	50	_ = prog_node;
51	const b = step.owner;	51	const b = step.owner;
52	const self: *CheckFile = @fieldParentPtr("step", step);	52	const check_file: *CheckFile = @fieldParentPtr("step", step);
53		53
54	const src_path = self.source.getPath(b);	54	const src_path = check_file.source.getPath2(b, step);
55	const contents = fs.cwd().readFileAlloc(b.allocator, src_path, self.max_bytes) catch \|err\| {	55	const contents = fs.cwd().readFileAlloc(b.allocator, src_path, check_file.max_bytes) catch \|err\| {
56	return step.fail("unable to read '{s}': {s}", .{	56	return step.fail("unable to read '{s}': {s}", .{
57	src_path, @errorName(err),	57	src_path, @errorName(err),
58	});	58	});
59	};	59	};
60		60
61	for (self.expected_matches) \|expected_match\| {	61	for (check_file.expected_matches) \|expected_match\| {
62	if (mem.indexOf(u8, contents, expected_match) == null) {	62	if (mem.indexOf(u8, contents, expected_match) == null) {
63	return step.fail(	63	return step.fail(
64	\\	64	\\
...	@@ -71,7 +71,7 @@ fn make(step: Step, prog_node: std.Progress.Node) !void {	...	@@ -71,7 +71,7 @@ fn make(step: Step, prog_node: std.Progress.Node) !void {
71	}	71	}
72	}	72	}
73		73
74	if (self.expected_exact) \|expected_exact\| {	74	if (check_file.expected_exact) \|expected_exact\| {
75	if (!mem.eql(u8, expected_exact, contents)) {	75	if (!mem.eql(u8, expected_exact, contents)) {
76	return step.fail(	76	return step.fail(
77	\\	77	\\

lib/std/Build/Step/CheckObject.zig+107-107

...	@@ -12,7 +12,7 @@ const CheckObject = @This();	...	@@ -12,7 +12,7 @@ const CheckObject = @This();
12	const Allocator = mem.Allocator;	12	const Allocator = mem.Allocator;
13	const Step = std.Build.Step;	13	const Step = std.Build.Step;
14		14
15	pub const base_id = .check_object;	15	pub const base_id: Step.Id = .check_object;
16		16
17	step: Step,	17	step: Step,
18	source: std.Build.LazyPath,	18	source: std.Build.LazyPath,
...	@@ -26,10 +26,10 @@ pub fn create(	...	@@ -26,10 +26,10 @@ pub fn create(
26	obj_format: std.Target.ObjectFormat,	26	obj_format: std.Target.ObjectFormat,
27	) *CheckObject {	27	) *CheckObject {
28	const gpa = owner.allocator;	28	const gpa = owner.allocator;
29	const self = gpa.create(CheckObject) catch @panic("OOM");	29	const check_object = gpa.create(CheckObject) catch @panic("OOM");
30	self.* = .{	30	check_object.* = .{
31	.step = Step.init(.{	31	.step = Step.init(.{
32	.id = .check_file,	32	.id = base_id,
33	.name = "CheckObject",	33	.name = "CheckObject",
34	.owner = owner,	34	.owner = owner,
35	.makeFn = make,	35	.makeFn = make,
...	@@ -38,8 +38,8 @@ pub fn create(	...	@@ -38,8 +38,8 @@ pub fn create(
38	.checks = std.ArrayList(Check).init(gpa),	38	.checks = std.ArrayList(Check).init(gpa),
39	.obj_format = obj_format,	39	.obj_format = obj_format,
40	};	40	};
41	self.source.addStepDependencies(&self.step);	41	check_object.source.addStepDependencies(&check_object.step);
42	return self;	42	return check_object;
43	}	43	}
44		44
45	const SearchPhrase = struct {	45	const SearchPhrase = struct {
...	@@ -268,36 +268,36 @@ const Check = struct {	...	@@ -268,36 +268,36 @@ const Check = struct {
268	return check;	268	return check;
269	}	269	}
270		270
271	fn extract(self: *Check, phrase: SearchPhrase) void {	271	fn extract(check: *Check, phrase: SearchPhrase) void {
272	self.actions.append(.{	272	check.actions.append(.{
273	.tag = .extract,	273	.tag = .extract,
274	.phrase = phrase,	274	.phrase = phrase,
275	}) catch @panic("OOM");	275	}) catch @panic("OOM");
276	}	276	}
277		277
278	fn exact(self: *Check, phrase: SearchPhrase) void {	278	fn exact(check: *Check, phrase: SearchPhrase) void {
279	self.actions.append(.{	279	check.actions.append(.{
280	.tag = .exact,	280	.tag = .exact,
281	.phrase = phrase,	281	.phrase = phrase,
282	}) catch @panic("OOM");	282	}) catch @panic("OOM");
283	}	283	}
284		284
285	fn contains(self: *Check, phrase: SearchPhrase) void {	285	fn contains(check: *Check, phrase: SearchPhrase) void {
286	self.actions.append(.{	286	check.actions.append(.{
287	.tag = .contains,	287	.tag = .contains,
288	.phrase = phrase,	288	.phrase = phrase,
289	}) catch @panic("OOM");	289	}) catch @panic("OOM");
290	}	290	}
291		291
292	fn notPresent(self: *Check, phrase: SearchPhrase) void {	292	fn notPresent(check: *Check, phrase: SearchPhrase) void {
293	self.actions.append(.{	293	check.actions.append(.{
294	.tag = .not_present,	294	.tag = .not_present,
295	.phrase = phrase,	295	.phrase = phrase,
296	}) catch @panic("OOM");	296	}) catch @panic("OOM");
297	}	297	}
298		298
299	fn computeCmp(self: *Check, phrase: SearchPhrase, expected: ComputeCompareExpected) void {	299	fn computeCmp(check: *Check, phrase: SearchPhrase, expected: ComputeCompareExpected) void {
300	self.actions.append(.{	300	check.actions.append(.{
301	.tag = .compute_cmp,	301	.tag = .compute_cmp,
302	.phrase = phrase,	302	.phrase = phrase,
303	.expected = expected,	303	.expected = expected,
...	@@ -328,246 +328,246 @@ const Check = struct {	...	@@ -328,246 +328,246 @@ const Check = struct {
328	};	328	};
329		329
330	/// Creates a new empty sequence of actions.	330	/// Creates a new empty sequence of actions.
331	fn checkStart(self: *CheckObject, kind: Check.Kind) void {	331	fn checkStart(check_object: *CheckObject, kind: Check.Kind) void {
332	const new_check = Check.create(self.step.owner.allocator, kind);	332	const check = Check.create(check_object.step.owner.allocator, kind);
333	self.checks.append(new_check) catch @panic("OOM");	333	check_object.checks.append(check) catch @panic("OOM");
334	}	334	}
335		335
336	/// Adds an exact match phrase to the latest created Check.	336	/// Adds an exact match phrase to the latest created Check.
337	pub fn checkExact(self: *CheckObject, phrase: []const u8) void {	337	pub fn checkExact(check_object: *CheckObject, phrase: []const u8) void {
338	self.checkExactInner(phrase, null);	338	check_object.checkExactInner(phrase, null);
339	}	339	}
340		340
341	/// Like `checkExact()` but takes an additional argument `LazyPath` which will be	341	/// Like `checkExact()` but takes an additional argument `LazyPath` which will be
342	/// resolved to a full search query in `make()`.	342	/// resolved to a full search query in `make()`.
343	pub fn checkExactPath(self: *CheckObject, phrase: []const u8, lazy_path: std.Build.LazyPath) void {	343	pub fn checkExactPath(check_object: *CheckObject, phrase: []const u8, lazy_path: std.Build.LazyPath) void {
344	self.checkExactInner(phrase, lazy_path);	344	check_object.checkExactInner(phrase, lazy_path);
345	}	345	}
346		346
347	fn checkExactInner(self: *CheckObject, phrase: []const u8, lazy_path: ?std.Build.LazyPath) void {	347	fn checkExactInner(check_object: *CheckObject, phrase: []const u8, lazy_path: ?std.Build.LazyPath) void {
348	assert(self.checks.items.len > 0);	348	assert(check_object.checks.items.len > 0);
349	const last = &self.checks.items[self.checks.items.len - 1];	349	const last = &check_object.checks.items[check_object.checks.items.len - 1];
350	last.exact(.{ .string = self.step.owner.dupe(phrase), .lazy_path = lazy_path });	350	last.exact(.{ .string = check_object.step.owner.dupe(phrase), .lazy_path = lazy_path });
351	}	351	}
352		352
353	/// Adds a fuzzy match phrase to the latest created Check.	353	/// Adds a fuzzy match phrase to the latest created Check.
354	pub fn checkContains(self: *CheckObject, phrase: []const u8) void {	354	pub fn checkContains(check_object: *CheckObject, phrase: []const u8) void {
355	self.checkContainsInner(phrase, null);	355	check_object.checkContainsInner(phrase, null);
356	}	356	}
357		357
358	/// Like `checkContains()` but takes an additional argument `lazy_path` which will be	358	/// Like `checkContains()` but takes an additional argument `lazy_path` which will be
359	/// resolved to a full search query in `make()`.	359	/// resolved to a full search query in `make()`.
360	pub fn checkContainsPath(	360	pub fn checkContainsPath(
361	self: *CheckObject,	361	check_object: *CheckObject,
362	phrase: []const u8,	362	phrase: []const u8,
363	lazy_path: std.Build.LazyPath,	363	lazy_path: std.Build.LazyPath,
364	) void {	364	) void {
365	self.checkContainsInner(phrase, lazy_path);	365	check_object.checkContainsInner(phrase, lazy_path);
366	}	366	}
367		367
368	fn checkContainsInner(self: *CheckObject, phrase: []const u8, lazy_path: ?std.Build.LazyPath) void {	368	fn checkContainsInner(check_object: *CheckObject, phrase: []const u8, lazy_path: ?std.Build.LazyPath) void {
369	assert(self.checks.items.len > 0);	369	assert(check_object.checks.items.len > 0);
370	const last = &self.checks.items[self.checks.items.len - 1];	370	const last = &check_object.checks.items[check_object.checks.items.len - 1];
371	last.contains(.{ .string = self.step.owner.dupe(phrase), .lazy_path = lazy_path });	371	last.contains(.{ .string = check_object.step.owner.dupe(phrase), .lazy_path = lazy_path });
372	}	372	}
373		373
374	/// Adds an exact match phrase with variable extractor to the latest created Check.	374	/// Adds an exact match phrase with variable extractor to the latest created Check.
375	pub fn checkExtract(self: *CheckObject, phrase: []const u8) void {	375	pub fn checkExtract(check_object: *CheckObject, phrase: []const u8) void {
376	self.checkExtractInner(phrase, null);	376	check_object.checkExtractInner(phrase, null);
377	}	377	}
378		378
379	/// Like `checkExtract()` but takes an additional argument `LazyPath` which will be	379	/// Like `checkExtract()` but takes an additional argument `LazyPath` which will be
380	/// resolved to a full search query in `make()`.	380	/// resolved to a full search query in `make()`.
381	pub fn checkExtractLazyPath(self: *CheckObject, phrase: []const u8, lazy_path: std.Build.LazyPath) void {	381	pub fn checkExtractLazyPath(check_object: *CheckObject, phrase: []const u8, lazy_path: std.Build.LazyPath) void {
382	self.checkExtractInner(phrase, lazy_path);	382	check_object.checkExtractInner(phrase, lazy_path);
383	}	383	}
384		384
385	fn checkExtractInner(self: *CheckObject, phrase: []const u8, lazy_path: ?std.Build.LazyPath) void {	385	fn checkExtractInner(check_object: *CheckObject, phrase: []const u8, lazy_path: ?std.Build.LazyPath) void {
386	assert(self.checks.items.len > 0);	386	assert(check_object.checks.items.len > 0);
387	const last = &self.checks.items[self.checks.items.len - 1];	387	const last = &check_object.checks.items[check_object.checks.items.len - 1];
388	last.extract(.{ .string = self.step.owner.dupe(phrase), .lazy_path = lazy_path });	388	last.extract(.{ .string = check_object.step.owner.dupe(phrase), .lazy_path = lazy_path });
389	}	389	}
390		390
391	/// Adds another searched phrase to the latest created Check	391	/// Adds another searched phrase to the latest created Check
392	/// however ensures there is no matching phrase in the output.	392	/// however ensures there is no matching phrase in the output.
393	pub fn checkNotPresent(self: *CheckObject, phrase: []const u8) void {	393	pub fn checkNotPresent(check_object: *CheckObject, phrase: []const u8) void {
394	self.checkNotPresentInner(phrase, null);	394	check_object.checkNotPresentInner(phrase, null);
395	}	395	}
396		396
397	/// Like `checkExtract()` but takes an additional argument `LazyPath` which will be	397	/// Like `checkExtract()` but takes an additional argument `LazyPath` which will be
398	/// resolved to a full search query in `make()`.	398	/// resolved to a full search query in `make()`.
399	pub fn checkNotPresentLazyPath(self: *CheckObject, phrase: []const u8, lazy_path: std.Build.LazyPath) void {	399	pub fn checkNotPresentLazyPath(check_object: *CheckObject, phrase: []const u8, lazy_path: std.Build.LazyPath) void {
400	self.checkNotPresentInner(phrase, lazy_path);	400	check_object.checkNotPresentInner(phrase, lazy_path);
401	}	401	}
402		402
403	fn checkNotPresentInner(self: *CheckObject, phrase: []const u8, lazy_path: ?std.Build.LazyPath) void {	403	fn checkNotPresentInner(check_object: *CheckObject, phrase: []const u8, lazy_path: ?std.Build.LazyPath) void {
404	assert(self.checks.items.len > 0);	404	assert(check_object.checks.items.len > 0);
405	const last = &self.checks.items[self.checks.items.len - 1];	405	const last = &check_object.checks.items[check_object.checks.items.len - 1];
406	last.notPresent(.{ .string = self.step.owner.dupe(phrase), .lazy_path = lazy_path });	406	last.notPresent(.{ .string = check_object.step.owner.dupe(phrase), .lazy_path = lazy_path });
407	}	407	}
408		408
409	/// Creates a new check checking in the file headers (section, program headers, etc.).	409	/// Creates a new check checking in the file headers (section, program headers, etc.).
410	pub fn checkInHeaders(self: *CheckObject) void {	410	pub fn checkInHeaders(check_object: *CheckObject) void {
411	self.checkStart(.headers);	411	check_object.checkStart(.headers);
412	}	412	}
413		413
414	/// Creates a new check checking specifically symbol table parsed and dumped from the object	414	/// Creates a new check checking specifically symbol table parsed and dumped from the object
415	/// file.	415	/// file.
416	pub fn checkInSymtab(self: *CheckObject) void {	416	pub fn checkInSymtab(check_object: *CheckObject) void {
417	const label = switch (self.obj_format) {	417	const label = switch (check_object.obj_format) {
418	.macho => MachODumper.symtab_label,	418	.macho => MachODumper.symtab_label,
419	.elf => ElfDumper.symtab_label,	419	.elf => ElfDumper.symtab_label,
420	.wasm => WasmDumper.symtab_label,	420	.wasm => WasmDumper.symtab_label,
421	.coff => @panic("TODO symtab for coff"),	421	.coff => @panic("TODO symtab for coff"),
422	else => @panic("TODO other file formats"),	422	else => @panic("TODO other file formats"),
423	};	423	};
424	self.checkStart(.symtab);	424	check_object.checkStart(.symtab);
425	self.checkExact(label);	425	check_object.checkExact(label);
426	}	426	}
427		427
428	/// Creates a new check checking specifically dyld rebase opcodes contents parsed and dumped	428	/// Creates a new check checking specifically dyld rebase opcodes contents parsed and dumped
429	/// from the object file.	429	/// from the object file.
430	/// This check is target-dependent and applicable to MachO only.	430	/// This check is target-dependent and applicable to MachO only.
431	pub fn checkInDyldRebase(self: *CheckObject) void {	431	pub fn checkInDyldRebase(check_object: *CheckObject) void {
432	const label = switch (self.obj_format) {	432	const label = switch (check_object.obj_format) {
433	.macho => MachODumper.dyld_rebase_label,	433	.macho => MachODumper.dyld_rebase_label,
434	else => @panic("Unsupported target platform"),	434	else => @panic("Unsupported target platform"),
435	};	435	};
436	self.checkStart(.dyld_rebase);	436	check_object.checkStart(.dyld_rebase);
437	self.checkExact(label);	437	check_object.checkExact(label);
438	}	438	}
439		439
440	/// Creates a new check checking specifically dyld bind opcodes contents parsed and dumped	440	/// Creates a new check checking specifically dyld bind opcodes contents parsed and dumped
441	/// from the object file.	441	/// from the object file.
442	/// This check is target-dependent and applicable to MachO only.	442	/// This check is target-dependent and applicable to MachO only.
443	pub fn checkInDyldBind(self: *CheckObject) void {	443	pub fn checkInDyldBind(check_object: *CheckObject) void {
444	const label = switch (self.obj_format) {	444	const label = switch (check_object.obj_format) {
445	.macho => MachODumper.dyld_bind_label,	445	.macho => MachODumper.dyld_bind_label,
446	else => @panic("Unsupported target platform"),	446	else => @panic("Unsupported target platform"),
447	};	447	};
448	self.checkStart(.dyld_bind);	448	check_object.checkStart(.dyld_bind);
449	self.checkExact(label);	449	check_object.checkExact(label);
450	}	450	}
451		451
452	/// Creates a new check checking specifically dyld weak bind opcodes contents parsed and dumped	452	/// Creates a new check checking specifically dyld weak bind opcodes contents parsed and dumped
453	/// from the object file.	453	/// from the object file.
454	/// This check is target-dependent and applicable to MachO only.	454	/// This check is target-dependent and applicable to MachO only.
455	pub fn checkInDyldWeakBind(self: *CheckObject) void {	455	pub fn checkInDyldWeakBind(check_object: *CheckObject) void {
456	const label = switch (self.obj_format) {	456	const label = switch (check_object.obj_format) {
457	.macho => MachODumper.dyld_weak_bind_label,	457	.macho => MachODumper.dyld_weak_bind_label,
458	else => @panic("Unsupported target platform"),	458	else => @panic("Unsupported target platform"),
459	};	459	};
460	self.checkStart(.dyld_weak_bind);	460	check_object.checkStart(.dyld_weak_bind);
461	self.checkExact(label);	461	check_object.checkExact(label);
462	}	462	}
463		463
464	/// Creates a new check checking specifically dyld lazy bind opcodes contents parsed and dumped	464	/// Creates a new check checking specifically dyld lazy bind opcodes contents parsed and dumped
465	/// from the object file.	465	/// from the object file.
466	/// This check is target-dependent and applicable to MachO only.	466	/// This check is target-dependent and applicable to MachO only.
467	pub fn checkInDyldLazyBind(self: *CheckObject) void {	467	pub fn checkInDyldLazyBind(check_object: *CheckObject) void {
468	const label = switch (self.obj_format) {	468	const label = switch (check_object.obj_format) {
469	.macho => MachODumper.dyld_lazy_bind_label,	469	.macho => MachODumper.dyld_lazy_bind_label,
470	else => @panic("Unsupported target platform"),	470	else => @panic("Unsupported target platform"),
471	};	471	};
472	self.checkStart(.dyld_lazy_bind);	472	check_object.checkStart(.dyld_lazy_bind);
473	self.checkExact(label);	473	check_object.checkExact(label);
474	}	474	}
475		475
476	/// Creates a new check checking specifically exports info contents parsed and dumped	476	/// Creates a new check checking specifically exports info contents parsed and dumped
477	/// from the object file.	477	/// from the object file.
478	/// This check is target-dependent and applicable to MachO only.	478	/// This check is target-dependent and applicable to MachO only.
479	pub fn checkInExports(self: *CheckObject) void {	479	pub fn checkInExports(check_object: *CheckObject) void {
480	const label = switch (self.obj_format) {	480	const label = switch (check_object.obj_format) {
481	.macho => MachODumper.exports_label,	481	.macho => MachODumper.exports_label,
482	else => @panic("Unsupported target platform"),	482	else => @panic("Unsupported target platform"),
483	};	483	};
484	self.checkStart(.exports);	484	check_object.checkStart(.exports);
485	self.checkExact(label);	485	check_object.checkExact(label);
486	}	486	}
487		487
488	/// Creates a new check checking specifically indirect symbol table parsed and dumped	488	/// Creates a new check checking specifically indirect symbol table parsed and dumped
489	/// from the object file.	489	/// from the object file.
490	/// This check is target-dependent and applicable to MachO only.	490	/// This check is target-dependent and applicable to MachO only.
491	pub fn checkInIndirectSymtab(self: *CheckObject) void {	491	pub fn checkInIndirectSymtab(check_object: *CheckObject) void {
492	const label = switch (self.obj_format) {	492	const label = switch (check_object.obj_format) {
493	.macho => MachODumper.indirect_symtab_label,	493	.macho => MachODumper.indirect_symtab_label,
494	else => @panic("Unsupported target platform"),	494	else => @panic("Unsupported target platform"),
495	};	495	};
496	self.checkStart(.indirect_symtab);	496	check_object.checkStart(.indirect_symtab);
497	self.checkExact(label);	497	check_object.checkExact(label);
498	}	498	}
499		499
500	/// Creates a new check checking specifically dynamic symbol table parsed and dumped from the object	500	/// Creates a new check checking specifically dynamic symbol table parsed and dumped from the object
501	/// file.	501	/// file.
502	/// This check is target-dependent and applicable to ELF only.	502	/// This check is target-dependent and applicable to ELF only.
503	pub fn checkInDynamicSymtab(self: *CheckObject) void {	503	pub fn checkInDynamicSymtab(check_object: *CheckObject) void {
504	const label = switch (self.obj_format) {	504	const label = switch (check_object.obj_format) {
505	.elf => ElfDumper.dynamic_symtab_label,	505	.elf => ElfDumper.dynamic_symtab_label,
506	else => @panic("Unsupported target platform"),	506	else => @panic("Unsupported target platform"),
507	};	507	};
508	self.checkStart(.dynamic_symtab);	508	check_object.checkStart(.dynamic_symtab);
509	self.checkExact(label);	509	check_object.checkExact(label);
510	}	510	}
511		511
512	/// Creates a new check checking specifically dynamic section parsed and dumped from the object	512	/// Creates a new check checking specifically dynamic section parsed and dumped from the object
513	/// file.	513	/// file.
514	/// This check is target-dependent and applicable to ELF only.	514	/// This check is target-dependent and applicable to ELF only.
515	pub fn checkInDynamicSection(self: *CheckObject) void {	515	pub fn checkInDynamicSection(check_object: *CheckObject) void {
516	const label = switch (self.obj_format) {	516	const label = switch (check_object.obj_format) {
517	.elf => ElfDumper.dynamic_section_label,	517	.elf => ElfDumper.dynamic_section_label,
518	else => @panic("Unsupported target platform"),	518	else => @panic("Unsupported target platform"),
519	};	519	};
520	self.checkStart(.dynamic_section);	520	check_object.checkStart(.dynamic_section);
521	self.checkExact(label);	521	check_object.checkExact(label);
522	}	522	}
523		523
524	/// Creates a new check checking specifically symbol table parsed and dumped from the archive	524	/// Creates a new check checking specifically symbol table parsed and dumped from the archive
525	/// file.	525	/// file.
526	pub fn checkInArchiveSymtab(self: *CheckObject) void {	526	pub fn checkInArchiveSymtab(check_object: *CheckObject) void {
527	const label = switch (self.obj_format) {	527	const label = switch (check_object.obj_format) {
528	.elf => ElfDumper.archive_symtab_label,	528	.elf => ElfDumper.archive_symtab_label,
529	else => @panic("TODO other file formats"),	529	else => @panic("TODO other file formats"),
530	};	530	};
531	self.checkStart(.archive_symtab);	531	check_object.checkStart(.archive_symtab);
532	self.checkExact(label);	532	check_object.checkExact(label);
533	}	533	}
534		534
535	pub fn dumpSection(self: *CheckObject, name: [:0]const u8) void {	535	pub fn dumpSection(check_object: *CheckObject, name: [:0]const u8) void {
536	const new_check = Check.dumpSection(self.step.owner.allocator, name);	536	const check = Check.dumpSection(check_object.step.owner.allocator, name);
537	self.checks.append(new_check) catch @panic("OOM");	537	check_object.checks.append(check) catch @panic("OOM");
538	}	538	}
539		539
540	/// Creates a new standalone, singular check which allows running simple binary operations	540	/// Creates a new standalone, singular check which allows running simple binary operations
541	/// on the extracted variables. It will then compare the reduced program with the value of	541	/// on the extracted variables. It will then compare the reduced program with the value of
542	/// the expected variable.	542	/// the expected variable.
543	pub fn checkComputeCompare(	543	pub fn checkComputeCompare(
544	self: *CheckObject,	544	check_object: *CheckObject,
545	program: []const u8,	545	program: []const u8,
546	expected: ComputeCompareExpected,	546	expected: ComputeCompareExpected,
547	) void {	547	) void {
548	var new_check = Check.create(self.step.owner.allocator, .compute_compare);	548	var check = Check.create(check_object.step.owner.allocator, .compute_compare);
549	new_check.computeCmp(.{ .string = self.step.owner.dupe(program) }, expected);	549	check.computeCmp(.{ .string = check_object.step.owner.dupe(program) }, expected);
550	self.checks.append(new_check) catch @panic("OOM");	550	check_object.checks.append(check) catch @panic("OOM");
551	}	551	}
552		552
553	fn make(step: Step, prog_node: std.Progress.Node) !void {	553	fn make(step: Step, prog_node: std.Progress.Node) !void {
554	_ = prog_node;	554	_ = prog_node;
555	const b = step.owner;	555	const b = step.owner;
556	const gpa = b.allocator;	556	const gpa = b.allocator;
557	const self: *CheckObject = @fieldParentPtr("step", step);	557	const check_object: *CheckObject = @fieldParentPtr("step", step);
558		558
559	const src_path = self.source.getPath(b);	559	const src_path = check_object.source.getPath2(b, step);
560	const contents = fs.cwd().readFileAllocOptions(	560	const contents = fs.cwd().readFileAllocOptions(
561	gpa,	561	gpa,
562	src_path,	562	src_path,
563	self.max_bytes,	563	check_object.max_bytes,
564	null,	564	null,
565	@alignOf(u64),	565	@alignOf(u64),
566	null,	566	null,
567	) catch \|err\| return step.fail("unable to read '{s}': {s}", .{ src_path, @errorName(err) });	567	) catch \|err\| return step.fail("unable to read '{s}': {s}", .{ src_path, @errorName(err) });
568		568
569	var vars = std.StringHashMap(u64).init(gpa);	569	var vars = std.StringHashMap(u64).init(gpa);
570	for (self.checks.items) \|chk\| {	570	for (check_object.checks.items) \|chk\| {
571	if (chk.kind == .compute_compare) {	571	if (chk.kind == .compute_compare) {
572	assert(chk.actions.items.len == 1);	572	assert(chk.actions.items.len == 1);
573	const act = chk.actions.items[0];	573	const act = chk.actions.items[0];
...	@@ -587,7 +587,7 @@ fn make(step: Step, prog_node: std.Progress.Node) !void {	...	@@ -587,7 +587,7 @@ fn make(step: Step, prog_node: std.Progress.Node) !void {
587	continue;	587	continue;
588	}	588	}
589		589
590	const output = switch (self.obj_format) {	590	const output = switch (check_object.obj_format) {
591	.macho => try MachODumper.parseAndDump(step, chk, contents),	591	.macho => try MachODumper.parseAndDump(step, chk, contents),
592	.elf => try ElfDumper.parseAndDump(step, chk, contents),	592	.elf => try ElfDumper.parseAndDump(step, chk, contents),
593	.coff => return step.fail("TODO coff parser", .{}),	593	.coff => return step.fail("TODO coff parser", .{}),
...	@@ -1597,8 +1597,8 @@ const MachODumper = struct {	...	@@ -1597,8 +1597,8 @@ const MachODumper = struct {
1597	},	1597	},
1598	},	1598	},
1599		1599
1600	inline fn rankByTag(self: Export) u3 {	1600	inline fn rankByTag(@"export": Export) u3 {
1601	return switch (self.tag) {	1601	return switch (@"export".tag) {
1602	.@"export" => 1,	1602	.@"export" => 1,
1603	.reexport => 2,	1603	.reexport => 2,
1604	.stub_resolver => 3,	1604	.stub_resolver => 3,

lib/std/Build/Step/Compile.zig+350-351

 @@ -263,10 +263,10 @@ pub const HeaderInstallation = union(enum) {
         source: LazyPath,
         dest_rel_path: []const u8,
-        pub fn dupe(self: File, b: *std.Build) File {
+        pub fn dupe(file: File, b: *std.Build) File {
             return .{
-                .source = self.source.dupe(b),
+                .source = file.source.dupe(b),
-                .dest_rel_path = b.dupePath(self.dest_rel_path),
+                .dest_rel_path = b.dupePath(file.dest_rel_path),
             };
         }
     };
 @@ -284,31 +284,31 @@ pub const HeaderInstallation = union(enum) {
             /// `exclude_extensions` takes precedence over `include_extensions`.
             include_extensions: ?[]const []const u8 = &.{".h"},
-            pub fn dupe(self: Directory.Options, b: *std.Build) Directory.Options {
+            pub fn dupe(opts: Directory.Options, b: *std.Build) Directory.Options {
                 return .{
-                    .exclude_extensions = b.dupeStrings(self.exclude_extensions),
+                    .exclude_extensions = b.dupeStrings(opts.exclude_extensions),
-                    .include_extensions = if (self.include_extensions) |incs| b.dupeStrings(incs) else null,
+                    .include_extensions = if (opts.include_extensions) |incs| b.dupeStrings(incs) else null,
                 };
             }
         };
-        pub fn dupe(self: Directory, b: *std.Build) Directory {
+        pub fn dupe(dir: Directory, b: *std.Build) Directory {
             return .{
-                .source = self.source.dupe(b),
+                .source = dir.source.dupe(b),
-                .dest_rel_path = b.dupePath(self.dest_rel_path),
+                .dest_rel_path = b.dupePath(dir.dest_rel_path),
-                .options = self.options.dupe(b),
+                .options = dir.options.dupe(b),
             };
         }
     };
-    pub fn getSource(self: HeaderInstallation) LazyPath {
+    pub fn getSource(installation: HeaderInstallation) LazyPath {
-        return switch (self) {
+        return switch (installation) {
             inline .file, .directory => |x| x.source,
         };
     }
-    pub fn dupe(self: HeaderInstallation, b: *std.Build) HeaderInstallation {
+    pub fn dupe(installation: HeaderInstallation, b: *std.Build) HeaderInstallation {
-        return switch (self) {
+        return switch (installation) {
             .file => |f| .{ .file = f.dupe(b) },
             .directory => |d| .{ .directory = d.dupe(b) },
         };
 @@ -354,8 +354,8 @@ pub fn create(owner: *std.Build, options: Options) *Compile {
         .version = options.version,
     }) catch @panic("OOM");
-    const self = owner.allocator.create(Compile) catch @panic("OOM");
+    const compile = owner.allocator.create(Compile) catch @panic("OOM");
-    self.* = .{
+    compile.* = .{
         .root_module = undefined,
         .verbose_link = false,
         .verbose_cc = false,
 @@ -398,57 +398,57 @@ pub fn create(owner: *std.Build, options: Options) *Compile {
         .use_lld = options.use_lld,
     };
-    self.root_module.init(owner, options.root_module, self);
+    compile.root_module.init(owner, options.root_module, compile);
     if (options.zig_lib_dir) |lp| {
-        self.zig_lib_dir = lp.dupe(self.step.owner);
+        compile.zig_lib_dir = lp.dupe(compile.step.owner);
-        lp.addStepDependencies(&self.step);
+        lp.addStepDependencies(&compile.step);
     }
     if (options.test_runner) |lp| {
-        self.test_runner = lp.dupe(self.step.owner);
+        compile.test_runner = lp.dupe(compile.step.owner);
-        lp.addStepDependencies(&self.step);
+        lp.addStepDependencies(&compile.step);
     }
     // Only the PE/COFF format has a Resource Table which is where the manifest
     // gets embedded, so for any other target the manifest file is just ignored.
     if (target.ofmt == .coff) {
         if (options.win32_manifest) |lp| {
-            self.win32_manifest = lp.dupe(self.step.owner);
+            compile.win32_manifest = lp.dupe(compile.step.owner);
-            lp.addStepDependencies(&self.step);
+            lp.addStepDependencies(&compile.step);
         }
     }
-    if (self.kind == .lib) {
+    if (compile.kind == .lib) {
-        if (self.linkage != null and self.linkage.? == .static) {
+        if (compile.linkage != null and compile.linkage.? == .static) {
-            self.out_lib_filename = self.out_filename;
+            compile.out_lib_filename = compile.out_filename;
-        } else if (self.version) |version| {
+        } else if (compile.version) |version| {
             if (target.isDarwin()) {
-                self.major_only_filename = owner.fmt("lib{s}.{d}.dylib", .{
+                compile.major_only_filename = owner.fmt("lib{s}.{d}.dylib", .{
-                    self.name,
+                    compile.name,
                     version.major,
                 });
-                self.name_only_filename = owner.fmt("lib{s}.dylib", .{self.name});
+                compile.name_only_filename = owner.fmt("lib{s}.dylib", .{compile.name});
-                self.out_lib_filename = self.out_filename;
+                compile.out_lib_filename = compile.out_filename;
             } else if (target.os.tag == .windows) {
-                self.out_lib_filename = owner.fmt("{s}.lib", .{self.name});
+                compile.out_lib_filename = owner.fmt("{s}.lib", .{compile.name});
             } else {
-                self.major_only_filename = owner.fmt("lib{s}.so.{d}", .{ self.name, version.major });
+                compile.major_only_filename = owner.fmt("lib{s}.so.{d}", .{ compile.name, version.major });
-                self.name_only_filename = owner.fmt("lib{s}.so", .{self.name});
+                compile.name_only_filename = owner.fmt("lib{s}.so", .{compile.name});
-                self.out_lib_filename = self.out_filename;
+                compile.out_lib_filename = compile.out_filename;
             }
         } else {
             if (target.isDarwin()) {
-                self.out_lib_filename = self.out_filename;
+                compile.out_lib_filename = compile.out_filename;
             } else if (target.os.tag == .windows) {
-                self.out_lib_filename = owner.fmt("{s}.lib", .{self.name});
+                compile.out_lib_filename = owner.fmt("{s}.lib", .{compile.name});
             } else {
-                self.out_lib_filename = self.out_filename;
+                compile.out_lib_filename = compile.out_filename;
             }
         }
     }
-    return self;
+    return compile;
 }
 /// Marks the specified header for installation alongside this artifact.
 @@ -545,38 +545,38 @@ pub fn addObjCopy(cs: *Compile, options: Step.ObjCopy.Options) *Step.ObjCopy {
     return b.addObjCopy(cs.getEmittedBin(), copy);
 }
-pub fn checkObject(self: *Compile) *Step.CheckObject {
+pub fn checkObject(compile: *Compile) *Step.CheckObject {
-    return Step.CheckObject.create(self.step.owner, self.getEmittedBin(), self.rootModuleTarget().ofmt);
+    return Step.CheckObject.create(compile.step.owner, compile.getEmittedBin(), compile.rootModuleTarget().ofmt);
 }
 /// deprecated: use `setLinkerScript`
 pub const setLinkerScriptPath = setLinkerScript;
-pub fn setLinkerScript(self: *Compile, source: LazyPath) void {
+pub fn setLinkerScript(compile: *Compile, source: LazyPath) void {
-    const b = self.step.owner;
+    const b = compile.step.owner;
-    self.linker_script = source.dupe(b);
+    compile.linker_script = source.dupe(b);
-    source.addStepDependencies(&self.step);
+    source.addStepDependencies(&compile.step);
 }
-pub fn setVersionScript(self: *Compile, source: LazyPath) void {
+pub fn setVersionScript(compile: *Compile, source: LazyPath) void {
-    const b = self.step.owner;
+    const b = compile.step.owner;
-    self.version_script = source.dupe(b);
+    compile.version_script = source.dupe(b);
-    source.addStepDependencies(&self.step);
+    source.addStepDependencies(&compile.step);
 }
-pub fn forceUndefinedSymbol(self: *Compile, symbol_name: []const u8) void {
+pub fn forceUndefinedSymbol(compile: *Compile, symbol_name: []const u8) void {
-    const b = self.step.owner;
+    const b = compile.step.owner;
-    self.force_undefined_symbols.put(b.dupe(symbol_name), {}) catch @panic("OOM");
+    compile.force_undefined_symbols.put(b.dupe(symbol_name), {}) catch @panic("OOM");
 }
 /// Returns whether the library, executable, or object depends on a particular system library.
 /// Includes transitive dependencies.
-pub fn dependsOnSystemLibrary(self: *const Compile, name: []const u8) bool {
+pub fn dependsOnSystemLibrary(compile: *const Compile, name: []const u8) bool {
     var is_linking_libc = false;
     var is_linking_libcpp = false;
-    var it = self.root_module.iterateDependencies(self, true);
+    var dep_it = compile.root_module.iterateDependencies(compile, true);
-    while (it.next()) |module| {
+    while (dep_it.next()) |module| {
         for (module.link_objects.items) |link_object| {
             switch (link_object) {
                 .system_lib => |lib| if (mem.eql(u8, lib.name, name)) return true,
 @@ -587,31 +587,31 @@ pub fn dependsOnSystemLibrary(self: *const Compile, name: []const u8) bool {
         is_linking_libcpp = is_linking_libcpp or module.link_libcpp == true;
     }
-    if (self.rootModuleTarget().is_libc_lib_name(name)) {
+    if (compile.rootModuleTarget().is_libc_lib_name(name)) {
         return is_linking_libc;
     }
-    if (self.rootModuleTarget().is_libcpp_lib_name(name)) {
+    if (compile.rootModuleTarget().is_libcpp_lib_name(name)) {
         return is_linking_libcpp;
     }
     return false;
 }
-pub fn isDynamicLibrary(self: *const Compile) bool {
+pub fn isDynamicLibrary(compile: *const Compile) bool {
-    return self.kind == .lib and self.linkage == .dynamic;
+    return compile.kind == .lib and compile.linkage == .dynamic;
 }
-pub fn isStaticLibrary(self: *const Compile) bool {
+pub fn isStaticLibrary(compile: *const Compile) bool {
-    return self.kind == .lib and self.linkage != .dynamic;
+    return compile.kind == .lib and compile.linkage != .dynamic;
 }
-pub fn isDll(self: *Compile) bool {
+pub fn isDll(compile: *Compile) bool {
-    return self.isDynamicLibrary() and self.rootModuleTarget().os.tag == .windows;
+    return compile.isDynamicLibrary() and compile.rootModuleTarget().os.tag == .windows;
 }
-pub fn producesPdbFile(self: *Compile) bool {
+pub fn producesPdbFile(compile: *Compile) bool {
-    const target = self.rootModuleTarget();
+    const target = compile.rootModuleTarget();
     // TODO: Is this right? Isn't PDB for *any* PE/COFF file?
     // TODO: just share this logic with the compiler, silly!
     switch (target.os.tag) {
 @@ -619,24 +619,24 @@ pub fn producesPdbFile(self: *Compile) bool {
         else => return false,
     }
     if (target.ofmt == .c) return false;
-    if (self.root_module.strip == true or
+    if (compile.root_module.strip == true or
-        (self.root_module.strip == null and self.root_module.optimize == .ReleaseSmall))
+        (compile.root_module.strip == null and compile.root_module.optimize == .ReleaseSmall))
     {
         return false;
     }
-    return self.isDynamicLibrary() or self.kind == .exe or self.kind == .@"test";
+    return compile.isDynamicLibrary() or compile.kind == .exe or compile.kind == .@"test";
 }
-pub fn producesImplib(self: *Compile) bool {
+pub fn producesImplib(compile: *Compile) bool {
-    return self.isDll();
+    return compile.isDll();
 }
-pub fn linkLibC(self: *Compile) void {
+pub fn linkLibC(compile: *Compile) void {
-    self.root_module.link_libc = true;
+    compile.root_module.link_libc = true;
 }
-pub fn linkLibCpp(self: *Compile) void {
+pub fn linkLibCpp(compile: *Compile) void {
-    self.root_module.link_libcpp = true;
+    compile.root_module.link_libcpp = true;
 }
 /// Deprecated. Use `c.root_module.addCMacro`.
 @@ -651,8 +651,8 @@ const PkgConfigResult = struct {
 /// Run pkg-config for the given library name and parse the output, returning the arguments
 /// that should be passed to zig to link the given library.
-fn runPkgConfig(self: *Compile, lib_name: []const u8) !PkgConfigResult {
+fn runPkgConfig(compile: *Compile, lib_name: []const u8) !PkgConfigResult {
-    const b = self.step.owner;
+    const b = compile.step.owner;
     const pkg_name = match: {
         // First we have to map the library name to pkg config name. Unfortunately,
         // there are several examples where this is not straightforward:
 @@ -717,30 +717,30 @@ fn runPkgConfig(self: *Compile, lib_name: []const u8) !PkgConfigResult {
     var zig_libs = ArrayList([]const u8).init(b.allocator);
     defer zig_libs.deinit();
-    var it = mem.tokenizeAny(u8, stdout, " \r\n\t");
+    var arg_it = mem.tokenizeAny(u8, stdout, " \r\n\t");
-    while (it.next()) |tok| {
+    while (arg_it.next()) |arg| {
-        if (mem.eql(u8, tok, "-I")) {
+        if (mem.eql(u8, arg, "-I")) {
-            const dir = it.next() orelse return error.PkgConfigInvalidOutput;
+            const dir = arg_it.next() orelse return error.PkgConfigInvalidOutput;
             try zig_cflags.appendSlice(&[_][]const u8{ "-I", dir });
-        } else if (mem.startsWith(u8, tok, "-I")) {
+        } else if (mem.startsWith(u8, arg, "-I")) {
-            try zig_cflags.append(tok);
+            try zig_cflags.append(arg);
-        } else if (mem.eql(u8, tok, "-L")) {
+        } else if (mem.eql(u8, arg, "-L")) {
-            const dir = it.next() orelse return error.PkgConfigInvalidOutput;
+            const dir = arg_it.next() orelse return error.PkgConfigInvalidOutput;
             try zig_libs.appendSlice(&[_][]const u8{ "-L", dir });
-        } else if (mem.startsWith(u8, tok, "-L")) {
+        } else if (mem.startsWith(u8, arg, "-L")) {
-            try zig_libs.append(tok);
+            try zig_libs.append(arg);
-        } else if (mem.eql(u8, tok, "-l")) {
+        } else if (mem.eql(u8, arg, "-l")) {
-            const lib = it.next() orelse return error.PkgConfigInvalidOutput;
+            const lib = arg_it.next() orelse return error.PkgConfigInvalidOutput;
             try zig_libs.appendSlice(&[_][]const u8{ "-l", lib });
-        } else if (mem.startsWith(u8, tok, "-l")) {
+        } else if (mem.startsWith(u8, arg, "-l")) {
-            try zig_libs.append(tok);
+            try zig_libs.append(arg);
-        } else if (mem.eql(u8, tok, "-D")) {
+        } else if (mem.eql(u8, arg, "-D")) {
-            const macro = it.next() orelse return error.PkgConfigInvalidOutput;
+            const macro = arg_it.next() orelse return error.PkgConfigInvalidOutput;
             try zig_cflags.appendSlice(&[_][]const u8{ "-D", macro });
-        } else if (mem.startsWith(u8, tok, "-D")) {
+        } else if (mem.startsWith(u8, arg, "-D")) {
-            try zig_cflags.append(tok);
+            try zig_cflags.append(arg);
         } else if (b.debug_pkg_config) {
-            return self.step.fail("unknown pkg-config flag '{s}'", .{tok});
+            return compile.step.fail("unknown pkg-config flag '{s}'", .{arg});
         }
     }
 @@ -750,16 +750,16 @@ fn runPkgConfig(self: *Compile, lib_name: []const u8) !PkgConfigResult {
     };
 }
-pub fn linkSystemLibrary(self: *Compile, name: []const u8) void {
+pub fn linkSystemLibrary(compile: *Compile, name: []const u8) void {
-    return self.root_module.linkSystemLibrary(name, .{});
+    return compile.root_module.linkSystemLibrary(name, .{});
 }
 pub fn linkSystemLibrary2(
-    self: *Compile,
+    compile: *Compile,
     name: []const u8,
     options: Module.LinkSystemLibraryOptions,
 ) void {
-    return self.root_module.linkSystemLibrary(name, options);
+    return compile.root_module.linkSystemLibrary(name, options);
 }
 pub fn linkFramework(c: *Compile, name: []const u8) void {
 @@ -777,155 +777,155 @@ pub fn linkFrameworkWeak(c: *Compile, name: []const u8) void {
 }
 /// Handy when you have many C/C++ source files and want them all to have the same flags.
-pub fn addCSourceFiles(self: *Compile, options: Module.AddCSourceFilesOptions) void {
+pub fn addCSourceFiles(compile: *Compile, options: Module.AddCSourceFilesOptions) void {
-    self.root_module.addCSourceFiles(options);
+    compile.root_module.addCSourceFiles(options);
 }
-pub fn addCSourceFile(self: *Compile, source: Module.CSourceFile) void {
+pub fn addCSourceFile(compile: *Compile, source: Module.CSourceFile) void {
-    self.root_module.addCSourceFile(source);
+    compile.root_module.addCSourceFile(source);
 }
 /// Resource files must have the extension `.rc`.
 /// Can be called regardless of target. The .rc file will be ignored
 /// if the target object format does not support embedded resources.
-pub fn addWin32ResourceFile(self: *Compile, source: Module.RcSourceFile) void {
+pub fn addWin32ResourceFile(compile: *Compile, source: Module.RcSourceFile) void {
-    self.root_module.addWin32ResourceFile(source);
+    compile.root_module.addWin32ResourceFile(source);
 }
-pub fn setVerboseLink(self: *Compile, value: bool) void {
+pub fn setVerboseLink(compile: *Compile, value: bool) void {
-    self.verbose_link = value;
+    compile.verbose_link = value;
 }
-pub fn setVerboseCC(self: *Compile, value: bool) void {
+pub fn setVerboseCC(compile: *Compile, value: bool) void {
-    self.verbose_cc = value;
+    compile.verbose_cc = value;
 }
-pub fn setLibCFile(self: *Compile, libc_file: ?LazyPath) void {
+pub fn setLibCFile(compile: *Compile, libc_file: ?LazyPath) void {
-    const b = self.step.owner;
+    const b = compile.step.owner;
-    self.libc_file = if (libc_file) |f| f.dupe(b) else null;
+    compile.libc_file = if (libc_file) |f| f.dupe(b) else null;
 }
-fn getEmittedFileGeneric(self: *Compile, output_file: *?*GeneratedFile) LazyPath {
+fn getEmittedFileGeneric(compile: *Compile, output_file: *?*GeneratedFile) LazyPath {
     if (output_file.*) |g| {
         return .{ .generated = g };
     }
-    const arena = self.step.owner.allocator;
+    const arena = compile.step.owner.allocator;
     const generated_file = arena.create(GeneratedFile) catch @panic("OOM");
-    generated_file.* = .{ .step = &self.step };
+    generated_file.* = .{ .step = &compile.step };
     output_file.* = generated_file;
     return .{ .generated = generated_file };
 }
 /// Returns the path to the directory that contains the emitted binary file.
-pub fn getEmittedBinDirectory(self: *Compile) LazyPath {
+pub fn getEmittedBinDirectory(compile: *Compile) LazyPath {
-    _ = self.getEmittedBin();
+    _ = compile.getEmittedBin();
-    return self.getEmittedFileGeneric(&self.emit_directory);
+    return compile.getEmittedFileGeneric(&compile.emit_directory);
 }
 /// Returns the path to the generated executable, library or object file.
 /// To run an executable built with zig build, use `run`, or create an install step and invoke it.
-pub fn getEmittedBin(self: *Compile) LazyPath {
+pub fn getEmittedBin(compile: *Compile) LazyPath {
-    return self.getEmittedFileGeneric(&self.generated_bin);
+    return compile.getEmittedFileGeneric(&compile.generated_bin);
 }
 /// Returns the path to the generated import library.
 /// This function can only be called for libraries.
-pub fn getEmittedImplib(self: *Compile) LazyPath {
+pub fn getEmittedImplib(compile: *Compile) LazyPath {
-    assert(self.kind == .lib);
+    assert(compile.kind == .lib);
-    return self.getEmittedFileGeneric(&self.generated_implib);
+    return compile.getEmittedFileGeneric(&compile.generated_implib);
 }
 /// Returns the path to the generated header file.
 /// This function can only be called for libraries or objects.
-pub fn getEmittedH(self: *Compile) LazyPath {
+pub fn getEmittedH(compile: *Compile) LazyPath {
-    assert(self.kind != .exe and self.kind != .@"test");
+    assert(compile.kind != .exe and compile.kind != .@"test");
-    return self.getEmittedFileGeneric(&self.generated_h);
+    return compile.getEmittedFileGeneric(&compile.generated_h);
 }
 /// Returns the generated PDB file.
 /// If the compilation does not produce a PDB file, this causes a FileNotFound error
 /// at build time.
-pub fn getEmittedPdb(self: *Compile) LazyPath {
+pub fn getEmittedPdb(compile: *Compile) LazyPath {
-    _ = self.getEmittedBin();
+    _ = compile.getEmittedBin();
-    return self.getEmittedFileGeneric(&self.generated_pdb);
+    return compile.getEmittedFileGeneric(&compile.generated_pdb);
 }
 /// Returns the path to the generated documentation directory.
-pub fn getEmittedDocs(self: *Compile) LazyPath {
+pub fn getEmittedDocs(compile: *Compile) LazyPath {
-    return self.getEmittedFileGeneric(&self.generated_docs);
+    return compile.getEmittedFileGeneric(&compile.generated_docs);
 }
 /// Returns the path to the generated assembly code.
-pub fn getEmittedAsm(self: *Compile) LazyPath {
+pub fn getEmittedAsm(compile: *Compile) LazyPath {
-    return self.getEmittedFileGeneric(&self.generated_asm);
+    return compile.getEmittedFileGeneric(&compile.generated_asm);
 }
 /// Returns the path to the generated LLVM IR.
-pub fn getEmittedLlvmIr(self: *Compile) LazyPath {
+pub fn getEmittedLlvmIr(compile: *Compile) LazyPath {
-    return self.getEmittedFileGeneric(&self.generated_llvm_ir);
+    return compile.getEmittedFileGeneric(&compile.generated_llvm_ir);
 }
 /// Returns the path to the generated LLVM BC.
-pub fn getEmittedLlvmBc(self: *Compile) LazyPath {
+pub fn getEmittedLlvmBc(compile: *Compile) LazyPath {
-    return self.getEmittedFileGeneric(&self.generated_llvm_bc);
+    return compile.getEmittedFileGeneric(&compile.generated_llvm_bc);
 }
-pub fn addAssemblyFile(self: *Compile, source: LazyPath) void {
+pub fn addAssemblyFile(compile: *Compile, source: LazyPath) void {
-    self.root_module.addAssemblyFile(source);
+    compile.root_module.addAssemblyFile(source);
 }
-pub fn addObjectFile(self: *Compile, source: LazyPath) void {
+pub fn addObjectFile(compile: *Compile, source: LazyPath) void {
-    self.root_module.addObjectFile(source);
+    compile.root_module.addObjectFile(source);
 }
-pub fn addObject(self: *Compile, object: *Compile) void {
+pub fn addObject(compile: *Compile, object: *Compile) void {
-    self.root_module.addObject(object);
+    compile.root_module.addObject(object);
 }
-pub fn linkLibrary(self: *Compile, library: *Compile) void {
+pub fn linkLibrary(compile: *Compile, library: *Compile) void {
-    self.root_module.linkLibrary(library);
+    compile.root_module.linkLibrary(library);
 }
-pub fn addAfterIncludePath(self: *Compile, lazy_path: LazyPath) void {
+pub fn addAfterIncludePath(compile: *Compile, lazy_path: LazyPath) void {
-    self.root_module.addAfterIncludePath(lazy_path);
+    compile.root_module.addAfterIncludePath(lazy_path);
 }
-pub fn addSystemIncludePath(self: *Compile, lazy_path: LazyPath) void {
+pub fn addSystemIncludePath(compile: *Compile, lazy_path: LazyPath) void {
-    self.root_module.addSystemIncludePath(lazy_path);
+    compile.root_module.addSystemIncludePath(lazy_path);
 }
-pub fn addIncludePath(self: *Compile, lazy_path: LazyPath) void {
+pub fn addIncludePath(compile: *Compile, lazy_path: LazyPath) void {
-    self.root_module.addIncludePath(lazy_path);
+    compile.root_module.addIncludePath(lazy_path);
 }
-pub fn addConfigHeader(self: *Compile, config_header: *Step.ConfigHeader) void {
+pub fn addConfigHeader(compile: *Compile, config_header: *Step.ConfigHeader) void {
-    self.root_module.addConfigHeader(config_header);
+    compile.root_module.addConfigHeader(config_header);
 }
-pub fn addLibraryPath(self: *Compile, directory_path: LazyPath) void {
+pub fn addLibraryPath(compile: *Compile, directory_path: LazyPath) void {
-    self.root_module.addLibraryPath(directory_path);
+    compile.root_module.addLibraryPath(directory_path);
 }
-pub fn addRPath(self: *Compile, directory_path: LazyPath) void {
+pub fn addRPath(compile: *Compile, directory_path: LazyPath) void {
-    self.root_module.addRPath(directory_path);
+    compile.root_module.addRPath(directory_path);
 }
-pub fn addSystemFrameworkPath(self: *Compile, directory_path: LazyPath) void {
+pub fn addSystemFrameworkPath(compile: *Compile, directory_path: LazyPath) void {
-    self.root_module.addSystemFrameworkPath(directory_path);
+    compile.root_module.addSystemFrameworkPath(directory_path);
 }
-pub fn addFrameworkPath(self: *Compile, directory_path: LazyPath) void {
+pub fn addFrameworkPath(compile: *Compile, directory_path: LazyPath) void {
-    self.root_module.addFrameworkPath(directory_path);
+    compile.root_module.addFrameworkPath(directory_path);
 }
-pub fn setExecCmd(self: *Compile, args: []const ?[]const u8) void {
+pub fn setExecCmd(compile: *Compile, args: []const ?[]const u8) void {
-    const b = self.step.owner;
+    const b = compile.step.owner;
-    assert(self.kind == .@"test");
+    assert(compile.kind == .@"test");
     const duped_args = b.allocator.alloc(?[]u8, args.len) catch @panic("OOM");
     for (args, 0..) |arg, i| {
         duped_args[i] = if (arg) |a| b.dupe(a) else null;
     }
-    self.exec_cmd_args = duped_args;
+    compile.exec_cmd_args = duped_args;
 }
 const CliNamedModules = struct {
 @@ -937,42 +937,42 @@ const CliNamedModules = struct {
     /// It will help here to have both a mapping from module to name and a set
     /// of all the currently-used names.
     fn init(arena: Allocator, root_module: *Module) Allocator.Error!CliNamedModules {
-        var self: CliNamedModules = .{
+        var compile: CliNamedModules = .{
             .modules = .{},
             .names = .{},
         };
-        var it = root_module.iterateDependencies(null, false);
+        var dep_it = root_module.iterateDependencies(null, false);
         {
-            const item = it.next().?;
+            const item = dep_it.next().?;
             assert(root_module == item.module);
-            try self.modules.put(arena, root_module, {});
+            try compile.modules.put(arena, root_module, {});
-            try self.names.put(arena, "root", {});
+            try compile.names.put(arena, "root", {});
         }
-        while (it.next()) |item| {
+        while (dep_it.next()) |item| {
             var name = item.name;
             var n: usize = 0;
             while (true) {
-                const gop = try self.names.getOrPut(arena, name);
+                const gop = try compile.names.getOrPut(arena, name);
                 if (!gop.found_existing) {
-                    try self.modules.putNoClobber(arena, item.module, {});
+                    try compile.modules.putNoClobber(arena, item.module, {});
                     break;
                 }
                 name = try std.fmt.allocPrint(arena, "{s}{d}", .{ item.name, n });
                 n += 1;
             }
         }
-        return self;
+        return compile;
     }
 };
-fn getGeneratedFilePath(self: *Compile, comptime tag_name: []const u8, asking_step: ?*Step) []const u8 {
+fn getGeneratedFilePath(compile: *Compile, comptime tag_name: []const u8, asking_step: ?*Step) []const u8 {
-    const maybe_path: ?*GeneratedFile = @field(self, tag_name);
+    const maybe_path: ?*GeneratedFile = @field(compile, tag_name);
     const generated_file = maybe_path orelse {
         std.debug.getStderrMutex().lock();
         const stderr = std.io.getStdErr();
-        std.Build.dumpBadGetPathHelp(&self.step, stderr, self.step.owner, asking_step) catch {};
+        std.Build.dumpBadGetPathHelp(&compile.step, stderr, compile.step.owner, asking_step) catch {};
         @panic("missing emit option for " ++ tag_name);
     };
 @@ -981,7 +981,7 @@ fn getGeneratedFilePath(self: *Compile, comptime tag_name: []const u8, asking_st
         std.debug.getStderrMutex().lock();
         const stderr = std.io.getStdErr();
-        std.Build.dumpBadGetPathHelp(&self.step, stderr, self.step.owner, asking_step) catch {};
+        std.Build.dumpBadGetPathHelp(&compile.step, stderr, compile.step.owner, asking_step) catch {};
         @panic(tag_name ++ " is null. Is there a missing step dependency?");
     };
 @@ -992,14 +992,14 @@ fn getGeneratedFilePath(self: *Compile, comptime tag_name: []const u8, asking_st
 fn make(step: *Step, prog_node: *std.Progress.Node) !void {
     const b = step.owner;
     const arena = b.allocator;
-    const self: *Compile = @fieldParentPtr("step", step);
+    const compile: *Compile = @fieldParentPtr("step", step);
     var zig_args = ArrayList([]const u8).init(arena);
     defer zig_args.deinit();
     try zig_args.append(b.graph.zig_exe);
-    const cmd = switch (self.kind) {
+    const cmd = switch (compile.kind) {
         .lib => "build-lib",
         .exe => "build-exe",
         .obj => "build-obj",
 @@ -1011,14 +1011,14 @@ fn make(step: *Step, prog_node: *std.Progress.Node) !void {
         try zig_args.append(try std.fmt.allocPrint(arena, "-freference-trace={d}", .{some}));
     }
-    try addFlag(&zig_args, "llvm", self.use_llvm);
+    try addFlag(&zig_args, "llvm", compile.use_llvm);
-    try addFlag(&zig_args, "lld", self.use_lld);
+    try addFlag(&zig_args, "lld", compile.use_lld);
-    if (self.root_module.resolved_target.?.query.ofmt) |ofmt| {
+    if (compile.root_module.resolved_target.?.query.ofmt) |ofmt| {
         try zig_args.append(try std.fmt.allocPrint(arena, "-ofmt={s}", .{@tagName(ofmt)}));
     }
-    switch (self.entry) {
+    switch (compile.entry) {
         .default => {},
         .disabled => try zig_args.append("-fno-entry"),
         .enabled => try zig_args.append("-fentry"),
 @@ -1028,14 +1028,14 @@ fn make(step: *Step, prog_node: *std.Progress.Node) !void {
     }
     {
-        var it = self.force_undefined_symbols.keyIterator();
+        var symbol_it = compile.force_undefined_symbols.keyIterator();
-        while (it.next()) |symbol_name| {
+        while (symbol_it.next()) |symbol_name| {
             try zig_args.append("--force_undefined");
             try zig_args.append(symbol_name.*);
         }
     }
-    if (self.stack_size) |stack_size| {
+    if (compile.stack_size) |stack_size| {
         try zig_args.append("--stack");
         try zig_args.append(try std.fmt.allocPrint(arena, "{}", .{stack_size}));
     }
 @@ -1053,47 +1053,44 @@ fn make(step: *Step, prog_node: *std.Progress.Node) !void {
         var prev_preferred_link_mode: std.builtin.LinkMode = .dynamic;
         // Track the number of positional arguments so that a nice error can be
         // emitted if there is nothing to link.
-        var total_linker_objects: usize = @intFromBool(self.root_module.root_source_file != null);
+        var total_linker_objects: usize = @intFromBool(compile.root_module.root_source_file != null);
         {
             // Fully recursive iteration including dynamic libraries to detect
             // libc and libc++ linkage.
-            var it = self.root_module.iterateDependencies(self, true);
+            var dep_it = compile.root_module.iterateDependencies(compile, true);
-            while (it.next()) |key| {
+            while (dep_it.next()) |key| {
-                if (key.module.link_libc == true) self.is_linking_libc = true;
+                if (key.module.link_libc == true) compile.is_linking_libc = true;
-                if (key.module.link_libcpp == true) self.is_linking_libcpp = true;
+                if (key.module.link_libcpp == true) compile.is_linking_libcpp = true;
             }
         }
-        var cli_named_modules = try CliNamedModules.init(arena, &self.root_module);
+        var cli_named_modules = try CliNamedModules.init(arena, &compile.root_module);
         // For this loop, don't chase dynamic libraries because their link
         // objects are already linked.
-        var it = self.root_module.iterateDependencies(self, false);
+        var dep_it = compile.root_module.iterateDependencies(compile, false);
-        while (it.next()) |key| {
-            const module = key.module;
-            const compile = key.compile.?;
+        while (dep_it.next()) |dep| {
             // While walking transitive dependencies, if a given link object is
             // already included in a library, it should not redundantly be
             // placed on the linker line of the dependee.
-            const my_responsibility = compile == self;
+            const my_responsibility = dep.compile.? == compile;
-            const already_linked = !my_responsibility and compile.isDynamicLibrary();
+            const already_linked = !my_responsibility and dep.compile.?.isDynamicLibrary();
             // Inherit dependencies on darwin frameworks.
             if (!already_linked) {
-                for (module.frameworks.keys(), module.frameworks.values()) |name, info| {
+                for (dep.module.frameworks.keys(), dep.module.frameworks.values()) |name, info| {
                     try frameworks.put(arena, name, info);
                 }
             }
             // Inherit dependencies on system libraries and static libraries.
-            for (module.link_objects.items) |link_object| {
+            for (dep.module.link_objects.items) |link_object| {
                 switch (link_object) {
                     .static_path => |static_path| {
                         if (my_responsibility) {
-                            try zig_args.append(static_path.getPath2(module.owner, step));
+                            try zig_args.append(static_path.getPath2(dep.module.owner, step));
                             total_linker_objects += 1;
                         }
                     },
 @@ -1111,7 +1108,7 @@ fn make(step: *Step, prog_node: *std.Progress.Node) !void {
                         if ((system_lib.search_strategy != prev_search_strategy or
                             system_lib.preferred_link_mode != prev_preferred_link_mode) and
-                            self.linkage != .static)
+                            compile.linkage != .static)
                         {
                             switch (system_lib.search_strategy) {
                                 .no_fallback => switch (system_lib.preferred_link_mode) {
 @@ -1139,7 +1136,7 @@ fn make(step: *Step, prog_node: *std.Progress.Node) !void {
                         switch (system_lib.use_pkg_config) {
                             .no => try zig_args.append(b.fmt("{s}{s}", .{ prefix, system_lib.name })),
                             .yes, .force => {
-                                if (self.runPkgConfig(system_lib.name)) |result| {
+                                if (compile.runPkgConfig(system_lib.name)) |result| {
                                     try zig_args.appendSlice(result.cflags);
                                     try zig_args.appendSlice(result.libs);
                                     try seen_system_libs.put(arena, system_lib.name, result.cflags);
 @@ -1174,9 +1171,10 @@ fn make(step: *Step, prog_node: *std.Progress.Node) !void {
                             .exe => return step.fail("cannot link with an executable build artifact", .{}),
                             .@"test" => return step.fail("cannot link with a test", .{}),
                             .obj => {
-                                const included_in_lib_or_obj = !my_responsibility and (compile.kind == .lib or compile.kind == .obj);
+                                const included_in_lib_or_obj = !my_responsibility and
+                                    (dep.compile.?.kind == .lib or dep.compile.?.kind == .obj);
                                 if (!already_linked and !included_in_lib_or_obj) {
-                                    try zig_args.append(other.getEmittedBin().getPath(b));
+                                    try zig_args.append(other.getEmittedBin().getPath2(b, step));
                                     total_linker_objects += 1;
                                 }
                             },
 @@ -1184,7 +1182,7 @@ fn make(step: *Step, prog_node: *std.Progress.Node) !void {
                                 const other_produces_implib = other.producesImplib();
                                 const other_is_static = other_produces_implib or other.isStaticLibrary();
-                                if (self.isStaticLibrary() and other_is_static) {
+                                if (compile.isStaticLibrary() and other_is_static) {
                                     // Avoid putting a static library inside a static library.
                                     break :l;
                                 }
 @@ -1193,15 +1191,15 @@ fn make(step: *Step, prog_node: *std.Progress.Node) !void {
                                 // For everything else, we directly link
                                 // against the library file.
                                 const full_path_lib = if (other_produces_implib)
-                                    other.getGeneratedFilePath("generated_implib", &self.step)
+                                    other.getGeneratedFilePath("generated_implib", &compile.step)
                                 else
-                                    other.getGeneratedFilePath("generated_bin", &self.step);
+                                    other.getGeneratedFilePath("generated_bin", &compile.step);
                                 try zig_args.append(full_path_lib);
                                 total_linker_objects += 1;
                                 if (other.linkage == .dynamic and
-                                    self.rootModuleTarget().os.tag != .windows)
+                                    compile.rootModuleTarget().os.tag != .windows)
                                 {
                                     if (fs.path.dirname(full_path_lib)) |dirname| {
                                         try zig_args.append("-rpath");
 @@ -1219,7 +1217,7 @@ fn make(step: *Step, prog_node: *std.Progress.Node) !void {
                             try zig_args.append("--");
                             prev_has_cflags = false;
                         }
-                        try zig_args.append(asm_file.getPath2(module.owner, step));
+                        try zig_args.append(asm_file.getPath2(dep.module.owner, step));
                         total_linker_objects += 1;
                     },
 @@ -1240,7 +1238,7 @@ fn make(step: *Step, prog_node: *std.Progress.Node) !void {
                             try zig_args.append("--");
                             prev_has_cflags = true;
                         }
-                        try zig_args.append(c_source_file.file.getPath2(module.owner, step));
+                        try zig_args.append(c_source_file.file.getPath2(dep.module.owner, step));
                         total_linker_objects += 1;
                     },
 @@ -1262,7 +1260,7 @@ fn make(step: *Step, prog_node: *std.Progress.Node) !void {
                             prev_has_cflags = true;
                         }
-                        const root_path = c_source_files.root.getPath2(module.owner, step);
+                        const root_path = c_source_files.root.getPath2(dep.module.owner, step);
                         for (c_source_files.files) |file| {
                             try zig_args.append(b.pathJoin(&.{ root_path, file }));
                         }
 @@ -1286,12 +1284,12 @@ fn make(step: *Step, prog_node: *std.Progress.Node) !void {
                             }
                             for (rc_source_file.include_paths) |include_path| {
                                 try zig_args.append("/I");
-                                try zig_args.append(include_path.getPath2(module.owner, step));
+                                try zig_args.append(include_path.getPath2(dep.module.owner, step));
                             }
                             try zig_args.append("--");
                             prev_has_rcflags = true;
                         }
-                        try zig_args.append(rc_source_file.file.getPath2(module.owner, step));
+                        try zig_args.append(rc_source_file.file.getPath2(dep.module.owner, step));
                         total_linker_objects += 1;
                     },
                 }
 @@ -1300,20 +1298,20 @@ fn make(step: *Step, prog_node: *std.Progress.Node) !void {
             // We need to emit the --mod argument here so that the above link objects
             // have the correct parent module, but only if the module is part of
             // this compilation.
-            if (cli_named_modules.modules.getIndex(module)) |module_cli_index| {
+            if (cli_named_modules.modules.getIndex(dep.module)) |module_cli_index| {
                 const module_cli_name = cli_named_modules.names.keys()[module_cli_index];
-                try module.appendZigProcessFlags(&zig_args, step);
+                try dep.module.appendZigProcessFlags(&zig_args, step);
                 // --dep arguments
-                try zig_args.ensureUnusedCapacity(module.import_table.count() * 2);
+                try zig_args.ensureUnusedCapacity(dep.module.import_table.count() * 2);
-                for (module.import_table.keys(), module.import_table.values()) |name, dep| {
+                for (dep.module.import_table.keys(), dep.module.import_table.values()) |name, import| {
-                    const dep_index = cli_named_modules.modules.getIndex(dep).?;
+                    const import_index = cli_named_modules.modules.getIndex(import).?;
-                    const dep_cli_name = cli_named_modules.names.keys()[dep_index];
+                    const import_cli_name = cli_named_modules.names.keys()[import_index];
                     zig_args.appendAssumeCapacity("--dep");
-                    if (std.mem.eql(u8, dep_cli_name, name)) {
+                    if (std.mem.eql(u8, import_cli_name, name)) {
-                        zig_args.appendAssumeCapacity(dep_cli_name);
+                        zig_args.appendAssumeCapacity(import_cli_name);
                     } else {
-                        zig_args.appendAssumeCapacity(b.fmt("{s}={s}", .{ name, dep_cli_name }));
+                        zig_args.appendAssumeCapacity(b.fmt("{s}={s}", .{ name, import_cli_name }));
                     }
                 }
 @@ -1324,10 +1322,10 @@ fn make(step: *Step, prog_node: *std.Progress.Node) !void {
                 // perhaps a set of linker objects, or C source files instead.
                 // Linker objects are added to the CLI globally, while C source
                 // files must have a module parent.
-                if (module.root_source_file) |lp| {
+                if (dep.module.root_source_file) |lp| {
-                    const src = lp.getPath2(module.owner, step);
+                    const src = lp.getPath2(dep.module.owner, step);
                     try zig_args.append(b.fmt("-M{s}={s}", .{ module_cli_name, src }));
-                } else if (moduleNeedsCliArg(module)) {
+                } else if (moduleNeedsCliArg(dep.module)) {
                     try zig_args.append(b.fmt("-M{s}", .{module_cli_name}));
                 }
             }
 @@ -1348,32 +1346,32 @@ fn make(step: *Step, prog_node: *std.Progress.Node) !void {
             try zig_args.append(name);
         }
-        if (self.is_linking_libcpp) {
+        if (compile.is_linking_libcpp) {
             try zig_args.append("-lc++");
         }
-        if (self.is_linking_libc) {
+        if (compile.is_linking_libc) {
             try zig_args.append("-lc");
         }
     }
-    if (self.win32_manifest) |manifest_file| {
+    if (compile.win32_manifest) |manifest_file| {
-        try zig_args.append(manifest_file.getPath(b));
+        try zig_args.append(manifest_file.getPath2(b, step));
     }
-    if (self.image_base) |image_base| {
+    if (compile.image_base) |image_base| {
         try zig_args.append("--image-base");
         try zig_args.append(b.fmt("0x{x}", .{image_base}));
     }
-    for (self.filters) |filter| {
+    for (compile.filters) |filter| {
         try zig_args.append("--test-filter");
         try zig_args.append(filter);
     }
-    if (self.test_runner) |test_runner| {
+    if (compile.test_runner) |test_runner| {
         try zig_args.append("--test-runner");
-        try zig_args.append(test_runner.getPath(b));
+        try zig_args.append(test_runner.getPath2(b, step));
     }
     for (b.debug_log_scopes) |log_scope| {
 @@ -1389,71 +1387,71 @@ fn make(step: *Step, prog_node: *std.Progress.Node) !void {
     if (b.verbose_air) try zig_args.append("--verbose-air");
     if (b.verbose_llvm_ir) |path| try zig_args.append(b.fmt("--verbose-llvm-ir={s}", .{path}));
     if (b.verbose_llvm_bc) |path| try zig_args.append(b.fmt("--verbose-llvm-bc={s}", .{path}));
-    if (b.verbose_link or self.verbose_link) try zig_args.append("--verbose-link");
+    if (b.verbose_link or compile.verbose_link) try zig_args.append("--verbose-link");
-    if (b.verbose_cc or self.verbose_cc) try zig_args.append("--verbose-cc");
+    if (b.verbose_cc or compile.verbose_cc) try zig_args.append("--verbose-cc");
     if (b.verbose_llvm_cpu_features) try zig_args.append("--verbose-llvm-cpu-features");
-    if (self.generated_asm != null) try zig_args.append("-femit-asm");
+    if (compile.generated_asm != null) try zig_args.append("-femit-asm");
-    if (self.generated_bin == null) try zig_args.append("-fno-emit-bin");
+    if (compile.generated_bin == null) try zig_args.append("-fno-emit-bin");
-    if (self.generated_docs != null) try zig_args.append("-femit-docs");
+    if (compile.generated_docs != null) try zig_args.append("-femit-docs");
-    if (self.generated_implib != null) try zig_args.append("-femit-implib");
+    if (compile.generated_implib != null) try zig_args.append("-femit-implib");
-    if (self.generated_llvm_bc != null) try zig_args.append("-femit-llvm-bc");
+    if (compile.generated_llvm_bc != null) try zig_args.append("-femit-llvm-bc");
-    if (self.generated_llvm_ir != null) try zig_args.append("-femit-llvm-ir");
+    if (compile.generated_llvm_ir != null) try zig_args.append("-femit-llvm-ir");
-    if (self.generated_h != null) try zig_args.append("-femit-h");
+    if (compile.generated_h != null) try zig_args.append("-femit-h");
-    try addFlag(&zig_args, "formatted-panics", self.formatted_panics);
+    try addFlag(&zig_args, "formatted-panics", compile.formatted_panics);
-    switch (self.compress_debug_sections) {
+    switch (compile.compress_debug_sections) {
         .none => {},
         .zlib => try zig_args.append("--compress-debug-sections=zlib"),
         .zstd => try zig_args.append("--compress-debug-sections=zstd"),
     }
-    if (self.link_eh_frame_hdr) {
+    if (compile.link_eh_frame_hdr) {
         try zig_args.append("--eh-frame-hdr");
     }
-    if (self.link_emit_relocs) {
+    if (compile.link_emit_relocs) {
         try zig_args.append("--emit-relocs");
     }
-    if (self.link_function_sections) {
+    if (compile.link_function_sections) {
         try zig_args.append("-ffunction-sections");
     }
-    if (self.link_data_sections) {
+    if (compile.link_data_sections) {
         try zig_args.append("-fdata-sections");
     }
-    if (self.link_gc_sections) |x| {
+    if (compile.link_gc_sections) |x| {
         try zig_args.append(if (x) "--gc-sections" else "--no-gc-sections");
     }
-    if (!self.linker_dynamicbase) {
+    if (!compile.linker_dynamicbase) {
         try zig_args.append("--no-dynamicbase");
     }
-    if (self.linker_allow_shlib_undefined) |x| {
+    if (compile.linker_allow_shlib_undefined) |x| {
         try zig_args.append(if (x) "-fallow-shlib-undefined" else "-fno-allow-shlib-undefined");
     }
-    if (self.link_z_notext) {
+    if (compile.link_z_notext) {
         try zig_args.append("-z");
         try zig_args.append("notext");
     }
-    if (!self.link_z_relro) {
+    if (!compile.link_z_relro) {
         try zig_args.append("-z");
         try zig_args.append("norelro");
     }
-    if (self.link_z_lazy) {
+    if (compile.link_z_lazy) {
         try zig_args.append("-z");
         try zig_args.append("lazy");
     }
-    if (self.link_z_common_page_size) |size| {
+    if (compile.link_z_common_page_size) |size| {
         try zig_args.append("-z");
         try zig_args.append(b.fmt("common-page-size={d}", .{size}));
     }
-    if (self.link_z_max_page_size) |size| {
+    if (compile.link_z_max_page_size) |size| {
         try zig_args.append("-z");
         try zig_args.append(b.fmt("max-page-size={d}", .{size}));
     }
-    if (self.libc_file) |libc_file| {
+    if (compile.libc_file) |libc_file| {
         try zig_args.append("--libc");
-        try zig_args.append(libc_file.getPath(b));
+        try zig_args.append(libc_file.getPath2(b, step));
     } else if (b.libc_file) |libc_file| {
         try zig_args.append("--libc");
         try zig_args.append(libc_file);
 @@ -1466,105 +1464,105 @@ fn make(step: *Step, prog_node: *std.Progress.Node) !void {
     try zig_args.append(b.graph.global_cache_root.path orelse ".");
     try zig_args.append("--name");
-    try zig_args.append(self.name);
+    try zig_args.append(compile.name);
-    if (self.linkage) |some| switch (some) {
+    if (compile.linkage) |some| switch (some) {
         .dynamic => try zig_args.append("-dynamic"),
         .static => try zig_args.append("-static"),
     };
-    if (self.kind == .lib and self.linkage != null and self.linkage.? == .dynamic) {
+    if (compile.kind == .lib and compile.linkage != null and compile.linkage.? == .dynamic) {
-        if (self.version) |version| {
+        if (compile.version) |version| {
             try zig_args.append("--version");
             try zig_args.append(b.fmt("{}", .{version}));
         }
-        if (self.rootModuleTarget().isDarwin()) {
+        if (compile.rootModuleTarget().isDarwin()) {
-            const install_name = self.install_name orelse b.fmt("@rpath/{s}{s}{s}", .{
+            const install_name = compile.install_name orelse b.fmt("@rpath/{s}{s}{s}", .{
-                self.rootModuleTarget().libPrefix(),
+                compile.rootModuleTarget().libPrefix(),
-                self.name,
+                compile.name,
-                self.rootModuleTarget().dynamicLibSuffix(),
+                compile.rootModuleTarget().dynamicLibSuffix(),
             });
             try zig_args.append("-install_name");
             try zig_args.append(install_name);
         }
     }
-    if (self.entitlements) |entitlements| {
+    if (compile.entitlements) |entitlements| {
         try zig_args.appendSlice(&[_][]const u8{ "--entitlements", entitlements });
     }
-    if (self.pagezero_size) |pagezero_size| {
+    if (compile.pagezero_size) |pagezero_size| {
         const size = try std.fmt.allocPrint(arena, "{x}", .{pagezero_size});
         try zig_args.appendSlice(&[_][]const u8{ "-pagezero_size", size });
     }
-    if (self.headerpad_size) |headerpad_size| {
+    if (compile.headerpad_size) |headerpad_size| {
         const size = try std.fmt.allocPrint(arena, "{x}", .{headerpad_size});
         try zig_args.appendSlice(&[_][]const u8{ "-headerpad", size });
     }
-    if (self.headerpad_max_install_names) {
+    if (compile.headerpad_max_install_names) {
         try zig_args.append("-headerpad_max_install_names");
     }
-    if (self.dead_strip_dylibs) {
+    if (compile.dead_strip_dylibs) {
         try zig_args.append("-dead_strip_dylibs");
     }
-    if (self.force_load_objc) {
+    if (compile.force_load_objc) {
         try zig_args.append("-ObjC");
     }
-    try addFlag(&zig_args, "compiler-rt", self.bundle_compiler_rt);
+    try addFlag(&zig_args, "compiler-rt", compile.bundle_compiler_rt);
-    try addFlag(&zig_args, "dll-export-fns", self.dll_export_fns);
+    try addFlag(&zig_args, "dll-export-fns", compile.dll_export_fns);
-    if (self.rdynamic) {
+    if (compile.rdynamic) {
         try zig_args.append("-rdynamic");
     }
-    if (self.import_memory) {
+    if (compile.import_memory) {
         try zig_args.append("--import-memory");
     }
-    if (self.export_memory) {
+    if (compile.export_memory) {
         try zig_args.append("--export-memory");
     }
-    if (self.import_symbols) {
+    if (compile.import_symbols) {
         try zig_args.append("--import-symbols");
     }
-    if (self.import_table) {
+    if (compile.import_table) {
         try zig_args.append("--import-table");
     }
-    if (self.export_table) {
+    if (compile.export_table) {
         try zig_args.append("--export-table");
     }
-    if (self.initial_memory) |initial_memory| {
+    if (compile.initial_memory) |initial_memory| {
         try zig_args.append(b.fmt("--initial-memory={d}", .{initial_memory}));
     }
-    if (self.max_memory) |max_memory| {
+    if (compile.max_memory) |max_memory| {
         try zig_args.append(b.fmt("--max-memory={d}", .{max_memory}));
     }
-    if (self.shared_memory) {
+    if (compile.shared_memory) {
         try zig_args.append("--shared-memory");
     }
-    if (self.global_base) |global_base| {
+    if (compile.global_base) |global_base| {
         try zig_args.append(b.fmt("--global-base={d}", .{global_base}));
     }
-    if (self.wasi_exec_model) |model| {
+    if (compile.wasi_exec_model) |model| {
         try zig_args.append(b.fmt("-mexec-model={s}", .{@tagName(model)}));
     }
-    if (self.linker_script) |linker_script| {
+    if (compile.linker_script) |linker_script| {
         try zig_args.append("--script");
-        try zig_args.append(linker_script.getPath(b));
+        try zig_args.append(linker_script.getPath2(b, step));
     }
-    if (self.version_script) |version_script| {
+    if (compile.version_script) |version_script| {
         try zig_args.append("--version-script");
-        try zig_args.append(version_script.getPath(b));
+        try zig_args.append(version_script.getPath2(b, step));
     }
-    if (self.linker_allow_undefined_version) |x| {
+    if (compile.linker_allow_undefined_version) |x| {
         try zig_args.append(if (x) "--undefined-version" else "--no-undefined-version");
     }
-    if (self.linker_enable_new_dtags) |enabled| {
+    if (compile.linker_enable_new_dtags) |enabled| {
         try zig_args.append(if (enabled) "--enable-new-dtags" else "--disable-new-dtags");
     }
-    if (self.kind == .@"test") {
+    if (compile.kind == .@"test") {
-        if (self.exec_cmd_args) |exec_cmd_args| {
+        if (compile.exec_cmd_args) |exec_cmd_args| {
             for (exec_cmd_args) |cmd_arg| {
                 if (cmd_arg) |arg| {
                     try zig_args.append("--test-cmd");
 @@ -1595,7 +1593,7 @@ fn make(step: *Step, prog_node: *std.Progress.Node) !void {
         if (prefix_dir.accessZ("lib", .{})) |_| {
             try zig_args.appendSlice(&.{
-                "-L", try fs.path.join(arena, &.{ search_prefix, "lib" }),
+                "-L", b.pathJoin(&.{ search_prefix, "lib" }),
             });
         } else |err| switch (err) {
             error.FileNotFound => {},
 @@ -1606,7 +1604,7 @@ fn make(step: *Step, prog_node: *std.Progress.Node) !void {
         if (prefix_dir.accessZ("include", .{})) |_| {
             try zig_args.appendSlice(&.{
-                "-I", try fs.path.join(arena, &.{ search_prefix, "include" }),
+                "-I", b.pathJoin(&.{ search_prefix, "include" }),
             });
         } else |err| switch (err) {
             error.FileNotFound => {},
 @@ -1616,14 +1614,14 @@ fn make(step: *Step, prog_node: *std.Progress.Node) !void {
         }
     }
-    if (self.rc_includes != .any) {
+    if (compile.rc_includes != .any) {
         try zig_args.append("-rcincludes");
-        try zig_args.append(@tagName(self.rc_includes));
+        try zig_args.append(@tagName(compile.rc_includes));
     }
-    try addFlag(&zig_args, "each-lib-rpath", self.each_lib_rpath);
+    try addFlag(&zig_args, "each-lib-rpath", compile.each_lib_rpath);
-    if (self.build_id) |build_id| {
+    if (compile.build_id) |build_id| {
         try zig_args.append(switch (build_id) {
             .hexstring => |hs| b.fmt("--build-id=0x{s}", .{
                 std.fmt.fmtSliceHexLower(hs.toSlice()),
 @@ -1632,15 +1630,15 @@ fn make(step: *Step, prog_node: *std.Progress.Node) !void {
         });
     }
-    if (self.zig_lib_dir) |dir| {
+    if (compile.zig_lib_dir) |dir| {
         try zig_args.append("--zig-lib-dir");
-        try zig_args.append(dir.getPath(b));
+        try zig_args.append(dir.getPath2(b, step));
     }
-    try addFlag(&zig_args, "PIE", self.pie);
+    try addFlag(&zig_args, "PIE", compile.pie);
-    try addFlag(&zig_args, "lto", self.want_lto);
+    try addFlag(&zig_args, "lto", compile.want_lto);
-    if (self.subsystem) |subsystem| {
+    if (compile.subsystem) |subsystem| {
         try zig_args.append("--subsystem");
         try zig_args.append(switch (subsystem) {
             .Console => "console",
 @@ -1654,11 +1652,11 @@ fn make(step: *Step, prog_node: *std.Progress.Node) !void {
         });
     }
-    if (self.mingw_unicode_entry_point) {
+    if (compile.mingw_unicode_entry_point) {
         try zig_args.append("-municode");
     }
-    if (self.error_limit) |err_limit| try zig_args.appendSlice(&.{
+    if (compile.error_limit) |err_limit| try zig_args.appendSlice(&.{
         "--error-limit",
         b.fmt("{}", .{err_limit}),
     });
 @@ -1724,8 +1722,8 @@ fn make(step: *Step, prog_node: *std.Progress.Node) !void {
     const maybe_output_bin_path = step.evalZigProcess(zig_args.items, prog_node) catch |err| switch (err) {
         error.NeedCompileErrorCheck => {
-            assert(self.expect_errors != null);
+            assert(compile.expect_errors != null);
-            try checkCompileErrors(self);
+            try checkCompileErrors(compile);
             return;
         },
         else => |e| return e,
 @@ -1735,61 +1733,61 @@ fn make(step: *Step, prog_node: *std.Progress.Node) !void {
     if (maybe_output_bin_path) |output_bin_path| {
         const output_dir = fs.path.dirname(output_bin_path).?;
-        if (self.emit_directory) |lp| {
+        if (compile.emit_directory) |lp| {
             lp.path = output_dir;
         }
         // -femit-bin[=path]         (default) Output machine code
-        if (self.generated_bin) |bin| {
+        if (compile.generated_bin) |bin| {
-            bin.path = b.pathJoin(&.{ output_dir, self.out_filename });
+            bin.path = b.pathJoin(&.{ output_dir, compile.out_filename });
         }
         const sep = std.fs.path.sep;
         // output PDB if someone requested it
-        if (self.generated_pdb) |pdb| {
+        if (compile.generated_pdb) |pdb| {
-            pdb.path = b.fmt("{s}{c}{s}.pdb", .{ output_dir, sep, self.name });
+            pdb.path = b.fmt("{s}{c}{s}.pdb", .{ output_dir, sep, compile.name });
         }
         // -femit-implib[=path]      (default) Produce an import .lib when building a Windows DLL
-        if (self.generated_implib) |implib| {
+        if (compile.generated_implib) |implib| {
-            implib.path = b.fmt("{s}{c}{s}.lib", .{ output_dir, sep, self.name });
+            implib.path = b.fmt("{s}{c}{s}.lib", .{ output_dir, sep, compile.name });
         }
         // -femit-h[=path]           Generate a C header file (.h)
-        if (self.generated_h) |lp| {
+        if (compile.generated_h) |lp| {
-            lp.path = b.fmt("{s}{c}{s}.h", .{ output_dir, sep, self.name });
+            lp.path = b.fmt("{s}{c}{s}.h", .{ output_dir, sep, compile.name });
         }
         // -femit-docs[=path]        Create a docs/ dir with html documentation
-        if (self.generated_docs) |generated_docs| {
+        if (compile.generated_docs) |generated_docs| {
             generated_docs.path = b.pathJoin(&.{ output_dir, "docs" });
         }
         // -femit-asm[=path]         Output .s (assembly code)
-        if (self.generated_asm) |lp| {
+        if (compile.generated_asm) |lp| {
-            lp.path = b.fmt("{s}{c}{s}.s", .{ output_dir, sep, self.name });
+            lp.path = b.fmt("{s}{c}{s}.s", .{ output_dir, sep, compile.name });
         }
         // -femit-llvm-ir[=path]     Produce a .ll file with optimized LLVM IR (requires LLVM extensions)
-        if (self.generated_llvm_ir) |lp| {
+        if (compile.generated_llvm_ir) |lp| {
-            lp.path = b.fmt("{s}{c}{s}.ll", .{ output_dir, sep, self.name });
+            lp.path = b.fmt("{s}{c}{s}.ll", .{ output_dir, sep, compile.name });
         }
         // -femit-llvm-bc[=path]     Produce an optimized LLVM module as a .bc file (requires LLVM extensions)
-        if (self.generated_llvm_bc) |lp| {
+        if (compile.generated_llvm_bc) |lp| {
-            lp.path = b.fmt("{s}{c}{s}.bc", .{ output_dir, sep, self.name });
+            lp.path = b.fmt("{s}{c}{s}.bc", .{ output_dir, sep, compile.name });
         }
     }
-    if (self.kind == .lib and self.linkage != null and self.linkage.? == .dynamic and
+    if (compile.kind == .lib and compile.linkage != null and compile.linkage.? == .dynamic and
-        self.version != null and std.Build.wantSharedLibSymLinks(self.rootModuleTarget()))
+        compile.version != null and std.Build.wantSharedLibSymLinks(compile.rootModuleTarget()))
     {
         try doAtomicSymLinks(
             step,
-            self.getEmittedBin().getPath(b),
+            compile.getEmittedBin().getPath2(b, step),
-            self.major_only_filename.?,
+            compile.major_only_filename.?,
-            self.name_only_filename.?,
+            compile.name_only_filename.?,
         );
     }
 }
 @@ -1800,18 +1798,19 @@ pub fn doAtomicSymLinks(
     filename_major_only: []const u8,
     filename_name_only: []const u8,
 ) !void {
-    const arena = step.owner.allocator;
+    const b = step.owner;
+    const arena = b.allocator;
     const out_dir = fs.path.dirname(output_path) orelse ".";
     const out_basename = fs.path.basename(output_path);
     // sym link for libfoo.so.1 to libfoo.so.1.2.3
-    const major_only_path = try fs.path.join(arena, &.{ out_dir, filename_major_only });
+    const major_only_path = b.pathJoin(&.{ out_dir, filename_major_only });
     fs.atomicSymLink(arena, out_basename, major_only_path) catch |err| {
         return step.fail("unable to symlink {s} -> {s}: {s}", .{
             major_only_path, out_basename, @errorName(err),
         });
     };
     // sym link for libfoo.so to libfoo.so.1
-    const name_only_path = try fs.path.join(arena, &.{ out_dir, filename_name_only });
+    const name_only_path = b.pathJoin(&.{ out_dir, filename_name_only });
     fs.atomicSymLink(arena, filename_major_only, name_only_path) catch |err| {
         return step.fail("Unable to symlink {s} -> {s}: {s}", .{
             name_only_path, filename_major_only, @errorName(err),
 @@ -1819,9 +1818,9 @@ pub fn doAtomicSymLinks(
     };
 }
-fn execPkgConfigList(self: *std.Build, out_code: *u8) (PkgConfigError || RunError)![]const PkgConfigPkg {
+fn execPkgConfigList(compile: *std.Build, out_code: *u8) (PkgConfigError || RunError)![]const PkgConfigPkg {
-    const stdout = try self.runAllowFail(&[_][]const u8{ "pkg-config", "--list-all" }, out_code, .Ignore);
+    const stdout = try compile.runAllowFail(&[_][]const u8{ "pkg-config", "--list-all" }, out_code, .Ignore);
-    var list = ArrayList(PkgConfigPkg).init(self.allocator);
+    var list = ArrayList(PkgConfigPkg).init(compile.allocator);
     errdefer list.deinit();
     var line_it = mem.tokenizeAny(u8, stdout, "\r\n");
     while (line_it.next()) |line| {
 @@ -1835,13 +1834,13 @@ fn execPkgConfigList(self: *std.Build, out_code: *u8) (PkgConfigError || RunErro
     return list.toOwnedSlice();
 }
-fn getPkgConfigList(self: *std.Build) ![]const PkgConfigPkg {
+fn getPkgConfigList(compile: *std.Build) ![]const PkgConfigPkg {
-    if (self.pkg_config_pkg_list) |res| {
+    if (compile.pkg_config_pkg_list) |res| {
         return res;
     }
     var code: u8 = undefined;
-    if (execPkgConfigList(self, &code)) |list| {
+    if (execPkgConfigList(compile, &code)) |list| {
-        self.pkg_config_pkg_list = list;
+        compile.pkg_config_pkg_list = list;
         return list;
     } else |err| {
         const result = switch (err) {
 @@ -1853,7 +1852,7 @@ fn getPkgConfigList(self: *std.Build) ![]const PkgConfigPkg {
             error.PkgConfigInvalidOutput => error.PkgConfigInvalidOutput,
             else => return err,
         };
-        self.pkg_config_pkg_list = result;
+        compile.pkg_config_pkg_list = result;
         return result;
     }
 }
 @@ -1868,12 +1867,12 @@ fn addFlag(args: *ArrayList([]const u8), comptime name: []const u8, opt: ?bool)
     }
 }
-fn checkCompileErrors(self: *Compile) !void {
+fn checkCompileErrors(compile: *Compile) !void {
     // Clear this field so that it does not get printed by the build runner.
-    const actual_eb = self.step.result_error_bundle;
+    const actual_eb = compile.step.result_error_bundle;
-    self.step.result_error_bundle = std.zig.ErrorBundle.empty;
+    compile.step.result_error_bundle = std.zig.ErrorBundle.empty;
-    const arena = self.step.owner.allocator;
+    const arena = compile.step.owner.allocator;
     var actual_stderr_list = std.ArrayList(u8).init(arena);
     try actual_eb.renderToWriter(.{
 @@ -1885,7 +1884,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);
-    const expect_errors = self.expect_errors.?;
+    const expect_errors = compile.expect_errors.?;
     var actual_line_it = mem.splitScalar(u8, actual_stderr, '\n');
 @@ -1897,7 +1896,7 @@ fn checkCompileErrors(self: *Compile) !void {
                 return;
             }
-            return self.step.fail(
+            return compile.step.fail(
                 \\
                 \\========= should contain: ===============
                 \\{s}
 @@ -1924,7 +1923,7 @@ fn checkCompileErrors(self: *Compile) !void {
             if (mem.eql(u8, expected_generated.items, actual_stderr)) return;
-            return self.step.fail(
+            return compile.step.fail(
                 \\
                 \\========= expected: =====================
                 \\{s}

lib/std/Build/Step/ConfigHeader.zig+37-37

...	@@ -52,7 +52,7 @@ pub const Options = struct {	...	@@ -52,7 +52,7 @@ pub const Options = struct {
52	};	52	};
53		53
54	pub fn create(owner: std.Build, options: Options) ConfigHeader {	54	pub fn create(owner: std.Build, options: Options) ConfigHeader {
55	const self = owner.allocator.create(ConfigHeader) catch @panic("OOM");	55	const config_header = owner.allocator.create(ConfigHeader) catch @panic("OOM");
56		56
57	var include_path: []const u8 = "config.h";	57	var include_path: []const u8 = "config.h";
58		58
...	@@ -81,7 +81,7 @@ pub fn create(owner: std.Build, options: Options) ConfigHeader {	...	@@ -81,7 +81,7 @@ pub fn create(owner: std.Build, options: Options) ConfigHeader {
81	else	81	else
82	owner.fmt("configure {s} header to {s}", .{ @tagName(options.style), include_path });	82	owner.fmt("configure {s} header to {s}", .{ @tagName(options.style), include_path });
83		83
84	self.* = .{	84	config_header.* = .{
85	.step = Step.init(.{	85	.step = Step.init(.{
86	.id = base_id,	86	.id = base_id,
87	.name = name,	87	.name = name,
...	@@ -95,64 +95,64 @@ pub fn create(owner: std.Build, options: Options) ConfigHeader {	...	@@ -95,64 +95,64 @@ pub fn create(owner: std.Build, options: Options) ConfigHeader {
95	.max_bytes = options.max_bytes,	95	.max_bytes = options.max_bytes,
96	.include_path = include_path,	96	.include_path = include_path,
97	.include_guard_override = options.include_guard_override,	97	.include_guard_override = options.include_guard_override,
98	.output_file = .{ .step = &self.step },	98	.output_file = .{ .step = &config_header.step },
99	};	99	};
100		100
101	return self;	101	return config_header;
102	}	102	}
103		103
104	pub fn addValues(self: *ConfigHeader, values: anytype) void {	104	pub fn addValues(config_header: *ConfigHeader, values: anytype) void {
105	return addValuesInner(self, values) catch @panic("OOM");	105	return addValuesInner(config_header, values) catch @panic("OOM");
106	}	106	}
107		107
108	pub fn getOutput(self: *ConfigHeader) std.Build.LazyPath {	108	pub fn getOutput(config_header: *ConfigHeader) std.Build.LazyPath {
109	return .{ .generated = &self.output_file };	109	return .{ .generated = &config_header.output_file };
110	}	110	}
111		111
112	fn addValuesInner(self: *ConfigHeader, values: anytype) !void {	112	fn addValuesInner(config_header: *ConfigHeader, values: anytype) !void {
113	inline for (@typeInfo(@TypeOf(values)).Struct.fields) \|field\| {	113	inline for (@typeInfo(@TypeOf(values)).Struct.fields) \|field\| {
114	try putValue(self, field.name, field.type, @field(values, field.name));	114	try putValue(config_header, field.name, field.type, @field(values, field.name));
115	}	115	}
116	}	116	}
117		117
118	fn putValue(self: *ConfigHeader, field_name: []const u8, comptime T: type, v: T) !void {	118	fn putValue(config_header: *ConfigHeader, field_name: []const u8, comptime T: type, v: T) !void {
119	switch (@typeInfo(T)) {	119	switch (@typeInfo(T)) {
120	.Null => {	120	.Null => {
121	try self.values.put(field_name, .undef);	121	try config_header.values.put(field_name, .undef);
122	},	122	},
123	.Void => {	123	.Void => {
124	try self.values.put(field_name, .defined);	124	try config_header.values.put(field_name, .defined);
125	},	125	},
126	.Bool => {	126	.Bool => {
127	try self.values.put(field_name, .{ .boolean = v });	127	try config_header.values.put(field_name, .{ .boolean = v });
128	},	128	},
129	.Int => {	129	.Int => {
130	try self.values.put(field_name, .{ .int = v });	130	try config_header.values.put(field_name, .{ .int = v });
131	},	131	},
132	.ComptimeInt => {	132	.ComptimeInt => {
133	try self.values.put(field_name, .{ .int = v });	133	try config_header.values.put(field_name, .{ .int = v });
134	},	134	},
135	.EnumLiteral => {	135	.EnumLiteral => {
136	try self.values.put(field_name, .{ .ident = @tagName(v) });	136	try config_header.values.put(field_name, .{ .ident = @tagName(v) });
137	},	137	},
138	.Optional => {	138	.Optional => {
139	if (v) \|x\| {	139	if (v) \|x\| {
140	return putValue(self, field_name, @TypeOf(x), x);	140	return putValue(config_header, field_name, @TypeOf(x), x);
141	} else {	141	} else {
142	try self.values.put(field_name, .undef);	142	try config_header.values.put(field_name, .undef);
143	}	143	}
144	},	144	},
145	.Pointer => \|ptr\| {	145	.Pointer => \|ptr\| {
146	switch (@typeInfo(ptr.child)) {	146	switch (@typeInfo(ptr.child)) {
147	.Array => \|array\| {	147	.Array => \|array\| {
148	if (ptr.size == .One and array.child == u8) {	148	if (ptr.size == .One and array.child == u8) {
149	try self.values.put(field_name, .{ .string = v });	149	try config_header.values.put(field_name, .{ .string = v });
150	return;	150	return;
151	}	151	}
152	},	152	},
153	.Int => {	153	.Int => {
154	if (ptr.size == .Slice and ptr.child == u8) {	154	if (ptr.size == .Slice and ptr.child == u8) {
155	try self.values.put(field_name, .{ .string = v });	155	try config_header.values.put(field_name, .{ .string = v });
156	return;	156	return;
157	}	157	}
158	},	158	},
...	@@ -168,7 +168,7 @@ fn putValue(self: *ConfigHeader, field_name: []const u8, comptime T: type, v: T)	...	@@ -168,7 +168,7 @@ fn putValue(self: *ConfigHeader, field_name: []const u8, comptime T: type, v: T)
168	fn make(step: Step, prog_node: std.Progress.Node) !void {	168	fn make(step: Step, prog_node: std.Progress.Node) !void {
169	_ = prog_node;	169	_ = prog_node;
170	const b = step.owner;	170	const b = step.owner;
171	const self: *ConfigHeader = @fieldParentPtr("step", step);	171	const config_header: *ConfigHeader = @fieldParentPtr("step", step);
172	const gpa = b.allocator;	172	const gpa = b.allocator;
173	const arena = b.allocator;	173	const arena = b.allocator;
174		174
...	@@ -179,8 +179,8 @@ fn make(step: Step, prog_node: std.Progress.Node) !void {	...	@@ -179,8 +179,8 @@ fn make(step: Step, prog_node: std.Progress.Node) !void {
179	// random bytes when ConfigHeader implementation is modified in a	179	// random bytes when ConfigHeader implementation is modified in a
180	// non-backwards-compatible way.	180	// non-backwards-compatible way.
181	man.hash.add(@as(u32, 0xdef08d23));	181	man.hash.add(@as(u32, 0xdef08d23));
182	man.hash.addBytes(self.include_path);	182	man.hash.addBytes(config_header.include_path);
183	man.hash.addOptionalBytes(self.include_guard_override);	183	man.hash.addOptionalBytes(config_header.include_guard_override);
184		184
185	var output = std.ArrayList(u8).init(gpa);	185	var output = std.ArrayList(u8).init(gpa);
186	defer output.deinit();	186	defer output.deinit();
...	@@ -189,34 +189,34 @@ fn make(step: Step, prog_node: std.Progress.Node) !void {	...	@@ -189,34 +189,34 @@ fn make(step: Step, prog_node: std.Progress.Node) !void {
189	const c_generated_line = "/* " ++ header_text ++ " */\n";	189	const c_generated_line = "/* " ++ header_text ++ " */\n";
190	const asm_generated_line = "; " ++ header_text ++ "\n";	190	const asm_generated_line = "; " ++ header_text ++ "\n";
191		191
192	switch (self.style) {	192	switch (config_header.style) {
193	.autoconf => \|file_source\| {	193	.autoconf => \|file_source\| {
194	try output.appendSlice(c_generated_line);	194	try output.appendSlice(c_generated_line);
195	const src_path = file_source.getPath(b);	195	const src_path = file_source.getPath2(b, step);
196	const contents = std.fs.cwd().readFileAlloc(arena, src_path, self.max_bytes) catch \|err\| {	196	const contents = std.fs.cwd().readFileAlloc(arena, src_path, config_header.max_bytes) catch \|err\| {
197	return step.fail("unable to read autoconf input file '{s}': {s}", .{	197	return step.fail("unable to read autoconf input file '{s}': {s}", .{
198	src_path, @errorName(err),	198	src_path, @errorName(err),
199	});	199	});
200	};	200	};
201	try render_autoconf(step, contents, &output, self.values, src_path);	201	try render_autoconf(step, contents, &output, config_header.values, src_path);
202	},	202	},
203	.cmake => \|file_source\| {	203	.cmake => \|file_source\| {
204	try output.appendSlice(c_generated_line);	204	try output.appendSlice(c_generated_line);
205	const src_path = file_source.getPath(b);	205	const src_path = file_source.getPath2(b, step);
206	const contents = std.fs.cwd().readFileAlloc(arena, src_path, self.max_bytes) catch \|err\| {	206	const contents = std.fs.cwd().readFileAlloc(arena, src_path, config_header.max_bytes) catch \|err\| {
207	return step.fail("unable to read cmake input file '{s}': {s}", .{	207	return step.fail("unable to read cmake input file '{s}': {s}", .{
208	src_path, @errorName(err),	208	src_path, @errorName(err),
209	});	209	});
210	};	210	};
211	try render_cmake(step, contents, &output, self.values, src_path);	211	try render_cmake(step, contents, &output, config_header.values, src_path);
212	},	212	},
213	.blank => {	213	.blank => {
214	try output.appendSlice(c_generated_line);	214	try output.appendSlice(c_generated_line);
215	try render_blank(&output, self.values, self.include_path, self.include_guard_override);	215	try render_blank(&output, config_header.values, config_header.include_path, config_header.include_guard_override);
216	},	216	},
217	.nasm => {	217	.nasm => {
218	try output.appendSlice(asm_generated_line);	218	try output.appendSlice(asm_generated_line);
219	try render_nasm(&output, self.values);	219	try render_nasm(&output, config_header.values);
220	},	220	},
221	}	221	}
222		222
...	@@ -224,8 +224,8 @@ fn make(step: Step, prog_node: std.Progress.Node) !void {	...	@@ -224,8 +224,8 @@ fn make(step: Step, prog_node: std.Progress.Node) !void {
224		224
225	if (try step.cacheHit(&man)) {	225	if (try step.cacheHit(&man)) {
226	const digest = man.final();	226	const digest = man.final();
227	self.output_file.path = try b.cache_root.join(arena, &.{	227	config_header.output_file.path = try b.cache_root.join(arena, &.{
228	"o", &digest, self.include_path,	228	"o", &digest, config_header.include_path,
229	});	229	});
230	return;	230	return;
231	}	231	}
...	@@ -237,7 +237,7 @@ fn make(step: Step, prog_node: std.Progress.Node) !void {	...	@@ -237,7 +237,7 @@ fn make(step: Step, prog_node: std.Progress.Node) !void {
237	// output_path is libavutil/avconfig.h	237	// output_path is libavutil/avconfig.h
238	// We want to open directory zig-cache/o/HASH/libavutil/	238	// We want to open directory zig-cache/o/HASH/libavutil/
239	// but keep output_dir as zig-cache/o/HASH for -I include	239	// but keep output_dir as zig-cache/o/HASH for -I include
240	const sub_path = try std.fs.path.join(arena, &.{ "o", &digest, self.include_path });	240	const sub_path = b.pathJoin(&.{ "o", &digest, config_header.include_path });
241	const sub_path_dirname = std.fs.path.dirname(sub_path).?;	241	const sub_path_dirname = std.fs.path.dirname(sub_path).?;
242		242
243	b.cache_root.handle.makePath(sub_path_dirname) catch \|err\| {	243	b.cache_root.handle.makePath(sub_path_dirname) catch \|err\| {
...	@@ -252,7 +252,7 @@ fn make(step: Step, prog_node: std.Progress.Node) !void {	...	@@ -252,7 +252,7 @@ fn make(step: Step, prog_node: std.Progress.Node) !void {
252	});	252	});
253	};	253	};
254		254
255	self.output_file.path = try b.cache_root.join(arena, &.{sub_path});	255	config_header.output_file.path = try b.cache_root.join(arena, &.{sub_path});
256	try man.writeManifest();	256	try man.writeManifest();
257	}	257	}
258		258

lib/std/Build/Step/Fmt.zig+9-9

...	@@ -10,7 +10,7 @@ paths: []const []const u8,	...	@@ -10,7 +10,7 @@ paths: []const []const u8,
10	exclude_paths: []const []const u8,	10	exclude_paths: []const []const u8,
11	check: bool,	11	check: bool,
12		12
13	pub const base_id = .fmt;	13	pub const base_id: Step.Id = .fmt;
14		14
15	pub const Options = struct {	15	pub const Options = struct {
16	paths: []const []const u8 = &.{},	16	paths: []const []const u8 = &.{},
...	@@ -20,9 +20,9 @@ pub const Options = struct {	...	@@ -20,9 +20,9 @@ pub const Options = struct {
20	};	20	};
21		21
22	pub fn create(owner: std.Build, options: Options) Fmt {	22	pub fn create(owner: std.Build, options: Options) Fmt {
23	const self = owner.allocator.create(Fmt) catch @panic("OOM");	23	const fmt = owner.allocator.create(Fmt) catch @panic("OOM");
24	const name = if (options.check) "zig fmt --check" else "zig fmt";	24	const name = if (options.check) "zig fmt --check" else "zig fmt";
25	self.* = .{	25	fmt.* = .{
26	.step = Step.init(.{	26	.step = Step.init(.{
27	.id = base_id,	27	.id = base_id,
28	.name = name,	28	.name = name,
...	@@ -33,7 +33,7 @@ pub fn create(owner: std.Build, options: Options) Fmt {	...	@@ -33,7 +33,7 @@ pub fn create(owner: std.Build, options: Options) Fmt {
33	.exclude_paths = owner.dupeStrings(options.exclude_paths),	33	.exclude_paths = owner.dupeStrings(options.exclude_paths),
34	.check = options.check,	34	.check = options.check,
35	};	35	};
36	return self;	36	return fmt;
37	}	37	}
38		38
39	fn make(step: Step, prog_node: std.Progress.Node) !void {	39	fn make(step: Step, prog_node: std.Progress.Node) !void {
...	@@ -47,23 +47,23 @@ fn make(step: Step, prog_node: std.Progress.Node) !void {	...	@@ -47,23 +47,23 @@ fn make(step: Step, prog_node: std.Progress.Node) !void {
47		47
48	const b = step.owner;	48	const b = step.owner;
49	const arena = b.allocator;	49	const arena = b.allocator;
50	const self: *Fmt = @fieldParentPtr("step", step);	50	const fmt: *Fmt = @fieldParentPtr("step", step);
51		51
52	var argv: std.ArrayListUnmanaged([]const u8) = .{};	52	var argv: std.ArrayListUnmanaged([]const u8) = .{};
53	try argv.ensureUnusedCapacity(arena, 2 + 1 + self.paths.len + 2 * self.exclude_paths.len);	53	try argv.ensureUnusedCapacity(arena, 2 + 1 + fmt.paths.len + 2 * fmt.exclude_paths.len);
54		54
55	argv.appendAssumeCapacity(b.graph.zig_exe);	55	argv.appendAssumeCapacity(b.graph.zig_exe);
56	argv.appendAssumeCapacity("fmt");	56	argv.appendAssumeCapacity("fmt");
57		57
58	if (self.check) {	58	if (fmt.check) {
59	argv.appendAssumeCapacity("--check");	59	argv.appendAssumeCapacity("--check");
60	}	60	}
61		61
62	for (self.paths) \|p\| {	62	for (fmt.paths) \|p\| {
63	argv.appendAssumeCapacity(b.pathFromRoot(p));	63	argv.appendAssumeCapacity(b.pathFromRoot(p));
64	}	64	}
65		65
66	for (self.exclude_paths) \|p\| {	66	for (fmt.exclude_paths) \|p\| {
67	argv.appendAssumeCapacity("--exclude");	67	argv.appendAssumeCapacity("--exclude");
68	argv.appendAssumeCapacity(b.pathFromRoot(p));	68	argv.appendAssumeCapacity(b.pathFromRoot(p));
69	}	69	}

lib/std/Build/Step/InstallArtifact.zig+22-22

lib/std/Build/Step/InstallDir.zig+24-25

 @@ -3,17 +3,16 @@ const mem = std.mem;
 const fs = std.fs;
 const Step = std.Build.Step;
 const LazyPath = std.Build.LazyPath;
-const InstallDir = std.Build.InstallDir;
+const InstallDir = @This();
-const InstallDirStep = @This();
 step: Step,
 options: Options,
-pub const base_id = .install_dir;
+pub const base_id: Step.Id = .install_dir;
 pub const Options = struct {
     source_dir: LazyPath,
-    install_dir: InstallDir,
+    install_dir: std.Build.InstallDir,
     install_subdir: []const u8,
     /// File paths which end in any of these suffixes will be excluded
     /// from being installed.
 @@ -29,41 +28,41 @@ pub const Options = struct {
     /// `@import("test.zig")` would be a compile error.
     blank_extensions: []const []const u8 = &.{},
-    fn dupe(self: Options, b: *std.Build) Options {
+    fn dupe(opts: Options, b: *std.Build) Options {
         return .{
-            .source_dir = self.source_dir.dupe(b),
+            .source_dir = opts.source_dir.dupe(b),
-            .install_dir = self.install_dir.dupe(b),
+            .install_dir = opts.install_dir.dupe(b),
-            .install_subdir = b.dupe(self.install_subdir),
+            .install_subdir = b.dupe(opts.install_subdir),
-            .exclude_extensions = b.dupeStrings(self.exclude_extensions),
+            .exclude_extensions = b.dupeStrings(opts.exclude_extensions),
-            .include_extensions = if (self.include_extensions) |incs| b.dupeStrings(incs) else null,
+            .include_extensions = if (opts.include_extensions) |incs| b.dupeStrings(incs) else null,
-            .blank_extensions = b.dupeStrings(self.blank_extensions),
+            .blank_extensions = b.dupeStrings(opts.blank_extensions),
         };
     }
 };
-pub fn create(owner: *std.Build, options: Options) *InstallDirStep {
+pub fn create(owner: *std.Build, options: Options) *InstallDir {
     owner.pushInstalledFile(options.install_dir, options.install_subdir);
-    const self = owner.allocator.create(InstallDirStep) catch @panic("OOM");
+    const install_dir = owner.allocator.create(InstallDir) catch @panic("OOM");
-    self.* = .{
+    install_dir.* = .{
         .step = Step.init(.{
-            .id = .install_dir,
+            .id = base_id,
             .name = owner.fmt("install {s}/", .{options.source_dir.getDisplayName()}),
             .owner = owner,
             .makeFn = make,
         }),
         .options = options.dupe(owner),
     };
-    options.source_dir.addStepDependencies(&self.step);
+    options.source_dir.addStepDependencies(&install_dir.step);
-    return self;
+    return install_dir;
 }
 fn make(step: *Step, prog_node: *std.Progress.Node) !void {
     _ = prog_node;
     const b = step.owner;
-    const self: *InstallDirStep = @fieldParentPtr("step", step);
+    const install_dir: *InstallDir = @fieldParentPtr("step", step);
     const arena = b.allocator;
-    const dest_prefix = b.getInstallPath(self.options.install_dir, self.options.install_subdir);
+    const dest_prefix = b.getInstallPath(install_dir.options.install_dir, install_dir.options.install_subdir);
-    const src_dir_path = self.options.source_dir.getPath2(b, step);
+    const src_dir_path = install_dir.options.source_dir.getPath2(b, step);
     var src_dir = b.build_root.handle.openDir(src_dir_path, .{ .iterate = true }) catch |err| {
         return step.fail("unable to open source directory '{}{s}': {s}", .{
             b.build_root, src_dir_path, @errorName(err),
 @@ -73,12 +72,12 @@ fn make(step: *Step, prog_node: *std.Progress.Node) !void {
     var it = try src_dir.walk(arena);
     var all_cached = true;
     next_entry: while (try it.next()) |entry| {
-        for (self.options.exclude_extensions) |ext| {
+        for (install_dir.options.exclude_extensions) |ext| {
             if (mem.endsWith(u8, entry.path, ext)) {
                 continue :next_entry;
             }
         }
-        if (self.options.include_extensions) |incs| {
+        if (install_dir.options.include_extensions) |incs| {
             var found = false;
             for (incs) |inc| {
                 if (mem.endsWith(u8, entry.path, inc)) {
 @@ -90,14 +89,14 @@ fn make(step: *Step, prog_node: *std.Progress.Node) !void {
         }
         // relative to src build root
-        const src_sub_path = try fs.path.join(arena, &.{ src_dir_path, entry.path });
+        const src_sub_path = b.pathJoin(&.{ src_dir_path, entry.path });
-        const dest_path = try fs.path.join(arena, &.{ dest_prefix, entry.path });
+        const dest_path = b.pathJoin(&.{ dest_prefix, entry.path });
         const cwd = fs.cwd();
         switch (entry.kind) {
             .directory => try cwd.makePath(dest_path),
             .file => {
-                for (self.options.blank_extensions) |ext| {
+                for (install_dir.options.blank_extensions) |ext| {
                     if (mem.endsWith(u8, entry.path, ext)) {
                         try b.truncateFile(dest_path);
                         continue :next_entry;

lib/std/Build/Step/InstallFile.zig+8-8

...	@@ -5,7 +5,7 @@ const InstallDir = std.Build.InstallDir;	...	@@ -5,7 +5,7 @@ const InstallDir = std.Build.InstallDir;
5	const InstallFile = @This();	5	const InstallFile = @This();
6	const assert = std.debug.assert;	6	const assert = std.debug.assert;
7		7
8	pub const base_id = .install_file;	8	pub const base_id: Step.Id = .install_file;
9		9
10	step: Step,	10	step: Step,
11	source: LazyPath,	11	source: LazyPath,
...	@@ -20,8 +20,8 @@ pub fn create(	...	@@ -20,8 +20,8 @@ pub fn create(
20	) *InstallFile {	20	) *InstallFile {
21	assert(dest_rel_path.len != 0);	21	assert(dest_rel_path.len != 0);
22	owner.pushInstalledFile(dir, dest_rel_path);	22	owner.pushInstalledFile(dir, dest_rel_path);
23	const self = owner.allocator.create(InstallFile) catch @panic("OOM");	23	const install_file = owner.allocator.create(InstallFile) catch @panic("OOM");
24	self.* = .{	24	install_file.* = .{
25	.step = Step.init(.{	25	.step = Step.init(.{
26	.id = base_id,	26	.id = base_id,
27	.name = owner.fmt("install {s} to {s}", .{ source.getDisplayName(), dest_rel_path }),	27	.name = owner.fmt("install {s} to {s}", .{ source.getDisplayName(), dest_rel_path }),
...	@@ -32,16 +32,16 @@ pub fn create(	...	@@ -32,16 +32,16 @@ pub fn create(
32	.dir = dir.dupe(owner),	32	.dir = dir.dupe(owner),
33	.dest_rel_path = owner.dupePath(dest_rel_path),	33	.dest_rel_path = owner.dupePath(dest_rel_path),
34	};	34	};
35	source.addStepDependencies(&self.step);	35	source.addStepDependencies(&install_file.step);
36	return self;	36	return install_file;
37	}	37	}
38		38
39	fn make(step: Step, prog_node: std.Progress.Node) !void {	39	fn make(step: Step, prog_node: std.Progress.Node) !void {
40	_ = prog_node;	40	_ = prog_node;
41	const b = step.owner;	41	const b = step.owner;
42	const self: *InstallFile = @fieldParentPtr("step", step);	42	const install_file: *InstallFile = @fieldParentPtr("step", step);
43	const full_src_path = self.source.getPath2(b, step);	43	const full_src_path = install_file.source.getPath2(b, step);
44	const full_dest_path = b.getInstallPath(self.dir, self.dest_rel_path);	44	const full_dest_path = b.getInstallPath(install_file.dir, install_file.dest_rel_path);
45	const cwd = std.fs.cwd();	45	const cwd = std.fs.cwd();
46	const prev = std.fs.Dir.updateFile(cwd, full_src_path, cwd, full_dest_path, .{}) catch \|err\| {	46	const prev = std.fs.Dir.updateFile(cwd, full_src_path, cwd, full_dest_path, .{}) catch \|err\| {
47	return step.fail("unable to update file from '{s}' to '{s}': {s}", .{	47	return step.fail("unable to update file from '{s}' to '{s}': {s}", .{

lib/std/Build/Step/ObjCopy.zig+32-32

...	@@ -58,8 +58,8 @@ pub fn create(	...	@@ -58,8 +58,8 @@ pub fn create(
58	input_file: std.Build.LazyPath,	58	input_file: std.Build.LazyPath,
59	options: Options,	59	options: Options,
60	) *ObjCopy {	60	) *ObjCopy {
61	const self = owner.allocator.create(ObjCopy) catch @panic("OOM");	61	const objcopy = owner.allocator.create(ObjCopy) catch @panic("OOM");
62	self.* = ObjCopy{	62	objcopy.* = ObjCopy{
63	.step = Step.init(.{	63	.step = Step.init(.{
64	.id = base_id,	64	.id = base_id,
65	.name = owner.fmt("objcopy {s}", .{input_file.getDisplayName()}),	65	.name = owner.fmt("objcopy {s}", .{input_file.getDisplayName()}),
...	@@ -68,31 +68,31 @@ pub fn create(	...	@@ -68,31 +68,31 @@ pub fn create(
68	}),	68	}),
69	.input_file = input_file,	69	.input_file = input_file,
70	.basename = options.basename orelse input_file.getDisplayName(),	70	.basename = options.basename orelse input_file.getDisplayName(),
71	.output_file = std.Build.GeneratedFile{ .step = &self.step },	71	.output_file = std.Build.GeneratedFile{ .step = &objcopy.step },
72	.output_file_debug = if (options.strip != .none and options.extract_to_separate_file) std.Build.GeneratedFile{ .step = &self.step } else null,	72	.output_file_debug = if (options.strip != .none and options.extract_to_separate_file) std.Build.GeneratedFile{ .step = &objcopy.step } else null,
73	.format = options.format,	73	.format = options.format,
74	.only_sections = options.only_sections,	74	.only_sections = options.only_sections,
75	.pad_to = options.pad_to,	75	.pad_to = options.pad_to,
76	.strip = options.strip,	76	.strip = options.strip,
77	.compress_debug = options.compress_debug,	77	.compress_debug = options.compress_debug,
78	};	78	};
79	input_file.addStepDependencies(&self.step);	79	input_file.addStepDependencies(&objcopy.step);
80	return self;	80	return objcopy;
81	}	81	}
82		82
83	/// deprecated: use getOutput	83	/// deprecated: use getOutput
84	pub const getOutputSource = getOutput;	84	pub const getOutputSource = getOutput;
85		85
86	pub fn getOutput(self: *const ObjCopy) std.Build.LazyPath {	86	pub fn getOutput(objcopy: *const ObjCopy) std.Build.LazyPath {
87	return .{ .generated = &self.output_file };	87	return .{ .generated = &objcopy.output_file };
88	}	88	}
89	pub fn getOutputSeparatedDebug(self: *const ObjCopy) ?std.Build.LazyPath {	89	pub fn getOutputSeparatedDebug(objcopy: *const ObjCopy) ?std.Build.LazyPath {
90	return if (self.output_file_debug) \|*file\| .{ .generated = file } else null;	90	return if (objcopy.output_file_debug) \|*file\| .{ .generated = file } else null;
91	}	91	}
92		92
93	fn make(step: Step, prog_node: std.Progress.Node) !void {	93	fn make(step: Step, prog_node: std.Progress.Node) !void {
94	const b = step.owner;	94	const b = step.owner;
95	const self: *ObjCopy = @fieldParentPtr("step", step);	95	const objcopy: *ObjCopy = @fieldParentPtr("step", step);
96		96
97	var man = b.graph.cache.obtain();	97	var man = b.graph.cache.obtain();
98	defer man.deinit();	98	defer man.deinit();
...	@@ -101,24 +101,24 @@ fn make(step: Step, prog_node: std.Progress.Node) !void {	...	@@ -101,24 +101,24 @@ fn make(step: Step, prog_node: std.Progress.Node) !void {
101	// bytes when ObjCopy implementation is modified incompatibly.	101	// bytes when ObjCopy implementation is modified incompatibly.
102	man.hash.add(@as(u32, 0xe18b7baf));	102	man.hash.add(@as(u32, 0xe18b7baf));
103		103
104	const full_src_path = self.input_file.getPath(b);	104	const full_src_path = objcopy.input_file.getPath2(b, step);
105	_ = try man.addFile(full_src_path, null);	105	_ = try man.addFile(full_src_path, null);
106	man.hash.addOptionalListOfBytes(self.only_sections);	106	man.hash.addOptionalListOfBytes(objcopy.only_sections);
107	man.hash.addOptional(self.pad_to);	107	man.hash.addOptional(objcopy.pad_to);
108	man.hash.addOptional(self.format);	108	man.hash.addOptional(objcopy.format);
109	man.hash.add(self.compress_debug);	109	man.hash.add(objcopy.compress_debug);
110	man.hash.add(self.strip);	110	man.hash.add(objcopy.strip);
111	man.hash.add(self.output_file_debug != null);	111	man.hash.add(objcopy.output_file_debug != null);
112		112
113	if (try step.cacheHit(&man)) {	113	if (try step.cacheHit(&man)) {
114	// Cache hit, skip subprocess execution.	114	// Cache hit, skip subprocess execution.
115	const digest = man.final();	115	const digest = man.final();
116	self.output_file.path = try b.cache_root.join(b.allocator, &.{	116	objcopy.output_file.path = try b.cache_root.join(b.allocator, &.{
117	"o", &digest, self.basename,	117	"o", &digest, objcopy.basename,
118	});	118	});
119	if (self.output_file_debug) \|*file\| {	119	if (objcopy.output_file_debug) \|*file\| {
120	file.path = try b.cache_root.join(b.allocator, &.{	120	file.path = try b.cache_root.join(b.allocator, &.{
121	"o", &digest, b.fmt("{s}.debug", .{self.basename}),	121	"o", &digest, b.fmt("{s}.debug", .{objcopy.basename}),
122	});	122	});
123	}	123	}
124	return;	124	return;
...	@@ -126,8 +126,8 @@ fn make(step: Step, prog_node: std.Progress.Node) !void {	...	@@ -126,8 +126,8 @@ fn make(step: Step, prog_node: std.Progress.Node) !void {
126		126
127	const digest = man.final();	127	const digest = man.final();
128	const cache_path = "o" ++ fs.path.sep_str ++ digest;	128	const cache_path = "o" ++ fs.path.sep_str ++ digest;
129	const full_dest_path = try b.cache_root.join(b.allocator, &.{ cache_path, self.basename });	129	const full_dest_path = try b.cache_root.join(b.allocator, &.{ cache_path, objcopy.basename });
130	const full_dest_path_debug = try b.cache_root.join(b.allocator, &.{ cache_path, b.fmt("{s}.debug", .{self.basename}) });	130	const full_dest_path_debug = try b.cache_root.join(b.allocator, &.{ cache_path, b.fmt("{s}.debug", .{objcopy.basename}) });
131	b.cache_root.handle.makePath(cache_path) catch \|err\| {	131	b.cache_root.handle.makePath(cache_path) catch \|err\| {
132	return step.fail("unable to make path {s}: {s}", .{ cache_path, @errorName(err) });	132	return step.fail("unable to make path {s}: {s}", .{ cache_path, @errorName(err) });
133	};	133	};
...	@@ -135,28 +135,28 @@ fn make(step: Step, prog_node: std.Progress.Node) !void {	...	@@ -135,28 +135,28 @@ fn make(step: Step, prog_node: std.Progress.Node) !void {
135	var argv = std.ArrayList([]const u8).init(b.allocator);	135	var argv = std.ArrayList([]const u8).init(b.allocator);
136	try argv.appendSlice(&.{ b.graph.zig_exe, "objcopy" });	136	try argv.appendSlice(&.{ b.graph.zig_exe, "objcopy" });
137		137
138	if (self.only_sections) \|only_sections\| {	138	if (objcopy.only_sections) \|only_sections\| {
139	for (only_sections) \|only_section\| {	139	for (only_sections) \|only_section\| {
140	try argv.appendSlice(&.{ "-j", only_section });	140	try argv.appendSlice(&.{ "-j", only_section });
141	}	141	}
142	}	142	}
143	switch (self.strip) {	143	switch (objcopy.strip) {
144	.none => {},	144	.none => {},
145	.debug => try argv.appendSlice(&.{"--strip-debug"}),	145	.debug => try argv.appendSlice(&.{"--strip-debug"}),
146	.debug_and_symbols => try argv.appendSlice(&.{"--strip-all"}),	146	.debug_and_symbols => try argv.appendSlice(&.{"--strip-all"}),
147	}	147	}
148	if (self.pad_to) \|pad_to\| {	148	if (objcopy.pad_to) \|pad_to\| {
149	try argv.appendSlice(&.{ "--pad-to", b.fmt("{d}", .{pad_to}) });	149	try argv.appendSlice(&.{ "--pad-to", b.fmt("{d}", .{pad_to}) });
150	}	150	}
151	if (self.format) \|format\| switch (format) {	151	if (objcopy.format) \|format\| switch (format) {
152	.bin => try argv.appendSlice(&.{ "-O", "binary" }),	152	.bin => try argv.appendSlice(&.{ "-O", "binary" }),
153	.hex => try argv.appendSlice(&.{ "-O", "hex" }),	153	.hex => try argv.appendSlice(&.{ "-O", "hex" }),
154	.elf => try argv.appendSlice(&.{ "-O", "elf" }),	154	.elf => try argv.appendSlice(&.{ "-O", "elf" }),
155	};	155	};
156	if (self.compress_debug) {	156	if (objcopy.compress_debug) {
157	try argv.appendSlice(&.{"--compress-debug-sections"});	157	try argv.appendSlice(&.{"--compress-debug-sections"});
158	}	158	}
159	if (self.output_file_debug != null) {	159	if (objcopy.output_file_debug != null) {
160	try argv.appendSlice(&.{b.fmt("--extract-to={s}", .{full_dest_path_debug})});	160	try argv.appendSlice(&.{b.fmt("--extract-to={s}", .{full_dest_path_debug})});
161	}	161	}
162		162
...	@@ -165,7 +165,7 @@ fn make(step: Step, prog_node: std.Progress.Node) !void {	...	@@ -165,7 +165,7 @@ fn make(step: Step, prog_node: std.Progress.Node) !void {
165	try argv.append("--listen=-");	165	try argv.append("--listen=-");
166	_ = try step.evalZigProcess(argv.items, prog_node);	166	_ = try step.evalZigProcess(argv.items, prog_node);
167		167
168	self.output_file.path = full_dest_path;	168	objcopy.output_file.path = full_dest_path;
169	if (self.output_file_debug) \|*file\| file.path = full_dest_path_debug;	169	if (objcopy.output_file_debug) \|*file\| file.path = full_dest_path_debug;
170	try man.writeManifest();	170	try man.writeManifest();
171	}	171	}

lib/std/Build/Step/Options.zig+52-52

...	@@ -7,7 +7,7 @@ const LazyPath = std.Build.LazyPath;	...	@@ -7,7 +7,7 @@ const LazyPath = std.Build.LazyPath;
7		7
8	const Options = @This();	8	const Options = @This();
9		9
10	pub const base_id = .options;	10	pub const base_id: Step.Id = .options;
11		11
12	step: Step,	12	step: Step,
13	generated_file: GeneratedFile,	13	generated_file: GeneratedFile,
...	@@ -17,8 +17,8 @@ args: std.ArrayList(Arg),	...	@@ -17,8 +17,8 @@ args: std.ArrayList(Arg),
17	encountered_types: std.StringHashMap(void),	17	encountered_types: std.StringHashMap(void),
18		18
19	pub fn create(owner: std.Build) Options {	19	pub fn create(owner: std.Build) Options {
20	const self = owner.allocator.create(Options) catch @panic("OOM");	20	const options = owner.allocator.create(Options) catch @panic("OOM");
21	self.* = .{	21	options.* = .{
22	.step = Step.init(.{	22	.step = Step.init(.{
23	.id = base_id,	23	.id = base_id,
24	.name = "options",	24	.name = "options",
...	@@ -30,21 +30,21 @@ pub fn create(owner: std.Build) Options {	...	@@ -30,21 +30,21 @@ pub fn create(owner: std.Build) Options {
30	.args = std.ArrayList(Arg).init(owner.allocator),	30	.args = std.ArrayList(Arg).init(owner.allocator),
31	.encountered_types = std.StringHashMap(void).init(owner.allocator),	31	.encountered_types = std.StringHashMap(void).init(owner.allocator),
32	};	32	};
33	self.generated_file = .{ .step = &self.step };	33	options.generated_file = .{ .step = &options.step };
34		34
35	return self;	35	return options;
36	}	36	}
37		37
38	pub fn addOption(self: *Options, comptime T: type, name: []const u8, value: T) void {	38	pub fn addOption(options: *Options, comptime T: type, name: []const u8, value: T) void {
39	return addOptionFallible(self, T, name, value) catch @panic("unhandled error");	39	return addOptionFallible(options, T, name, value) catch @panic("unhandled error");
40	}	40	}
41		41
42	fn addOptionFallible(self: *Options, comptime T: type, name: []const u8, value: T) !void {	42	fn addOptionFallible(options: *Options, comptime T: type, name: []const u8, value: T) !void {
43	const out = self.contents.writer();	43	const out = options.contents.writer();
44	try printType(self, out, T, value, 0, name);	44	try printType(options, out, T, value, 0, name);
45	}	45	}
46		46
47	fn printType(self: *Options, out: anytype, comptime T: type, value: T, indent: u8, name: ?[]const u8) !void {	47	fn printType(options: *Options, out: anytype, comptime T: type, value: T, indent: u8, name: ?[]const u8) !void {
48	switch (T) {	48	switch (T) {
49	[]const []const u8 => {	49	[]const []const u8 => {
50	if (name) \|payload\| {	50	if (name) \|payload\| {
...	@@ -159,7 +159,7 @@ fn printType(self: *Options, out: anytype, comptime T: type, value: T, indent: u	...	@@ -159,7 +159,7 @@ fn printType(self: *Options, out: anytype, comptime T: type, value: T, indent: u
159	try out.print("{s} {{\n", .{@typeName(T)});	159	try out.print("{s} {{\n", .{@typeName(T)});
160	for (value) \|item\| {	160	for (value) \|item\| {
161	try out.writeByteNTimes(' ', indent + 4);	161	try out.writeByteNTimes(' ', indent + 4);
162	try printType(self, out, @TypeOf(item), item, indent + 4, null);	162	try printType(options, out, @TypeOf(item), item, indent + 4, null);
163	}	163	}
164	try out.writeByteNTimes(' ', indent);	164	try out.writeByteNTimes(' ', indent);
165	try out.writeAll("}");	165	try out.writeAll("}");
...	@@ -183,7 +183,7 @@ fn printType(self: *Options, out: anytype, comptime T: type, value: T, indent: u	...	@@ -183,7 +183,7 @@ fn printType(self: *Options, out: anytype, comptime T: type, value: T, indent: u
183	try out.print("&[_]{s} {{\n", .{@typeName(p.child)});	183	try out.print("&[_]{s} {{\n", .{@typeName(p.child)});
184	for (value) \|item\| {	184	for (value) \|item\| {
185	try out.writeByteNTimes(' ', indent + 4);	185	try out.writeByteNTimes(' ', indent + 4);
186	try printType(self, out, @TypeOf(item), item, indent + 4, null);	186	try printType(options, out, @TypeOf(item), item, indent + 4, null);
187	}	187	}
188	try out.writeByteNTimes(' ', indent);	188	try out.writeByteNTimes(' ', indent);
189	try out.writeAll("}");	189	try out.writeAll("}");
...	@@ -201,10 +201,10 @@ fn printType(self: *Options, out: anytype, comptime T: type, value: T, indent: u	...	@@ -201,10 +201,10 @@ fn printType(self: *Options, out: anytype, comptime T: type, value: T, indent: u
201	}	201	}
202		202
203	if (value) \|inner\| {	203	if (value) \|inner\| {
204	try printType(self, out, @TypeOf(inner), inner, indent + 4, null);	204	try printType(options, out, @TypeOf(inner), inner, indent + 4, null);
205	// Pop the '\n' and ',' chars	205	// Pop the '\n' and ',' chars
206	_ = self.contents.pop();	206	_ = options.contents.pop();
207	_ = self.contents.pop();	207	_ = options.contents.pop();
208	} else {	208	} else {
209	try out.writeAll("null");	209	try out.writeAll("null");
210	}	210	}
...	@@ -231,7 +231,7 @@ fn printType(self: *Options, out: anytype, comptime T: type, value: T, indent: u	...	@@ -231,7 +231,7 @@ fn printType(self: *Options, out: anytype, comptime T: type, value: T, indent: u
231	return;	231	return;
232	},	232	},
233	.Enum => \|info\| {	233	.Enum => \|info\| {
234	try printEnum(self, out, T, info, indent);	234	try printEnum(options, out, T, info, indent);
235		235
236	if (name) \|some\| {	236	if (name) \|some\| {
237	try out.print("pub const {}: {} = .{p_};\n", .{	237	try out.print("pub const {}: {} = .{p_};\n", .{
...	@@ -243,14 +243,14 @@ fn printType(self: *Options, out: anytype, comptime T: type, value: T, indent: u	...	@@ -243,14 +243,14 @@ fn printType(self: *Options, out: anytype, comptime T: type, value: T, indent: u
243	return;	243	return;
244	},	244	},
245	.Struct => \|info\| {	245	.Struct => \|info\| {
246	try printStruct(self, out, T, info, indent);	246	try printStruct(options, out, T, info, indent);
247		247
248	if (name) \|some\| {	248	if (name) \|some\| {
249	try out.print("pub const {}: {} = ", .{	249	try out.print("pub const {}: {} = ", .{
250	std.zig.fmtId(some),	250	std.zig.fmtId(some),
251	std.zig.fmtId(@typeName(T)),	251	std.zig.fmtId(@typeName(T)),
252	});	252	});
253	try printStructValue(self, out, info, value, indent);	253	try printStructValue(options, out, info, value, indent);
254	}	254	}
255	return;	255	return;
256	},	256	},
...	@@ -258,20 +258,20 @@ fn printType(self: *Options, out: anytype, comptime T: type, value: T, indent: u	...	@@ -258,20 +258,20 @@ fn printType(self: *Options, out: anytype, comptime T: type, value: T, indent: u
258	}	258	}
259	}	259	}
260		260
261	fn printUserDefinedType(self: *Options, out: anytype, comptime T: type, indent: u8) !void {	261	fn printUserDefinedType(options: *Options, out: anytype, comptime T: type, indent: u8) !void {
262	switch (@typeInfo(T)) {	262	switch (@typeInfo(T)) {
263	.Enum => \|info\| {	263	.Enum => \|info\| {
264	return try printEnum(self, out, T, info, indent);	264	return try printEnum(options, out, T, info, indent);
265	},	265	},
266	.Struct => \|info\| {	266	.Struct => \|info\| {
267	return try printStruct(self, out, T, info, indent);	267	return try printStruct(options, out, T, info, indent);
268	},	268	},
269	else => {},	269	else => {},
270	}	270	}
271	}	271	}
272		272
273	fn printEnum(self: *Options, out: anytype, comptime T: type, comptime val: std.builtin.Type.Enum, indent: u8) !void {	273	fn printEnum(options: *Options, out: anytype, comptime T: type, comptime val: std.builtin.Type.Enum, indent: u8) !void {
274	const gop = try self.encountered_types.getOrPut(@typeName(T));	274	const gop = try options.encountered_types.getOrPut(@typeName(T));
275	if (gop.found_existing) return;	275	if (gop.found_existing) return;
276		276
277	try out.writeByteNTimes(' ', indent);	277	try out.writeByteNTimes(' ', indent);
...	@@ -291,8 +291,8 @@ fn printEnum(self: *Options, out: anytype, comptime T: type, comptime val: std.b	...	@@ -291,8 +291,8 @@ fn printEnum(self: *Options, out: anytype, comptime T: type, comptime val: std.b
291	try out.writeAll("};\n");	291	try out.writeAll("};\n");
292	}	292	}
293		293
294	fn printStruct(self: *Options, out: anytype, comptime T: type, comptime val: std.builtin.Type.Struct, indent: u8) !void {	294	fn printStruct(options: *Options, out: anytype, comptime T: type, comptime val: std.builtin.Type.Struct, indent: u8) !void {
295	const gop = try self.encountered_types.getOrPut(@typeName(T));	295	const gop = try options.encountered_types.getOrPut(@typeName(T));
296	if (gop.found_existing) return;	296	if (gop.found_existing) return;
297		297
298	try out.writeByteNTimes(' ', indent);	298	try out.writeByteNTimes(' ', indent);
...	@@ -325,9 +325,9 @@ fn printStruct(self: *Options, out: anytype, comptime T: type, comptime val: std	...	@@ -325,9 +325,9 @@ fn printStruct(self: *Options, out: anytype, comptime T: type, comptime val: std
325	switch (@typeInfo(@TypeOf(default_value))) {	325	switch (@typeInfo(@TypeOf(default_value))) {
326	.Enum => try out.print(".{s},\n", .{@tagName(default_value)}),	326	.Enum => try out.print(".{s},\n", .{@tagName(default_value)}),
327	.Struct => \|info\| {	327	.Struct => \|info\| {
328	try printStructValue(self, out, info, default_value, indent + 4);	328	try printStructValue(options, out, info, default_value, indent + 4);
329	},	329	},
330	else => try printType(self, out, @TypeOf(default_value), default_value, indent, null),	330	else => try printType(options, out, @TypeOf(default_value), default_value, indent, null),
331	}	331	}
332	} else {	332	} else {
333	try out.writeAll(",\n");	333	try out.writeAll(",\n");
...	@@ -340,17 +340,17 @@ fn printStruct(self: *Options, out: anytype, comptime T: type, comptime val: std	...	@@ -340,17 +340,17 @@ fn printStruct(self: *Options, out: anytype, comptime T: type, comptime val: std
340	try out.writeAll("};\n");	340	try out.writeAll("};\n");
341		341
342	inline for (val.fields) \|field\| {	342	inline for (val.fields) \|field\| {
343	try printUserDefinedType(self, out, field.type, 0);	343	try printUserDefinedType(options, out, field.type, 0);
344	}	344	}
345	}	345	}
346		346
347	fn printStructValue(self: *Options, out: anytype, comptime struct_val: std.builtin.Type.Struct, val: anytype, indent: u8) !void {	347	fn printStructValue(options: *Options, out: anytype, comptime struct_val: std.builtin.Type.Struct, val: anytype, indent: u8) !void {
348	try out.writeAll(".{\n");	348	try out.writeAll(".{\n");
349		349
350	if (struct_val.is_tuple) {	350	if (struct_val.is_tuple) {
351	inline for (struct_val.fields) \|field\| {	351	inline for (struct_val.fields) \|field\| {
352	try out.writeByteNTimes(' ', indent);	352	try out.writeByteNTimes(' ', indent);
353	try printType(self, out, @TypeOf(@field(val, field.name)), @field(val, field.name), indent, null);	353	try printType(options, out, @TypeOf(@field(val, field.name)), @field(val, field.name), indent, null);
354	}	354	}
355	} else {	355	} else {
356	inline for (struct_val.fields) \|field\| {	356	inline for (struct_val.fields) \|field\| {
...	@@ -361,9 +361,9 @@ fn printStructValue(self: *Options, out: anytype, comptime struct_val: std.built	...	@@ -361,9 +361,9 @@ fn printStructValue(self: *Options, out: anytype, comptime struct_val: std.built
361	switch (@typeInfo(@TypeOf(field_name))) {	361	switch (@typeInfo(@TypeOf(field_name))) {
362	.Enum => try out.print(".{s},\n", .{@tagName(field_name)}),	362	.Enum => try out.print(".{s},\n", .{@tagName(field_name)}),
363	.Struct => \|struct_info\| {	363	.Struct => \|struct_info\| {
364	try printStructValue(self, out, struct_info, field_name, indent + 4);	364	try printStructValue(options, out, struct_info, field_name, indent + 4);
365	},	365	},
366	else => try printType(self, out, @TypeOf(field_name), field_name, indent, null),	366	else => try printType(options, out, @TypeOf(field_name), field_name, indent, null),
367	}	367	}
368	}	368	}
369	}	369	}
...	@@ -379,25 +379,25 @@ fn printStructValue(self: *Options, out: anytype, comptime struct_val: std.built	...	@@ -379,25 +379,25 @@ fn printStructValue(self: *Options, out: anytype, comptime struct_val: std.built
379	/// The value is the path in the cache dir.	379	/// The value is the path in the cache dir.
380	/// Adds a dependency automatically.	380	/// Adds a dependency automatically.
381	pub fn addOptionPath(	381	pub fn addOptionPath(
382	self: *Options,	382	options: *Options,
383	name: []const u8,	383	name: []const u8,
384	path: LazyPath,	384	path: LazyPath,
385	) void {	385	) void {
386	self.args.append(.{	386	options.args.append(.{
387	.name = self.step.owner.dupe(name),	387	.name = options.step.owner.dupe(name),
388	.path = path.dupe(self.step.owner),	388	.path = path.dupe(options.step.owner),
389	}) catch @panic("OOM");	389	}) catch @panic("OOM");
390	path.addStepDependencies(&self.step);	390	path.addStepDependencies(&options.step);
391	}	391	}
392		392
393	/// Deprecated: use `addOptionPath(options, name, artifact.getEmittedBin())` instead.	393	/// Deprecated: use `addOptionPath(options, name, artifact.getEmittedBin())` instead.
394	pub fn addOptionArtifact(self: Options, name: []const u8, artifact: Step.Compile) void {	394	pub fn addOptionArtifact(options: Options, name: []const u8, artifact: Step.Compile) void {
395	return addOptionPath(self, name, artifact.getEmittedBin());	395	return addOptionPath(options, name, artifact.getEmittedBin());
396	}	396	}
397		397
398	pub fn createModule(self: Options) std.Build.Module {	398	pub fn createModule(options: Options) std.Build.Module {
399	return self.step.owner.createModule(.{	399	return options.step.owner.createModule(.{
400	.root_source_file = self.getOutput(),	400	.root_source_file = options.getOutput(),
401	});	401	});
402	}	402	}
403		403
...	@@ -406,8 +406,8 @@ pub const getSource = getOutput;	...	@@ -406,8 +406,8 @@ pub const getSource = getOutput;
406		406
407	/// Returns the main artifact of this Build Step which is a Zig source file	407	/// Returns the main artifact of this Build Step which is a Zig source file
408	/// generated from the key-value pairs of the Options.	408	/// generated from the key-value pairs of the Options.
409	pub fn getOutput(self: *Options) LazyPath {	409	pub fn getOutput(options: *Options) LazyPath {
410	return .{ .generated = &self.generated_file };	410	return .{ .generated = &options.generated_file };
411	}	411	}
412		412
413	fn make(step: Step, prog_node: std.Progress.Node) !void {	413	fn make(step: Step, prog_node: std.Progress.Node) !void {
...	@@ -415,13 +415,13 @@ fn make(step: Step, prog_node: std.Progress.Node) !void {	...	@@ -415,13 +415,13 @@ fn make(step: Step, prog_node: std.Progress.Node) !void {
415	_ = prog_node;	415	_ = prog_node;
416		416
417	const b = step.owner;	417	const b = step.owner;
418	const self: *Options = @fieldParentPtr("step", step);	418	const options: *Options = @fieldParentPtr("step", step);
419		419
420	for (self.args.items) \|item\| {	420	for (options.args.items) \|item\| {
421	self.addOption(	421	options.addOption(
422	[]const u8,	422	[]const u8,
423	item.name,	423	item.name,
424	item.path.getPath(b),	424	item.path.getPath2(b, step),
425	);	425	);
426	}	426	}
427		427
...	@@ -432,10 +432,10 @@ fn make(step: Step, prog_node: std.Progress.Node) !void {	...	@@ -432,10 +432,10 @@ fn make(step: Step, prog_node: std.Progress.Node) !void {
432	// Random bytes to make unique. Refresh this with new random bytes when	432	// Random bytes to make unique. Refresh this with new random bytes when
433	// implementation is modified in a non-backwards-compatible way.	433	// implementation is modified in a non-backwards-compatible way.
434	hash.add(@as(u32, 0xad95e922));	434	hash.add(@as(u32, 0xad95e922));
435	hash.addBytes(self.contents.items);	435	hash.addBytes(options.contents.items);
436	const sub_path = "c" ++ fs.path.sep_str ++ hash.final() ++ fs.path.sep_str ++ basename;	436	const sub_path = "c" ++ fs.path.sep_str ++ hash.final() ++ fs.path.sep_str ++ basename;
437		437
438	self.generated_file.path = try b.cache_root.join(b.allocator, &.{sub_path});	438	options.generated_file.path = try b.cache_root.join(b.allocator, &.{sub_path});
439		439
440	// Optimize for the hot path. Stat the file, and if it already exists,	440	// Optimize for the hot path. Stat the file, and if it already exists,
441	// cache hit.	441	// cache hit.
...	@@ -464,7 +464,7 @@ fn make(step: Step, prog_node: std.Progress.Node) !void {	...	@@ -464,7 +464,7 @@ fn make(step: Step, prog_node: std.Progress.Node) !void {
464	});	464	});
465	};	465	};
466		466
467	b.cache_root.handle.writeFile(.{ .sub_path = tmp_sub_path, .data = self.contents.items }) catch \|err\| {	467	b.cache_root.handle.writeFile(.{ .sub_path = tmp_sub_path, .data = options.contents.items }) catch \|err\| {
468	return step.fail("unable to write options to '{}{s}': {s}", .{	468	return step.fail("unable to write options to '{}{s}': {s}", .{
469	b.cache_root, tmp_sub_path, @errorName(err),	469	b.cache_root, tmp_sub_path, @errorName(err),
470	});	470	});

lib/std/Build/Step/RemoveDir.zig+9-9

...	@@ -3,23 +3,23 @@ const fs = std.fs;	...	@@ -3,23 +3,23 @@ const fs = std.fs;
3	const Step = std.Build.Step;	3	const Step = std.Build.Step;
4	const RemoveDir = @This();	4	const RemoveDir = @This();
5		5
6	pub const base_id = .remove_dir;	6	pub const base_id: Step.Id = .remove_dir;
7		7
8	step: Step,	8	step: Step,
9	dir_path: []const u8,	9	dir_path: []const u8,
10		10
11	pub fn create(owner: std.Build, dir_path: []const u8) RemoveDir {	11	pub fn create(owner: std.Build, dir_path: []const u8) RemoveDir {
12	const self = owner.allocator.create(RemoveDir) catch @panic("OOM");	12	const remove_dir = owner.allocator.create(RemoveDir) catch @panic("OOM");
13	self.* = .{	13	remove_dir.* = .{
14	.step = Step.init(.{	14	.step = Step.init(.{
15	.id = .remove_dir,	15	.id = base_id,
16	.name = owner.fmt("RemoveDir {s}", .{dir_path}),	16	.name = owner.fmt("RemoveDir {s}", .{dir_path}),
17	.owner = owner,	17	.owner = owner,
18	.makeFn = make,	18	.makeFn = make,
19	}),	19	}),
20	.dir_path = owner.dupePath(dir_path),	20	.dir_path = owner.dupePath(dir_path),
21	};	21	};
22	return self;	22	return remove_dir;
23	}	23	}
24		24
25	fn make(step: Step, prog_node: std.Progress.Node) !void {	25	fn make(step: Step, prog_node: std.Progress.Node) !void {
...	@@ -28,16 +28,16 @@ fn make(step: Step, prog_node: std.Progress.Node) !void {	...	@@ -28,16 +28,16 @@ fn make(step: Step, prog_node: std.Progress.Node) !void {
28	_ = prog_node;	28	_ = prog_node;
29		29
30	const b = step.owner;	30	const b = step.owner;
31	const self: *RemoveDir = @fieldParentPtr("step", step);	31	const remove_dir: *RemoveDir = @fieldParentPtr("step", step);
32		32
33	b.build_root.handle.deleteTree(self.dir_path) catch \|err\| {	33	b.build_root.handle.deleteTree(remove_dir.dir_path) catch \|err\| {
34	if (b.build_root.path) \|base\| {	34	if (b.build_root.path) \|base\| {
35	return step.fail("unable to recursively delete path '{s}/{s}': {s}", .{	35	return step.fail("unable to recursively delete path '{s}/{s}': {s}", .{
36	base, self.dir_path, @errorName(err),	36	base, remove_dir.dir_path, @errorName(err),
37	});	37	});
38	} else {	38	} else {
39	return step.fail("unable to recursively delete path '{s}': {s}", .{	39	return step.fail("unable to recursively delete path '{s}': {s}", .{
40	self.dir_path, @errorName(err),	40	remove_dir.dir_path, @errorName(err),
41	});	41	});
42	}	42	}
43	};	43	};

lib/std/Build/Step/Run.zig+195-196

 @@ -140,8 +140,8 @@ pub const Output = struct {
 };
 pub fn create(owner: *std.Build, name: []const u8) *Run {
-    const self = owner.allocator.create(Run) catch @panic("OOM");
+    const run = owner.allocator.create(Run) catch @panic("OOM");
-    self.* = .{
+    run.* = .{
         .step = Step.init(.{
             .id = base_id,
             .name = name,
 @@ -164,24 +164,24 @@ pub fn create(owner: *std.Build, name: []const u8) *Run {
         .dep_output_file = null,
         .has_side_effects = false,
     };
-    return self;
+    return run;
 }
-pub fn setName(self: *Run, name: []const u8) void {
+pub fn setName(run: *Run, name: []const u8) void {
-    self.step.name = name;
+    run.step.name = name;
-    self.rename_step_with_output_arg = false;
+    run.rename_step_with_output_arg = false;
 }
-pub fn enableTestRunnerMode(self: *Run) void {
+pub fn enableTestRunnerMode(run: *Run) void {
-    self.stdio = .zig_test;
+    run.stdio = .zig_test;
-    self.addArgs(&.{"--listen=-"});
+    run.addArgs(&.{"--listen=-"});
 }
-pub fn addArtifactArg(self: *Run, artifact: *Step.Compile) void {
+pub fn addArtifactArg(run: *Run, artifact: *Step.Compile) void {
-    const b = self.step.owner;
+    const b = run.step.owner;
     const bin_file = artifact.getEmittedBin();
-    bin_file.addStepDependencies(&self.step);
+    bin_file.addStepDependencies(&run.step);
-    self.argv.append(b.allocator, Arg{ .artifact = artifact }) catch @panic("OOM");
+    run.argv.append(b.allocator, Arg{ .artifact = artifact }) catch @panic("OOM");
 }
 /// Provides a file path as a command line argument to the command being run.
 @@ -192,8 +192,8 @@ pub fn addArtifactArg(self: *Run, artifact: *Step.Compile) void {
 /// Related:
 /// * `addPrefixedOutputFileArg` - same thing but prepends a string to the argument
 /// * `addFileArg` - for input files given to the child process
-pub fn addOutputFileArg(self: *Run, basename: []const u8) std.Build.LazyPath {
+pub fn addOutputFileArg(run: *Run, basename: []const u8) std.Build.LazyPath {
-    return self.addPrefixedOutputFileArg("", basename);
+    return run.addPrefixedOutputFileArg("", basename);
 }
 /// Provides a file path as a command line argument to the command being run.
 @@ -212,23 +212,23 @@ pub fn addOutputFileArg(self: *Run, basename: []const u8) std.Build.LazyPath {
 /// * `addOutputFileArg` - same thing but without the prefix
 /// * `addFileArg` - for input files given to the child process
 pub fn addPrefixedOutputFileArg(
-    self: *Run,
+    run: *Run,
     prefix: []const u8,
     basename: []const u8,
 ) std.Build.LazyPath {
-    const b = self.step.owner;
+    const b = run.step.owner;
     if (basename.len == 0) @panic("basename must not be empty");
     const output = b.allocator.create(Output) catch @panic("OOM");
     output.* = .{
         .prefix = b.dupe(prefix),
         .basename = b.dupe(basename),
-        .generated_file = .{ .step = &self.step },
+        .generated_file = .{ .step = &run.step },
     };
-    self.argv.append(b.allocator, .{ .output = output }) catch @panic("OOM");
+    run.argv.append(b.allocator, .{ .output = output }) catch @panic("OOM");
-    if (self.rename_step_with_output_arg) {
+    if (run.rename_step_with_output_arg) {
-        self.setName(b.fmt("{s} ({s})", .{ self.step.name, basename }));
+        run.setName(b.fmt("{s} ({s})", .{ run.step.name, basename }));
     }
     return .{ .generated = &output.generated_file };
 @@ -243,8 +243,8 @@ pub fn addPrefixedOutputFileArg(
 /// Related:
 /// * `addPrefixedFileArg` - same thing but prepends a string to the argument
 /// * `addOutputFileArg` - for files generated by the child process
-pub fn addFileArg(self: *Run, lp: std.Build.LazyPath) void {
+pub fn addFileArg(run: *Run, lp: std.Build.LazyPath) void {
-    self.addPrefixedFileArg("", lp);
+    run.addPrefixedFileArg("", lp);
 }
 /// Appends an input file to the command line arguments prepended with a string.
 @@ -259,100 +259,98 @@ pub fn addFileArg(self: *Run, lp: std.Build.LazyPath) void {
 /// Related:
 /// * `addFileArg` - same thing but without the prefix
 /// * `addOutputFileArg` - for files generated by the child process
-pub fn addPrefixedFileArg(self: *Run, prefix: []const u8, lp: std.Build.LazyPath) void {
+pub fn addPrefixedFileArg(run: *Run, prefix: []const u8, lp: std.Build.LazyPath) void {
-    const b = self.step.owner;
+    const b = run.step.owner;
     const prefixed_file_source: PrefixedLazyPath = .{
         .prefix = b.dupe(prefix),
         .lazy_path = lp.dupe(b),
     };
-    self.argv.append(b.allocator, .{ .lazy_path = prefixed_file_source }) catch @panic("OOM");
+    run.argv.append(b.allocator, .{ .lazy_path = prefixed_file_source }) catch @panic("OOM");
-    lp.addStepDependencies(&self.step);
+    lp.addStepDependencies(&run.step);
 }
 /// deprecated: use `addDirectoryArg`
 pub const addDirectorySourceArg = addDirectoryArg;
-pub fn addDirectoryArg(self: *Run, directory_source: std.Build.LazyPath) void {
+pub fn addDirectoryArg(run: *Run, directory_source: std.Build.LazyPath) void {
-    self.addPrefixedDirectoryArg("", directory_source);
+    run.addPrefixedDirectoryArg("", directory_source);
 }
 // deprecated: use `addPrefixedDirectoryArg`
 pub const addPrefixedDirectorySourceArg = addPrefixedDirectoryArg;
-pub fn addPrefixedDirectoryArg(self: *Run, prefix: []const u8, directory_source: std.Build.LazyPath) void {
+pub fn addPrefixedDirectoryArg(run: *Run, prefix: []const u8, directory_source: std.Build.LazyPath) void {
-    const b = self.step.owner;
+    const b = run.step.owner;
     const prefixed_directory_source: PrefixedLazyPath = .{
         .prefix = b.dupe(prefix),
         .lazy_path = directory_source.dupe(b),
     };
-    self.argv.append(b.allocator, .{ .directory_source = prefixed_directory_source }) catch @panic("OOM");
+    run.argv.append(b.allocator, .{ .directory_source = prefixed_directory_source }) catch @panic("OOM");
-    directory_source.addStepDependencies(&self.step);
+    directory_source.addStepDependencies(&run.step);
 }
 /// Add a path argument to a dep file (.d) for the child process to write its
 /// discovered additional dependencies.
 /// Only one dep file argument is allowed by instance.
-pub fn addDepFileOutputArg(self: *Run, basename: []const u8) std.Build.LazyPath {
+pub fn addDepFileOutputArg(run: *Run, basename: []const u8) std.Build.LazyPath {
-    return self.addPrefixedDepFileOutputArg("", basename);
+    return run.addPrefixedDepFileOutputArg("", basename);
 }
 /// Add a prefixed path argument to a dep file (.d) for the child process to
 /// write its discovered additional dependencies.
 /// Only one dep file argument is allowed by instance.
-pub fn addPrefixedDepFileOutputArg(self: *Run, prefix: []const u8, basename: []const u8) std.Build.LazyPath {
+pub fn addPrefixedDepFileOutputArg(run: *Run, prefix: []const u8, basename: []const u8) std.Build.LazyPath {
-    const b = self.step.owner;
+    const b = run.step.owner;
-    assert(self.dep_output_file == null);
+    assert(run.dep_output_file == null);
     const dep_file = b.allocator.create(Output) catch @panic("OOM");
     dep_file.* = .{
         .prefix = b.dupe(prefix),
         .basename = b.dupe(basename),
-        .generated_file = .{ .step = &self.step },
+        .generated_file = .{ .step = &run.step },
     };
-    self.dep_output_file = dep_file;
+    run.dep_output_file = dep_file;
-    self.argv.append(b.allocator, .{ .output = dep_file }) catch @panic("OOM");
+    run.argv.append(b.allocator, .{ .output = dep_file }) catch @panic("OOM");
     return .{ .generated = &dep_file.generated_file };
 }
-pub fn addArg(self: *Run, arg: []const u8) void {
+pub fn addArg(run: *Run, arg: []const u8) void {
-    const b = self.step.owner;
+    const b = run.step.owner;
-    self.argv.append(b.allocator, .{ .bytes = self.step.owner.dupe(arg) }) catch @panic("OOM");
+    run.argv.append(b.allocator, .{ .bytes = b.dupe(arg) }) catch @panic("OOM");
 }
-pub fn addArgs(self: *Run, args: []const []const u8) void {
+pub fn addArgs(run: *Run, args: []const []const u8) void {
-    for (args) |arg| {
+    for (args) |arg| run.addArg(arg);
-        self.addArg(arg);
-    }
 }
-pub fn setStdIn(self: *Run, stdin: StdIn) void {
+pub fn setStdIn(run: *Run, stdin: StdIn) void {
     switch (stdin) {
-        .lazy_path => |lazy_path| lazy_path.addStepDependencies(&self.step),
+        .lazy_path => |lazy_path| lazy_path.addStepDependencies(&run.step),
         .bytes, .none => {},
     }
-    self.stdin = stdin;
+    run.stdin = stdin;
 }
-pub fn setCwd(self: *Run, cwd: Build.LazyPath) void {
+pub fn setCwd(run: *Run, cwd: Build.LazyPath) void {
-    cwd.addStepDependencies(&self.step);
+    cwd.addStepDependencies(&run.step);
-    self.cwd = cwd;
+    run.cwd = cwd.dupe(run.step.owner);
 }
-pub fn clearEnvironment(self: *Run) void {
+pub fn clearEnvironment(run: *Run) void {
-    const b = self.step.owner;
+    const b = run.step.owner;
     const new_env_map = b.allocator.create(EnvMap) catch @panic("OOM");
     new_env_map.* = EnvMap.init(b.allocator);
-    self.env_map = new_env_map;
+    run.env_map = new_env_map;
 }
-pub fn addPathDir(self: *Run, search_path: []const u8) void {
+pub fn addPathDir(run: *Run, search_path: []const u8) void {
-    const b = self.step.owner;
+    const b = run.step.owner;
-    const env_map = getEnvMapInternal(self);
+    const env_map = getEnvMapInternal(run);
     const key = "PATH";
     const prev_path = env_map.get(key);
 @@ -365,99 +363,99 @@ pub fn addPathDir(self: *Run, search_path: []const u8) void {
     }
 }
-pub fn getEnvMap(self: *Run) *EnvMap {
+pub fn getEnvMap(run: *Run) *EnvMap {
-    return getEnvMapInternal(self);
+    return getEnvMapInternal(run);
 }
-fn getEnvMapInternal(self: *Run) *EnvMap {
+fn getEnvMapInternal(run: *Run) *EnvMap {
-    const arena = self.step.owner.allocator;
+    const arena = run.step.owner.allocator;
-    return self.env_map orelse {
+    return run.env_map orelse {
         const env_map = arena.create(EnvMap) catch @panic("OOM");
         env_map.* = process.getEnvMap(arena) catch @panic("unhandled error");
-        self.env_map = env_map;
+        run.env_map = env_map;
         return env_map;
     };
 }
-pub fn setEnvironmentVariable(self: *Run, key: []const u8, value: []const u8) void {
+pub fn setEnvironmentVariable(run: *Run, key: []const u8, value: []const u8) void {
-    const b = self.step.owner;
+    const b = run.step.owner;
-    const env_map = self.getEnvMap();
+    const env_map = run.getEnvMap();
     env_map.put(b.dupe(key), b.dupe(value)) catch @panic("unhandled error");
 }
-pub fn removeEnvironmentVariable(self: *Run, key: []const u8) void {
+pub fn removeEnvironmentVariable(run: *Run, key: []const u8) void {
-    self.getEnvMap().remove(key);
+    run.getEnvMap().remove(key);
 }
 /// Adds a check for exact stderr match. Does not add any other checks.
-pub fn expectStdErrEqual(self: *Run, bytes: []const u8) void {
+pub fn expectStdErrEqual(run: *Run, bytes: []const u8) void {
-    const new_check: StdIo.Check = .{ .expect_stderr_exact = self.step.owner.dupe(bytes) };
+    const new_check: StdIo.Check = .{ .expect_stderr_exact = run.step.owner.dupe(bytes) };
-    self.addCheck(new_check);
+    run.addCheck(new_check);
 }
 /// Adds a check for exact stdout match as well as a check for exit code 0, if
 /// there is not already an expected termination check.
-pub fn expectStdOutEqual(self: *Run, bytes: []const u8) void {
+pub fn expectStdOutEqual(run: *Run, bytes: []const u8) void {
-    const new_check: StdIo.Check = .{ .expect_stdout_exact = self.step.owner.dupe(bytes) };
+    const new_check: StdIo.Check = .{ .expect_stdout_exact = run.step.owner.dupe(bytes) };
-    self.addCheck(new_check);
+    run.addCheck(new_check);
-    if (!self.hasTermCheck()) {
+    if (!run.hasTermCheck()) {
-        self.expectExitCode(0);
+        run.expectExitCode(0);
     }
 }
-pub fn expectExitCode(self: *Run, code: u8) void {
+pub fn expectExitCode(run: *Run, code: u8) void {
     const new_check: StdIo.Check = .{ .expect_term = .{ .Exited = code } };
-    self.addCheck(new_check);
+    run.addCheck(new_check);
 }
-pub fn hasTermCheck(self: Run) bool {
+pub fn hasTermCheck(run: Run) bool {
-    for (self.stdio.check.items) |check| switch (check) {
+    for (run.stdio.check.items) |check| switch (check) {
         .expect_term => return true,
         else => continue,
     };
     return false;
 }
-pub fn addCheck(self: *Run, new_check: StdIo.Check) void {
+pub fn addCheck(run: *Run, new_check: StdIo.Check) void {
-    const b = self.step.owner;
+    const b = run.step.owner;
-    switch (self.stdio) {
+    switch (run.stdio) {
         .infer_from_args => {
-            self.stdio = .{ .check = .{} };
+            run.stdio = .{ .check = .{} };
-            self.stdio.check.append(b.allocator, new_check) catch @panic("OOM");
+            run.stdio.check.append(b.allocator, new_check) catch @panic("OOM");
         },
         .check => |*checks| checks.append(b.allocator, new_check) catch @panic("OOM"),
         else => @panic("illegal call to addCheck: conflicting helper method calls. Suggest to directly set stdio field of Run instead"),
     }
 }
-pub fn captureStdErr(self: *Run) std.Build.LazyPath {
+pub fn captureStdErr(run: *Run) std.Build.LazyPath {
-    assert(self.stdio != .inherit);
+    assert(run.stdio != .inherit);
-    if (self.captured_stderr) |output| return .{ .generated = &output.generated_file };
+    if (run.captured_stderr) |output| return .{ .generated = &output.generated_file };
-    const output = self.step.owner.allocator.create(Output) catch @panic("OOM");
+    const output = run.step.owner.allocator.create(Output) catch @panic("OOM");
     output.* = .{
         .prefix = "",
         .basename = "stderr",
-        .generated_file = .{ .step = &self.step },
+        .generated_file = .{ .step = &run.step },
     };
-    self.captured_stderr = output;
+    run.captured_stderr = output;
     return .{ .generated = &output.generated_file };
 }
-pub fn captureStdOut(self: *Run) std.Build.LazyPath {
+pub fn captureStdOut(run: *Run) std.Build.LazyPath {
-    assert(self.stdio != .inherit);
+    assert(run.stdio != .inherit);
-    if (self.captured_stdout) |output| return .{ .generated = &output.generated_file };
+    if (run.captured_stdout) |output| return .{ .generated = &output.generated_file };
-    const output = self.step.owner.allocator.create(Output) catch @panic("OOM");
+    const output = run.step.owner.allocator.create(Output) catch @panic("OOM");
     output.* = .{
         .prefix = "",
         .basename = "stdout",
-        .generated_file = .{ .step = &self.step },
+        .generated_file = .{ .step = &run.step },
     };
-    self.captured_stdout = output;
+    run.captured_stdout = output;
     return .{ .generated = &output.generated_file };
 }
 @@ -472,20 +470,20 @@ pub fn addFileInput(self: *Run, file_input: std.Build.LazyPath) void {
 }
 /// Returns whether the Run step has side effects *other than* updating the output arguments.
-fn hasSideEffects(self: Run) bool {
+fn hasSideEffects(run: Run) bool {
-    if (self.has_side_effects) return true;
+    if (run.has_side_effects) return true;
-    return switch (self.stdio) {
+    return switch (run.stdio) {
-        .infer_from_args => !self.hasAnyOutputArgs(),
+        .infer_from_args => !run.hasAnyOutputArgs(),
         .inherit => true,
         .check => false,
         .zig_test => false,
     };
 }
-fn hasAnyOutputArgs(self: Run) bool {
+fn hasAnyOutputArgs(run: Run) bool {
-    if (self.captured_stdout != null) return true;
+    if (run.captured_stdout != null) return true;
-    if (self.captured_stderr != null) return true;
+    if (run.captured_stderr != null) return true;
-    for (self.argv.items) |arg| switch (arg) {
+    for (run.argv.items) |arg| switch (arg) {
         .output => return true,
         else => continue,
     };
 @@ -527,8 +525,8 @@ const IndexedOutput = struct {
 fn make(step: *Step, prog_node: *std.Progress.Node) !void {
     const b = step.owner;
     const arena = b.allocator;
-    const self: *Run = @fieldParentPtr("step", step);
+    const run: *Run = @fieldParentPtr("step", step);
-    const has_side_effects = self.hasSideEffects();
+    const has_side_effects = run.hasSideEffects();
     var argv_list = std.ArrayList([]const u8).init(arena);
     var output_placeholders = std.ArrayList(IndexedOutput).init(arena);
 @@ -536,20 +534,20 @@ fn make(step: *Step, prog_node: *std.Progress.Node) !void {
     var man = b.graph.cache.obtain();
     defer man.deinit();
-    for (self.argv.items) |arg| {
+    for (run.argv.items) |arg| {
         switch (arg) {
             .bytes => |bytes| {
                 try argv_list.append(bytes);
                 man.hash.addBytes(bytes);
             },
             .lazy_path => |file| {
-                const file_path = file.lazy_path.getPath(b);
+                const file_path = file.lazy_path.getPath2(b, step);
                 try argv_list.append(b.fmt("{s}{s}", .{ file.prefix, file_path }));
                 man.hash.addBytes(file.prefix);
                 _ = try man.addFile(file_path, null);
             },
             .directory_source => |file| {
-                const file_path = file.lazy_path.getPath(b);
+                const file_path = file.lazy_path.getPath2(b, step);
                 try argv_list.append(b.fmt("{s}{s}", .{ file.prefix, file_path }));
                 man.hash.addBytes(file.prefix);
                 man.hash.addBytes(file_path);
 @@ -557,7 +555,7 @@ fn make(step: *Step, prog_node: *std.Progress.Node) !void {
             .artifact => |artifact| {
                 if (artifact.rootModuleTarget().os.tag == .windows) {
                     // On Windows we don't have rpaths so we have to add .dll search paths to PATH
-                    self.addPathForDynLibs(artifact);
+                    run.addPathForDynLibs(artifact);
                 }
                 const file_path = artifact.installed_path orelse artifact.generated_bin.?.path.?; // the path is guaranteed to be set
 @@ -580,36 +578,36 @@ fn make(step: *Step, prog_node: *std.Progress.Node) !void {
         }
     }
-    switch (self.stdin) {
+    switch (run.stdin) {
         .bytes => |bytes| {
             man.hash.addBytes(bytes);
         },
         .lazy_path => |lazy_path| {
-            const file_path = lazy_path.getPath(b);
+            const file_path = lazy_path.getPath2(b, step);
             _ = try man.addFile(file_path, null);
         },
         .none => {},
     }
-    if (self.captured_stdout) |output| {
+    if (run.captured_stdout) |output| {
         man.hash.addBytes(output.basename);
     }
-    if (self.captured_stderr) |output| {
+    if (run.captured_stderr) |output| {
         man.hash.addBytes(output.basename);
     }
-    hashStdIo(&man.hash, self.stdio);
+    hashStdIo(&man.hash, run.stdio);
     if (has_side_effects) {
-        try runCommand(self, argv_list.items, has_side_effects, null, prog_node);
+        try runCommand(run, argv_list.items, has_side_effects, null, prog_node);
         return;
     }
-    for (self.extra_file_dependencies) |file_path| {
+    for (run.extra_file_dependencies) |file_path| {
         _ = try man.addFile(b.pathFromRoot(file_path), null);
     }
-    for (self.file_inputs.items) |lazy_path| {
+    for (run.file_inputs.items) |lazy_path| {
         _ = try man.addFile(lazy_path.getPath2(b, step), null);
     }
 @@ -620,8 +618,8 @@ fn make(step: *Step, prog_node: *std.Progress.Node) !void {
         try populateGeneratedPaths(
             arena,
             output_placeholders.items,
-            self.captured_stdout,
+            run.captured_stdout,
-            self.captured_stderr,
+            run.captured_stderr,
             b.cache_root,
             &digest,
         );
 @@ -635,7 +633,7 @@ fn make(step: *Step, prog_node: *std.Progress.Node) !void {
     for (output_placeholders.items) |placeholder| {
         const output_components = .{ tmp_dir_path, placeholder.output.basename };
-        const output_sub_path = try fs.path.join(arena, &output_components);
+        const output_sub_path = b.pathJoin(&output_components);
         const output_sub_dir_path = fs.path.dirname(output_sub_path).?;
         b.cache_root.handle.makePath(output_sub_dir_path) catch |err| {
             return step.fail("unable to make path '{}{s}': {s}", .{
 @@ -651,15 +649,15 @@ fn make(step: *Step, prog_node: *std.Progress.Node) !void {
         argv_list.items[placeholder.index] = cli_arg;
     }
-    try runCommand(self, argv_list.items, has_side_effects, tmp_dir_path, prog_node);
+    try runCommand(run, argv_list.items, has_side_effects, tmp_dir_path, prog_node);
-    if (self.dep_output_file) |dep_output_file|
+    if (run.dep_output_file) |dep_output_file|
         try man.addDepFilePost(std.fs.cwd(), dep_output_file.generated_file.getPath());
     const digest = man.final();
     const any_output = output_placeholders.items.len > 0 or
-        self.captured_stdout != null or self.captured_stderr != null;
+        run.captured_stdout != null or run.captured_stderr != null;
     // Rename into place
     if (any_output) {
 @@ -696,8 +694,8 @@ fn make(step: *Step, prog_node: *std.Progress.Node) !void {
     try populateGeneratedPaths(
         arena,
         output_placeholders.items,
-        self.captured_stdout,
+        run.captured_stdout,
-        self.captured_stderr,
+        run.captured_stderr,
         b.cache_root,
         &digest,
     );
 @@ -776,30 +774,30 @@ fn termMatches(expected: ?std.process.Child.Term, actual: std.process.Child.Term
 }
 fn runCommand(
-    self: *Run,
+    run: *Run,
     argv: []const []const u8,
     has_side_effects: bool,
     tmp_dir_path: ?[]const u8,
     prog_node: *std.Progress.Node,
 ) !void {
-    const step = &self.step;
+    const step = &run.step;
     const b = step.owner;
     const arena = b.allocator;
-    const cwd: ?[]const u8 = if (self.cwd) |lazy_cwd| lazy_cwd.getPath(b) else null;
+    const cwd: ?[]const u8 = if (run.cwd) |lazy_cwd| lazy_cwd.getPath2(b, step) else null;
     try step.handleChildProcUnsupported(cwd, argv);
-    try Step.handleVerbose2(step.owner, cwd, self.env_map, argv);
+    try Step.handleVerbose2(step.owner, cwd, run.env_map, argv);
-    const allow_skip = switch (self.stdio) {
+    const allow_skip = switch (run.stdio) {
-        .check, .zig_test => self.skip_foreign_checks,
+        .check, .zig_test => run.skip_foreign_checks,
         else => false,
     };
     var interp_argv = std.ArrayList([]const u8).init(b.allocator);
     defer interp_argv.deinit();
-    const result = spawnChildAndCollect(self, argv, has_side_effects, prog_node) catch |err| term: {
+    const result = spawnChildAndCollect(run, argv, has_side_effects, prog_node) catch |err| term: {
         // InvalidExe: cpu arch mismatch
         // FileNotFound: can happen with a wrong dynamic linker path
         if (err == error.InvalidExe or err == error.FileNotFound) interpret: {
 @@ -807,7 +805,7 @@ fn runCommand(
             // relying on it being a Compile step. This will make this logic
             // work even for the edge case that the binary was produced by a
             // third party.
-            const exe = switch (self.argv.items[0]) {
+            const exe = switch (run.argv.items[0]) {
                 .artifact => |exe| exe,
                 else => break :interpret,
             };
 @@ -832,14 +830,14 @@ fn runCommand(
                         try interp_argv.append(bin_name);
                         try interp_argv.appendSlice(argv);
                     } else {
-                        return failForeign(self, "-fwine", argv[0], exe);
+                        return failForeign(run, "-fwine", argv[0], exe);
                     }
                 },
                 .qemu => |bin_name| {
                     if (b.enable_qemu) {
                         const glibc_dir_arg = if (need_cross_glibc)
                             b.glibc_runtimes_dir orelse
-                                return failForeign(self, "--glibc-runtimes", argv[0], exe)
+                                return failForeign(run, "--glibc-runtimes", argv[0], exe)
                         else
                             null;
 @@ -867,7 +865,7 @@ fn runCommand(
                         try interp_argv.appendSlice(argv);
                     } else {
-                        return failForeign(self, "-fqemu", argv[0], exe);
+                        return failForeign(run, "-fqemu", argv[0], exe);
                     }
                 },
                 .darling => |bin_name| {
 @@ -875,7 +873,7 @@ fn runCommand(
                         try interp_argv.append(bin_name);
                         try interp_argv.appendSlice(argv);
                     } else {
-                        return failForeign(self, "-fdarling", argv[0], exe);
+                        return failForeign(run, "-fdarling", argv[0], exe);
                     }
                 },
                 .wasmtime => |bin_name| {
 @@ -886,7 +884,7 @@ fn runCommand(
                         try interp_argv.append("--");
                         try interp_argv.appendSlice(argv[1..]);
                     } else {
-                        return failForeign(self, "-fwasmtime", argv[0], exe);
+                        return failForeign(run, "-fwasmtime", argv[0], exe);
                     }
                 },
                 .bad_dl => |foreign_dl| {
 @@ -915,13 +913,13 @@ fn runCommand(
             if (exe.rootModuleTarget().os.tag == .windows) {
                 // On Windows we don't have rpaths so we have to add .dll search paths to PATH
-                self.addPathForDynLibs(exe);
+                run.addPathForDynLibs(exe);
             }
-            try Step.handleVerbose2(step.owner, cwd, self.env_map, interp_argv.items);
+            try Step.handleVerbose2(step.owner, cwd, run.env_map, interp_argv.items);
-            break :term spawnChildAndCollect(self, interp_argv.items, has_side_effects, prog_node) catch |e| {
+            break :term spawnChildAndCollect(run, interp_argv.items, has_side_effects, prog_node) catch |e| {
-                if (!self.failing_to_execute_foreign_is_an_error) return error.MakeSkipped;
+                if (!run.failing_to_execute_foreign_is_an_error) return error.MakeSkipped;
                 return step.fail("unable to spawn interpreter {s}: {s}", .{
                     interp_argv.items[0], @errorName(e),
 @@ -943,11 +941,11 @@ fn runCommand(
     };
     for ([_]Stream{
         .{
-            .captured = self.captured_stdout,
+            .captured = run.captured_stdout,
             .bytes = result.stdio.stdout,
         },
         .{
-            .captured = self.captured_stderr,
+            .captured = run.captured_stderr,
             .bytes = result.stdio.stderr,
         },
     }) |stream| {
 @@ -956,7 +954,7 @@ fn runCommand(
             const output_path = try b.cache_root.join(arena, &output_components);
             output.generated_file.path = output_path;
-            const sub_path = try fs.path.join(arena, &output_components);
+            const sub_path = b.pathJoin(&output_components);
             const sub_path_dirname = fs.path.dirname(sub_path).?;
             b.cache_root.handle.makePath(sub_path_dirname) catch |err| {
                 return step.fail("unable to make path '{}{s}': {s}", .{
 @@ -973,7 +971,7 @@ fn runCommand(
     const final_argv = if (interp_argv.items.len == 0) argv else interp_argv.items;
-    switch (self.stdio) {
+    switch (run.stdio) {
         .check => |checks| for (checks.items) |check| switch (check) {
             .expect_stderr_exact => |expected_bytes| {
                 if (!mem.eql(u8, expected_bytes, result.stdio.stderr.?)) {
 @@ -1094,56 +1092,56 @@ const ChildProcResult = struct {
 };
 fn spawnChildAndCollect(
-    self: *Run,
+    run: *Run,
     argv: []const []const u8,
     has_side_effects: bool,
     prog_node: *std.Progress.Node,
 ) !ChildProcResult {
-    const b = self.step.owner;
+    const b = run.step.owner;
     const arena = b.allocator;
     var child = std.process.Child.init(argv, arena);
-    if (self.cwd) |lazy_cwd| {
+    if (run.cwd) |lazy_cwd| {
-        child.cwd = lazy_cwd.getPath(b);
+        child.cwd = lazy_cwd.getPath2(b, &run.step);
     } else {
         child.cwd = b.build_root.path;
         child.cwd_dir = b.build_root.handle;
     }
-    child.env_map = self.env_map orelse &b.graph.env_map;
+    child.env_map = run.env_map orelse &b.graph.env_map;
     child.request_resource_usage_statistics = true;
-    child.stdin_behavior = switch (self.stdio) {
+    child.stdin_behavior = switch (run.stdio) {
         .infer_from_args => if (has_side_effects) .Inherit else .Ignore,
         .inherit => .Inherit,
         .check => .Ignore,
         .zig_test => .Pipe,
     };
-    child.stdout_behavior = switch (self.stdio) {
+    child.stdout_behavior = switch (run.stdio) {
         .infer_from_args => if (has_side_effects) .Inherit else .Ignore,
         .inherit => .Inherit,
         .check => |checks| if (checksContainStdout(checks.items)) .Pipe else .Ignore,
         .zig_test => .Pipe,
     };
-    child.stderr_behavior = switch (self.stdio) {
+    child.stderr_behavior = switch (run.stdio) {
         .infer_from_args => if (has_side_effects) .Inherit else .Pipe,
         .inherit => .Inherit,
         .check => .Pipe,
         .zig_test => .Pipe,
     };
-    if (self.captured_stdout != null) child.stdout_behavior = .Pipe;
+    if (run.captured_stdout != null) child.stdout_behavior = .Pipe;
-    if (self.captured_stderr != null) child.stderr_behavior = .Pipe;
+    if (run.captured_stderr != null) child.stderr_behavior = .Pipe;
-    if (self.stdin != .none) {
+    if (run.stdin != .none) {
-        assert(self.stdio != .inherit);
+        assert(run.stdio != .inherit);
         child.stdin_behavior = .Pipe;
     }
     try child.spawn();
     var timer = try std.time.Timer.start();
-    const result = if (self.stdio == .zig_test)
+    const result = if (run.stdio == .zig_test)
-        evalZigTest(self, &child, prog_node)
+        evalZigTest(run, &child, prog_node)
     else
-        evalGeneric(self, &child);
+        evalGeneric(run, &child);
     const term = try child.wait();
     const elapsed_ns = timer.read();
 @@ -1164,12 +1162,12 @@ const StdIoResult = struct {
 };
 fn evalZigTest(
-    self: *Run,
+    run: *Run,
     child: *std.process.Child,
     prog_node: *std.Progress.Node,
 ) !StdIoResult {
-    const gpa = self.step.owner.allocator;
+    const gpa = run.step.owner.allocator;
-    const arena = self.step.owner.allocator;
+    const arena = run.step.owner.allocator;
     var poller = std.io.poll(gpa, enum { stdout, stderr }, .{
         .stdout = child.stdout.?,
 @@ -1208,7 +1206,7 @@ fn evalZigTest(
         switch (header.tag) {
             .zig_version => {
                 if (!std.mem.eql(u8, builtin.zig_version_string, body)) {
-                    return self.step.fail(
+                    return run.step.fail(
                         "zig version mismatch build runner vs compiler: '{s}' vs '{s}'",
                         .{ builtin.zig_version_string, body },
                     );
 @@ -1266,9 +1264,9 @@ fn evalZigTest(
                     else
                         unreachable;
                     if (msg.len > 0) {
-                        try self.step.addError("'{s}' {s}: {s}", .{ name, label, msg });
+                        try run.step.addError("'{s}' {s}: {s}", .{ name, label, msg });
                     } else {
-                        try self.step.addError("'{s}' {s}", .{ name, label });
+                        try run.step.addError("'{s}' {s}", .{ name, label });
                     }
                 }
 @@ -1282,7 +1280,7 @@ fn evalZigTest(
     if (stderr.readableLength() > 0) {
         const msg = std.mem.trim(u8, try stderr.toOwnedSlice(), "\n");
-        if (msg.len > 0) self.step.result_stderr = msg;
+        if (msg.len > 0) run.step.result_stderr = msg;
     }
     // Send EOF to stdin.
 @@ -1350,25 +1348,26 @@ fn sendRunTestMessage(file: std.fs.File, index: u32) !void {
     try file.writeAll(full_msg);
 }
-fn evalGeneric(self: *Run, child: *std.process.Child) !StdIoResult {
+fn evalGeneric(run: *Run, child: *std.process.Child) !StdIoResult {
-    const arena = self.step.owner.allocator;
+    const b = run.step.owner;
+    const arena = b.allocator;
-    switch (self.stdin) {
+    switch (run.stdin) {
         .bytes => |bytes| {
             child.stdin.?.writeAll(bytes) catch |err| {
-                return self.step.fail("unable to write stdin: {s}", .{@errorName(err)});
+                return run.step.fail("unable to write stdin: {s}", .{@errorName(err)});
             };
             child.stdin.?.close();
             child.stdin = null;
         },
         .lazy_path => |lazy_path| {
-            const path = lazy_path.getPath(self.step.owner);
+            const path = lazy_path.getPath2(b, &run.step);
-            const file = self.step.owner.build_root.handle.openFile(path, .{}) catch |err| {
+            const file = b.build_root.handle.openFile(path, .{}) catch |err| {
-                return self.step.fail("unable to open stdin file: {s}", .{@errorName(err)});
+                return run.step.fail("unable to open stdin file: {s}", .{@errorName(err)});
             };
             defer file.close();
             child.stdin.?.writeFileAll(file, .{}) catch |err| {
-                return self.step.fail("unable to write file to stdin: {s}", .{@errorName(err)});
+                return run.step.fail("unable to write file to stdin: {s}", .{@errorName(err)});
             };
             child.stdin.?.close();
             child.stdin = null;
 @@ -1388,29 +1387,29 @@ fn evalGeneric(self: *Run, child: *std.process.Child) !StdIoResult {
             defer poller.deinit();
             while (try poller.poll()) {
-                if (poller.fifo(.stdout).count > self.max_stdio_size)
+                if (poller.fifo(.stdout).count > run.max_stdio_size)
                     return error.StdoutStreamTooLong;
-                if (poller.fifo(.stderr).count > self.max_stdio_size)
+                if (poller.fifo(.stderr).count > run.max_stdio_size)
                     return error.StderrStreamTooLong;
             }
             stdout_bytes = try poller.fifo(.stdout).toOwnedSlice();
             stderr_bytes = try poller.fifo(.stderr).toOwnedSlice();
         } else {
-            stdout_bytes = try stdout.reader().readAllAlloc(arena, self.max_stdio_size);
+            stdout_bytes = try stdout.reader().readAllAlloc(arena, run.max_stdio_size);
         }
     } else if (child.stderr) |stderr| {
-        stderr_bytes = try stderr.reader().readAllAlloc(arena, self.max_stdio_size);
+        stderr_bytes = try stderr.reader().readAllAlloc(arena, run.max_stdio_size);
     }
     if (stderr_bytes) |bytes| if (bytes.len > 0) {
         // Treat stderr as an error message.
-        const stderr_is_diagnostic = self.captured_stderr == null and switch (self.stdio) {
+        const stderr_is_diagnostic = run.captured_stderr == null and switch (run.stdio) {
             .check => |checks| !checksContainStderr(checks.items),
             else => true,
         };
         if (stderr_is_diagnostic) {
-            self.step.result_stderr = bytes;
+            run.step.result_stderr = bytes;
         }
     };
 @@ -1422,8 +1421,8 @@ fn evalGeneric(self: *Run, child: *std.process.Child) !StdIoResult {
     };
 }
-fn addPathForDynLibs(self: *Run, artifact: *Step.Compile) void {
+fn addPathForDynLibs(run: *Run, artifact: *Step.Compile) void {
-    const b = self.step.owner;
+    const b = run.step.owner;
     var it = artifact.root_module.iterateDependencies(artifact, true);
     while (it.next()) |item| {
         const other = item.compile.?;
 @@ -1431,34 +1430,34 @@ fn addPathForDynLibs(self: *Run, artifact: *Step.Compile) void {
             if (item.module.resolved_target.?.result.os.tag == .windows and
                 other.isDynamicLibrary())
             {
-                addPathDir(self, fs.path.dirname(other.getEmittedBin().getPath(b)).?);
+                addPathDir(run, fs.path.dirname(other.getEmittedBin().getPath2(b, &run.step)).?);
             }
         }
     }
 }
 fn failForeign(
-    self: *Run,
+    run: *Run,
     suggested_flag: []const u8,
     argv0: []const u8,
     exe: *Step.Compile,
 ) error{ MakeFailed, MakeSkipped, OutOfMemory } {
-    switch (self.stdio) {
+    switch (run.stdio) {
         .check, .zig_test => {
-            if (self.skip_foreign_checks)
+            if (run.skip_foreign_checks)
                 return error.MakeSkipped;
-            const b = self.step.owner;
+            const b = run.step.owner;
             const host_name = try b.host.result.zigTriple(b.allocator);
             const foreign_name = try exe.rootModuleTarget().zigTriple(b.allocator);
-            return self.step.fail(
+            return run.step.fail(
                 \\unable to spawn foreign binary '{s}' ({s}) on host system ({s})
                 \\  consider using {s} or enabling skip_foreign_checks in the Run step
             , .{ argv0, foreign_name, host_name, suggested_flag });
         },
         else => {
-            return self.step.fail("unable to spawn foreign binary '{s}'", .{argv0});
+            return run.step.fail("unable to spawn foreign binary '{s}'", .{argv0});
         },
     }
 }

lib/std/Build/Step/TranslateC.zig+42-45

 @@ -5,7 +5,7 @@ const mem = std.mem;
 const TranslateC = @This();
-pub const base_id = .translate_c;
+pub const base_id: Step.Id = .translate_c;
 step: Step,
 source: std.Build.LazyPath,
 @@ -27,11 +27,11 @@ pub const Options = struct {
 };
 pub fn create(owner: *std.Build, options: Options) *TranslateC {
-    const self = owner.allocator.create(TranslateC) catch @panic("OOM");
+    const translate_c = owner.allocator.create(TranslateC) catch @panic("OOM");
     const source = options.root_source_file.dupe(owner);
-    self.* = TranslateC{
+    translate_c.* = TranslateC{
         .step = Step.init(.{
-            .id = .translate_c,
+            .id = base_id,
             .name = "translate-c",
             .owner = owner,
             .makeFn = make,
 @@ -42,12 +42,12 @@ pub fn create(owner: *std.Build, options: Options) *TranslateC {
         .out_basename = undefined,
         .target = options.target,
         .optimize = options.optimize,
-        .output_file = std.Build.GeneratedFile{ .step = &self.step },
+        .output_file = std.Build.GeneratedFile{ .step = &translate_c.step },
         .link_libc = options.link_libc,
         .use_clang = options.use_clang,
     };
-    source.addStepDependencies(&self.step);
+    source.addStepDependencies(&translate_c.step);
-    return self;
+    return translate_c;
 }
 pub const AddExecutableOptions = struct {
 @@ -58,18 +58,18 @@ pub const AddExecutableOptions = struct {
     linkage: ?std.builtin.LinkMode = null,
 };
-pub fn getOutput(self: *TranslateC) std.Build.LazyPath {
+pub fn getOutput(translate_c: *TranslateC) std.Build.LazyPath {
-    return .{ .generated = &self.output_file };
+    return .{ .generated = &translate_c.output_file };
 }
 /// Creates a step to build an executable from the translated source.
-pub fn addExecutable(self: *TranslateC, options: AddExecutableOptions) *Step.Compile {
+pub fn addExecutable(translate_c: *TranslateC, options: AddExecutableOptions) *Step.Compile {
-    return self.step.owner.addExecutable(.{
+    return translate_c.step.owner.addExecutable(.{
-        .root_source_file = self.getOutput(),
+        .root_source_file = translate_c.getOutput(),
         .name = options.name orelse "translated_c",
         .version = options.version,
-        .target = options.target orelse self.target,
+        .target = options.target orelse translate_c.target,
-        .optimize = options.optimize orelse self.optimize,
+        .optimize = options.optimize orelse translate_c.optimize,
         .linkage = options.linkage,
     });
 }
 @@ -77,90 +77,87 @@ pub fn addExecutable(self: *TranslateC, options: AddExecutableOptions) *Step.Com
 /// Creates a module from the translated source and adds it to the package's
 /// module set making it available to other packages which depend on this one.
 /// `createModule` can be used instead to create a private module.
-pub fn addModule(self: *TranslateC, name: []const u8) *std.Build.Module {
+pub fn addModule(translate_c: *TranslateC, name: []const u8) *std.Build.Module {
-    return self.step.owner.addModule(name, .{
+    return translate_c.step.owner.addModule(name, .{
-        .root_source_file = self.getOutput(),
+        .root_source_file = translate_c.getOutput(),
     });
 }
 /// Creates a private module from the translated source to be used by the
 /// current package, but not exposed to other packages depending on this one.
 /// `addModule` can be used instead to create a public module.
-pub fn createModule(self: *TranslateC) *std.Build.Module {
+pub fn createModule(translate_c: *TranslateC) *std.Build.Module {
-    return self.step.owner.createModule(.{
+    return translate_c.step.owner.createModule(.{
-        .root_source_file = self.getOutput(),
+        .root_source_file = translate_c.getOutput(),
     });
 }
-pub fn addIncludeDir(self: *TranslateC, include_dir: []const u8) void {
+pub fn addIncludeDir(translate_c: *TranslateC, include_dir: []const u8) void {
-    self.include_dirs.append(self.step.owner.dupePath(include_dir)) catch @panic("OOM");
+    translate_c.include_dirs.append(translate_c.step.owner.dupePath(include_dir)) catch @panic("OOM");
 }
-pub fn addCheckFile(self: *TranslateC, expected_matches: []const []const u8) *Step.CheckFile {
+pub fn addCheckFile(translate_c: *TranslateC, expected_matches: []const []const u8) *Step.CheckFile {
     return Step.CheckFile.create(
-        self.step.owner,
+        translate_c.step.owner,
-        self.getOutput(),
+        translate_c.getOutput(),
         .{ .expected_matches = expected_matches },
     );
 }
 /// If the value is omitted, it is set to 1.
 /// `name` and `value` need not live longer than the function call.
-pub fn defineCMacro(self: *TranslateC, name: []const u8, value: ?[]const u8) void {
+pub fn defineCMacro(translate_c: *TranslateC, name: []const u8, value: ?[]const u8) void {
-    const macro = std.Build.constructCMacro(self.step.owner.allocator, name, value);
+    const macro = std.Build.constructranslate_cMacro(translate_c.step.owner.allocator, name, value);
-    self.c_macros.append(macro) catch @panic("OOM");
+    translate_c.c_macros.append(macro) catch @panic("OOM");
 }
 /// name_and_value looks like [name]=[value]. If the value is omitted, it is set to 1.
-pub fn defineCMacroRaw(self: *TranslateC, name_and_value: []const u8) void {
+pub fn defineCMacroRaw(translate_c: *TranslateC, name_and_value: []const u8) void {
-    self.c_macros.append(self.step.owner.dupe(name_and_value)) catch @panic("OOM");
+    translate_c.c_macros.append(translate_c.step.owner.dupe(name_and_value)) catch @panic("OOM");
 }
 fn make(step: *Step, prog_node: *std.Progress.Node) !void {
     const b = step.owner;
-    const self: *TranslateC = @fieldParentPtr("step", step);
+    const translate_c: *TranslateC = @fieldParentPtr("step", step);
     var argv_list = std.ArrayList([]const u8).init(b.allocator);
     try argv_list.append(b.graph.zig_exe);
     try argv_list.append("translate-c");
-    if (self.link_libc) {
+    if (translate_c.link_libc) {
         try argv_list.append("-lc");
     }
-    if (!self.use_clang) {
+    if (!translate_c.use_clang) {
         try argv_list.append("-fno-clang");
     }
     try argv_list.append("--listen=-");
-    if (!self.target.query.isNative()) {
+    if (!translate_c.target.query.isNative()) {
         try argv_list.append("-target");
-        try argv_list.append(try self.target.query.zigTriple(b.allocator));
+        try argv_list.append(try translate_c.target.query.zigTriple(b.allocator));
     }
-    switch (self.optimize) {
+    switch (translate_c.optimize) {
         .Debug => {}, // Skip since it's the default.
-        else => try argv_list.append(b.fmt("-O{s}", .{@tagName(self.optimize)})),
+        else => try argv_list.append(b.fmt("-O{s}", .{@tagName(translate_c.optimize)})),
     }
-    for (self.include_dirs.items) |include_dir| {
+    for (translate_c.include_dirs.items) |include_dir| {
         try argv_list.append("-I");
         try argv_list.append(include_dir);
     }
-    for (self.c_macros.items) |c_macro| {
+    for (translate_c.c_macros.items) |c_macro| {
         try argv_list.append("-D");
         try argv_list.append(c_macro);
     }
-    try argv_list.append(self.source.getPath(b));
+    try argv_list.append(translate_c.source.getPath2(b, step));
     const output_path = try step.evalZigProcess(argv_list.items, prog_node);
-    self.out_basename = fs.path.basename(output_path.?);
+    translate_c.out_basename = fs.path.basename(output_path.?);
     const output_dir = fs.path.dirname(output_path.?).?;
-    self.output_file.path = try fs.path.join(
+    translate_c.output_file.path = b.pathJoin(&.{ output_dir, translate_c.out_basename });
-        b.allocator,
-        &[_][]const u8{ output_dir, self.out_basename },
-    );
 }

lib/std/Build/Step/WriteFile.zig+58-58

...	@@ -23,15 +23,15 @@ directories: std.ArrayListUnmanaged(*Directory),	...	@@ -23,15 +23,15 @@ directories: std.ArrayListUnmanaged(*Directory),
23	output_source_files: std.ArrayListUnmanaged(OutputSourceFile),	23	output_source_files: std.ArrayListUnmanaged(OutputSourceFile),
24	generated_directory: std.Build.GeneratedFile,	24	generated_directory: std.Build.GeneratedFile,
25		25
26	pub const base_id = .write_file;	26	pub const base_id: Step.Id = .write_file;
27		27
28	pub const File = struct {	28	pub const File = struct {
29	generated_file: std.Build.GeneratedFile,	29	generated_file: std.Build.GeneratedFile,
30	sub_path: []const u8,	30	sub_path: []const u8,
31	contents: Contents,	31	contents: Contents,
32		32
33	pub fn getPath(self: *File) std.Build.LazyPath {	33	pub fn getPath(file: *File) std.Build.LazyPath {
34	return .{ .generated = &self.generated_file };	34	return .{ .generated = &file.generated_file };
35	}	35	}
36	};	36	};
37		37
...	@@ -49,16 +49,16 @@ pub const Directory = struct {	...	@@ -49,16 +49,16 @@ pub const Directory = struct {
49	/// `exclude_extensions` takes precedence over `include_extensions`.	49	/// `exclude_extensions` takes precedence over `include_extensions`.
50	include_extensions: ?[]const []const u8 = null,	50	include_extensions: ?[]const []const u8 = null,
51		51
52	pub fn dupe(self: Options, b: *std.Build) Options {	52	pub fn dupe(opts: Options, b: *std.Build) Options {
53	return .{	53	return .{
54	.exclude_extensions = b.dupeStrings(self.exclude_extensions),	54	.exclude_extensions = b.dupeStrings(opts.exclude_extensions),
55	.include_extensions = if (self.include_extensions) \|incs\| b.dupeStrings(incs) else null,	55	.include_extensions = if (opts.include_extensions) \|incs\| b.dupeStrings(incs) else null,
56	};	56	};
57	}	57	}
58	};	58	};
59		59
60	pub fn getPath(self: *Directory) std.Build.LazyPath {	60	pub fn getPath(dir: *Directory) std.Build.LazyPath {
61	return .{ .generated = &self.generated_dir };	61	return .{ .generated = &dir.generated_dir };
62	}	62	}
63	};	63	};
64		64
...	@@ -73,10 +73,10 @@ pub const Contents = union(enum) {	...	@@ -73,10 +73,10 @@ pub const Contents = union(enum) {
73	};	73	};
74		74
75	pub fn create(owner: std.Build) WriteFile {	75	pub fn create(owner: std.Build) WriteFile {
76	const wf = owner.allocator.create(WriteFile) catch @panic("OOM");	76	const write_file = owner.allocator.create(WriteFile) catch @panic("OOM");
77	wf.* = .{	77	write_file.* = .{
78	.step = Step.init(.{	78	.step = Step.init(.{
79	.id = .write_file,	79	.id = base_id,
80	.name = "WriteFile",	80	.name = "WriteFile",
81	.owner = owner,	81	.owner = owner,
82	.makeFn = make,	82	.makeFn = make,
...	@@ -84,22 +84,22 @@ pub fn create(owner: std.Build) WriteFile {	...	@@ -84,22 +84,22 @@ pub fn create(owner: std.Build) WriteFile {
84	.files = .{},	84	.files = .{},
85	.directories = .{},	85	.directories = .{},
86	.output_source_files = .{},	86	.output_source_files = .{},
87	.generated_directory = .{ .step = &wf.step },	87	.generated_directory = .{ .step = &write_file.step },
88	};	88	};
89	return wf;	89	return write_file;
90	}	90	}
91		91
92	pub fn add(wf: *WriteFile, sub_path: []const u8, bytes: []const u8) std.Build.LazyPath {	92	pub fn add(write_file: *WriteFile, sub_path: []const u8, bytes: []const u8) std.Build.LazyPath {
93	const b = wf.step.owner;	93	const b = write_file.step.owner;
94	const gpa = b.allocator;	94	const gpa = b.allocator;
95	const file = gpa.create(File) catch @panic("OOM");	95	const file = gpa.create(File) catch @panic("OOM");
96	file.* = .{	96	file.* = .{
97	.generated_file = .{ .step = &wf.step },	97	.generated_file = .{ .step = &write_file.step },
98	.sub_path = b.dupePath(sub_path),	98	.sub_path = b.dupePath(sub_path),
99	.contents = .{ .bytes = b.dupe(bytes) },	99	.contents = .{ .bytes = b.dupe(bytes) },
100	};	100	};
101	wf.files.append(gpa, file) catch @panic("OOM");	101	write_file.files.append(gpa, file) catch @panic("OOM");
102	wf.maybeUpdateName();	102	write_file.maybeUpdateName();
103	return file.getPath();	103	return file.getPath();
104	}	104	}
105		105
...	@@ -110,19 +110,19 @@ pub fn add(wf: *WriteFile, sub_path: []const u8, bytes: []const u8) std.Build.La	...	@@ -110,19 +110,19 @@ pub fn add(wf: *WriteFile, sub_path: []const u8, bytes: []const u8) std.Build.La
110	/// include sub-directories, in which case this step will ensure the	110	/// include sub-directories, in which case this step will ensure the
111	/// required sub-path exists.	111	/// required sub-path exists.
112	/// This is the option expected to be used most commonly with `addCopyFile`.	112	/// This is the option expected to be used most commonly with `addCopyFile`.
113	pub fn addCopyFile(wf: *WriteFile, source: std.Build.LazyPath, sub_path: []const u8) std.Build.LazyPath {	113	pub fn addCopyFile(write_file: *WriteFile, source: std.Build.LazyPath, sub_path: []const u8) std.Build.LazyPath {
114	const b = wf.step.owner;	114	const b = write_file.step.owner;
115	const gpa = b.allocator;	115	const gpa = b.allocator;
116	const file = gpa.create(File) catch @panic("OOM");	116	const file = gpa.create(File) catch @panic("OOM");
117	file.* = .{	117	file.* = .{
118	.generated_file = .{ .step = &wf.step },	118	.generated_file = .{ .step = &write_file.step },
119	.sub_path = b.dupePath(sub_path),	119	.sub_path = b.dupePath(sub_path),
120	.contents = .{ .copy = source },	120	.contents = .{ .copy = source },
121	};	121	};
122	wf.files.append(gpa, file) catch @panic("OOM");	122	write_file.files.append(gpa, file) catch @panic("OOM");
123		123
124	wf.maybeUpdateName();	124	write_file.maybeUpdateName();
125	source.addStepDependencies(&wf.step);	125	source.addStepDependencies(&write_file.step);
126	return file.getPath();	126	return file.getPath();
127	}	127	}
128		128
...	@@ -130,24 +130,24 @@ pub fn addCopyFile(wf: *WriteFile, source: std.Build.LazyPath, sub_path: []const	...	@@ -130,24 +130,24 @@ pub fn addCopyFile(wf: *WriteFile, source: std.Build.LazyPath, sub_path: []const
130	/// relative to this step's generated directory.	130	/// relative to this step's generated directory.
131	/// The returned value is a lazy path to the generated subdirectory.	131	/// The returned value is a lazy path to the generated subdirectory.
132	pub fn addCopyDirectory(	132	pub fn addCopyDirectory(
133	wf: *WriteFile,	133	write_file: *WriteFile,
134	source: std.Build.LazyPath,	134	source: std.Build.LazyPath,
135	sub_path: []const u8,	135	sub_path: []const u8,
136	options: Directory.Options,	136	options: Directory.Options,
137	) std.Build.LazyPath {	137	) std.Build.LazyPath {
138	const b = wf.step.owner;	138	const b = write_file.step.owner;
139	const gpa = b.allocator;	139	const gpa = b.allocator;
140	const dir = gpa.create(Directory) catch @panic("OOM");	140	const dir = gpa.create(Directory) catch @panic("OOM");
141	dir.* = .{	141	dir.* = .{
142	.source = source.dupe(b),	142	.source = source.dupe(b),
143	.sub_path = b.dupePath(sub_path),	143	.sub_path = b.dupePath(sub_path),
144	.options = options.dupe(b),	144	.options = options.dupe(b),
145	.generated_dir = .{ .step = &wf.step },	145	.generated_dir = .{ .step = &write_file.step },
146	};	146	};
147	wf.directories.append(gpa, dir) catch @panic("OOM");	147	write_file.directories.append(gpa, dir) catch @panic("OOM");
148		148
149	wf.maybeUpdateName();	149	write_file.maybeUpdateName();
150	source.addStepDependencies(&wf.step);	150	source.addStepDependencies(&write_file.step);
151	return dir.getPath();	151	return dir.getPath();
152	}	152	}
153		153
...	@@ -156,13 +156,13 @@ pub fn addCopyDirectory(	...	@@ -156,13 +156,13 @@ pub fn addCopyDirectory(
156	/// used as part of the normal build process, but as a utility occasionally	156	/// used as part of the normal build process, but as a utility occasionally
157	/// run by a developer with intent to modify source files and then commit	157	/// run by a developer with intent to modify source files and then commit
158	/// those changes to version control.	158	/// those changes to version control.
159	pub fn addCopyFileToSource(wf: *WriteFile, source: std.Build.LazyPath, sub_path: []const u8) void {	159	pub fn addCopyFileToSource(write_file: *WriteFile, source: std.Build.LazyPath, sub_path: []const u8) void {
160	const b = wf.step.owner;	160	const b = write_file.step.owner;
161	wf.output_source_files.append(b.allocator, .{	161	write_file.output_source_files.append(b.allocator, .{
162	.contents = .{ .copy = source },	162	.contents = .{ .copy = source },
163	.sub_path = sub_path,	163	.sub_path = sub_path,
164	}) catch @panic("OOM");	164	}) catch @panic("OOM");
165	source.addStepDependencies(&wf.step);	165	source.addStepDependencies(&write_file.step);
166	}	166	}
167		167
168	/// A path relative to the package root.	168	/// A path relative to the package root.
...	@@ -170,9 +170,9 @@ pub fn addCopyFileToSource(wf: *WriteFile, source: std.Build.LazyPath, sub_path:	...	@@ -170,9 +170,9 @@ pub fn addCopyFileToSource(wf: *WriteFile, source: std.Build.LazyPath, sub_path:
170	/// used as part of the normal build process, but as a utility occasionally	170	/// used as part of the normal build process, but as a utility occasionally
171	/// run by a developer with intent to modify source files and then commit	171	/// run by a developer with intent to modify source files and then commit
172	/// those changes to version control.	172	/// those changes to version control.
173	pub fn addBytesToSource(wf: *WriteFile, bytes: []const u8, sub_path: []const u8) void {	173	pub fn addBytesToSource(write_file: *WriteFile, bytes: []const u8, sub_path: []const u8) void {
174	const b = wf.step.owner;	174	const b = write_file.step.owner;
175	wf.output_source_files.append(b.allocator, .{	175	write_file.output_source_files.append(b.allocator, .{
176	.contents = .{ .bytes = bytes },	176	.contents = .{ .bytes = bytes },
177	.sub_path = sub_path,	177	.sub_path = sub_path,
178	}) catch @panic("OOM");	178	}) catch @panic("OOM");
...	@@ -180,20 +180,20 @@ pub fn addBytesToSource(wf: *WriteFile, bytes: []const u8, sub_path: []const u8)	...	@@ -180,20 +180,20 @@ pub fn addBytesToSource(wf: *WriteFile, bytes: []const u8, sub_path: []const u8)
180		180
181	/// Returns a `LazyPath` representing the base directory that contains all the	181	/// Returns a `LazyPath` representing the base directory that contains all the
182	/// files from this `WriteFile`.	182	/// files from this `WriteFile`.
183	pub fn getDirectory(wf: *WriteFile) std.Build.LazyPath {	183	pub fn getDirectory(write_file: *WriteFile) std.Build.LazyPath {
184	return .{ .generated = &wf.generated_directory };	184	return .{ .generated = &write_file.generated_directory };
185	}	185	}
186		186
187	fn maybeUpdateName(wf: *WriteFile) void {	187	fn maybeUpdateName(write_file: *WriteFile) void {
188	if (wf.files.items.len == 1 and wf.directories.items.len == 0) {	188	if (write_file.files.items.len == 1 and write_file.directories.items.len == 0) {
189	// First time adding a file; update name.	189	// First time adding a file; update name.
190	if (std.mem.eql(u8, wf.step.name, "WriteFile")) {	190	if (std.mem.eql(u8, write_file.step.name, "WriteFile")) {
191	wf.step.name = wf.step.owner.fmt("WriteFile {s}", .{wf.files.items[0].sub_path});	191	write_file.step.name = write_file.step.owner.fmt("WriteFile {s}", .{write_file.files.items[0].sub_path});
192	}	192	}
193	} else if (wf.directories.items.len == 1 and wf.files.items.len == 0) {	193	} else if (write_file.directories.items.len == 1 and write_file.files.items.len == 0) {
194	// First time adding a directory; update name.	194	// First time adding a directory; update name.
195	if (std.mem.eql(u8, wf.step.name, "WriteFile")) {	195	if (std.mem.eql(u8, write_file.step.name, "WriteFile")) {
196	wf.step.name = wf.step.owner.fmt("WriteFile {s}", .{wf.directories.items[0].sub_path});	196	write_file.step.name = write_file.step.owner.fmt("WriteFile {s}", .{write_file.directories.items[0].sub_path});
197	}	197	}
198	}	198	}
199	}	199	}
...	@@ -201,14 +201,14 @@ fn maybeUpdateName(wf: *WriteFile) void {	...	@@ -201,14 +201,14 @@ fn maybeUpdateName(wf: *WriteFile) void {
201	fn make(step: Step, prog_node: std.Progress.Node) !void {	201	fn make(step: Step, prog_node: std.Progress.Node) !void {
202	_ = prog_node;	202	_ = prog_node;
203	const b = step.owner;	203	const b = step.owner;
204	const wf: *WriteFile = @fieldParentPtr("step", step);	204	const write_file: *WriteFile = @fieldParentPtr("step", step);
205		205
206	// Writing to source files is kind of an extra capability of this	206	// Writing to source files is kind of an extra capability of this
207	// WriteFile - arguably it should be a different step. But anyway here	207	// WriteFile - arguably it should be a different step. But anyway here
208	// it is, it happens unconditionally and does not interact with the other	208	// it is, it happens unconditionally and does not interact with the other
209	// files here.	209	// files here.
210	var any_miss = false;	210	var any_miss = false;
211	for (wf.output_source_files.items) \|output_source_file\| {	211	for (write_file.output_source_files.items) \|output_source_file\| {
212	if (fs.path.dirname(output_source_file.sub_path)) \|dirname\| {	212	if (fs.path.dirname(output_source_file.sub_path)) \|dirname\| {
213	b.build_root.handle.makePath(dirname) catch \|err\| {	213	b.build_root.handle.makePath(dirname) catch \|err\| {
214	return step.fail("unable to make path '{}{s}': {s}", .{	214	return step.fail("unable to make path '{}{s}': {s}", .{
...	@@ -226,7 +226,7 @@ fn make(step: Step, prog_node: std.Progress.Node) !void {	...	@@ -226,7 +226,7 @@ fn make(step: Step, prog_node: std.Progress.Node) !void {
226	any_miss = true;	226	any_miss = true;
227	},	227	},
228	.copy => \|file_source\| {	228	.copy => \|file_source\| {
229	const source_path = file_source.getPath(b);	229	const source_path = file_source.getPath2(b, step);
230	const prev_status = fs.Dir.updateFile(	230	const prev_status = fs.Dir.updateFile(
231	fs.cwd(),	231	fs.cwd(),
232	source_path,	232	source_path,
...	@@ -258,18 +258,18 @@ fn make(step: Step, prog_node: std.Progress.Node) !void {	...	@@ -258,18 +258,18 @@ fn make(step: Step, prog_node: std.Progress.Node) !void {
258	// in a non-backwards-compatible way.	258	// in a non-backwards-compatible way.
259	man.hash.add(@as(u32, 0xd767ee59));	259	man.hash.add(@as(u32, 0xd767ee59));
260		260
261	for (wf.files.items) \|file\| {	261	for (write_file.files.items) \|file\| {
262	man.hash.addBytes(file.sub_path);	262	man.hash.addBytes(file.sub_path);
263	switch (file.contents) {	263	switch (file.contents) {
264	.bytes => \|bytes\| {	264	.bytes => \|bytes\| {
265	man.hash.addBytes(bytes);	265	man.hash.addBytes(bytes);
266	},	266	},
267	.copy => \|file_source\| {	267	.copy => \|file_source\| {
268	_ = try man.addFile(file_source.getPath(b), null);	268	_ = try man.addFile(file_source.getPath2(b, step), null);
269	},	269	},
270	}	270	}
271	}	271	}
272	for (wf.directories.items) \|dir\| {	272	for (write_file.directories.items) \|dir\| {
273	man.hash.addBytes(dir.source.getPath2(b, step));	273	man.hash.addBytes(dir.source.getPath2(b, step));
274	man.hash.addBytes(dir.sub_path);	274	man.hash.addBytes(dir.sub_path);
275	for (dir.options.exclude_extensions) \|ext\| man.hash.addBytes(ext);	275	for (dir.options.exclude_extensions) \|ext\| man.hash.addBytes(ext);
...	@@ -278,19 +278,19 @@ fn make(step: Step, prog_node: std.Progress.Node) !void {	...	@@ -278,19 +278,19 @@ fn make(step: Step, prog_node: std.Progress.Node) !void {
278		278
279	if (try step.cacheHit(&man)) {	279	if (try step.cacheHit(&man)) {
280	const digest = man.final();	280	const digest = man.final();
281	for (wf.files.items) \|file\| {	281	for (write_file.files.items) \|file\| {
282	file.generated_file.path = try b.cache_root.join(b.allocator, &.{	282	file.generated_file.path = try b.cache_root.join(b.allocator, &.{
283	"o", &digest, file.sub_path,	283	"o", &digest, file.sub_path,
284	});	284	});
285	}	285	}
286	wf.generated_directory.path = try b.cache_root.join(b.allocator, &.{ "o", &digest });	286	write_file.generated_directory.path = try b.cache_root.join(b.allocator, &.{ "o", &digest });
287	return;	287	return;
288	}	288	}
289		289
290	const digest = man.final();	290	const digest = man.final();
291	const cache_path = "o" ++ fs.path.sep_str ++ digest;	291	const cache_path = "o" ++ fs.path.sep_str ++ digest;
292		292
293	wf.generated_directory.path = try b.cache_root.join(b.allocator, &.{ "o", &digest });	293	write_file.generated_directory.path = try b.cache_root.join(b.allocator, &.{ "o", &digest });
294		294
295	var cache_dir = b.cache_root.handle.makeOpenPath(cache_path, .{}) catch \|err\| {	295	var cache_dir = b.cache_root.handle.makeOpenPath(cache_path, .{}) catch \|err\| {
296	return step.fail("unable to make path '{}{s}': {s}", .{	296	return step.fail("unable to make path '{}{s}': {s}", .{
...	@@ -301,7 +301,7 @@ fn make(step: Step, prog_node: std.Progress.Node) !void {	...	@@ -301,7 +301,7 @@ fn make(step: Step, prog_node: std.Progress.Node) !void {
301		301
302	const cwd = fs.cwd();	302	const cwd = fs.cwd();
303		303
304	for (wf.files.items) \|file\| {	304	for (write_file.files.items) \|file\| {
305	if (fs.path.dirname(file.sub_path)) \|dirname\| {	305	if (fs.path.dirname(file.sub_path)) \|dirname\| {
306	cache_dir.makePath(dirname) catch \|err\| {	306	cache_dir.makePath(dirname) catch \|err\| {
307	return step.fail("unable to make path '{}{s}{c}{s}': {s}", .{	307	return step.fail("unable to make path '{}{s}{c}{s}': {s}", .{
...	@@ -318,7 +318,7 @@ fn make(step: Step, prog_node: std.Progress.Node) !void {	...	@@ -318,7 +318,7 @@ fn make(step: Step, prog_node: std.Progress.Node) !void {
318	};	318	};
319	},	319	},
320	.copy => \|file_source\| {	320	.copy => \|file_source\| {
321	const source_path = file_source.getPath(b);	321	const source_path = file_source.getPath2(b, step);
322	const prev_status = fs.Dir.updateFile(	322	const prev_status = fs.Dir.updateFile(
323	cwd,	323	cwd,
324	source_path,	324	source_path,
...	@@ -347,7 +347,7 @@ fn make(step: Step, prog_node: std.Progress.Node) !void {	...	@@ -347,7 +347,7 @@ fn make(step: Step, prog_node: std.Progress.Node) !void {
347	cache_path, file.sub_path,	347	cache_path, file.sub_path,
348	});	348	});
349	}	349	}
350	for (wf.directories.items) \|dir\| {	350	for (write_file.directories.items) \|dir\| {
351	const full_src_dir_path = dir.source.getPath2(b, step);	351	const full_src_dir_path = dir.source.getPath2(b, step);
352	const dest_dirname = dir.sub_path;	352	const dest_dirname = dir.sub_path;
353		353

test/standalone/coff_dwarf/build.zig+2-2

...	@@ -18,7 +18,7 @@ pub fn build(b: *std.Build) void {	...	@@ -18,7 +18,7 @@ pub fn build(b: *std.Build) void {
18		18
19	const exe = b.addExecutable(.{	19	const exe = b.addExecutable(.{
20	.name = "main",	20	.name = "main",
21	.root_source_file = .{ .path = "main.zig" },	21	.root_source_file = b.path("main.zig"),
22	.optimize = optimize,	22	.optimize = optimize,
23	.target = target,	23	.target = target,
24	});	24	});
...	@@ -28,7 +28,7 @@ pub fn build(b: *std.Build) void {	...	@@ -28,7 +28,7 @@ pub fn build(b: *std.Build) void {
28	.optimize = optimize,	28	.optimize = optimize,
29	.target = target,	29	.target = target,
30	});	30	});
31	lib.addCSourceFile(.{ .file = .{ .path = "shared_lib.c" }, .flags = &.{"-gdwarf"} });	31	lib.addCSourceFile(.{ .file = b.path("shared_lib.c"), .flags = &.{"-gdwarf"} });
32	lib.linkLibC();	32	lib.linkLibC();
33	exe.linkLibrary(lib);	33	exe.linkLibrary(lib);
34		34

test/standalone/emit_asm_and_bin/build.zig+1-1

...	@@ -5,7 +5,7 @@ pub fn build(b: *std.Build) void {	...	@@ -5,7 +5,7 @@ pub fn build(b: *std.Build) void {
5	b.default_step = test_step;	5	b.default_step = test_step;
6		6
7	const main = b.addTest(.{	7	const main = b.addTest(.{
8	.root_source_file = .{ .path = "main.zig" },	8	.root_source_file = b.path("main.zig"),
9	.optimize = b.standardOptimizeOption(.{}),	9	.optimize = b.standardOptimizeOption(.{}),
10	});	10	});
11	// TODO: actually check these two artifacts for correctness	11	// TODO: actually check these two artifacts for correctness

test/standalone/issue_12588/build.zig+1-1

...	@@ -8,7 +8,7 @@ pub fn build(b: *std.Build) void {	...	@@ -8,7 +8,7 @@ pub fn build(b: *std.Build) void {
8		8
9	const obj = b.addObject(.{	9	const obj = b.addObject(.{
10	.name = "main",	10	.name = "main",
11	.root_source_file = .{ .path = "main.zig" },	11	.root_source_file = b.path("main.zig"),
12	.optimize = optimize,	12	.optimize = optimize,
13	.target = b.host,	13	.target = b.host,
14	});	14	});

test/standalone/issue_13970/build.zig+3-3

...	@@ -5,15 +5,15 @@ pub fn build(b: *std.Build) void {	...	@@ -5,15 +5,15 @@ pub fn build(b: *std.Build) void {
5	b.default_step = test_step;	5	b.default_step = test_step;
6		6
7	const test1 = b.addTest(.{	7	const test1 = b.addTest(.{
8	.root_source_file = .{ .path = "test_root/empty.zig" },	8	.root_source_file = b.path("test_root/empty.zig"),
9	.test_runner = "src/main.zig",	9	.test_runner = "src/main.zig",
10	});	10	});
11	const test2 = b.addTest(.{	11	const test2 = b.addTest(.{
12	.root_source_file = .{ .path = "src/empty.zig" },	12	.root_source_file = b.path("src/empty.zig"),
13	.test_runner = "src/main.zig",	13	.test_runner = "src/main.zig",
14	});	14	});
15	const test3 = b.addTest(.{	15	const test3 = b.addTest(.{
16	.root_source_file = .{ .path = "empty.zig" },	16	.root_source_file = b.path("empty.zig"),
17	.test_runner = "src/main.zig",	17	.test_runner = "src/main.zig",
18	});	18	});
19		19

test/standalone/issue_5825/build.zig+1-1

...	@@ -16,7 +16,7 @@ pub fn build(b: *std.Build) void {	...	@@ -16,7 +16,7 @@ pub fn build(b: *std.Build) void {
16	const optimize: std.builtin.OptimizeMode = .Debug;	16	const optimize: std.builtin.OptimizeMode = .Debug;
17	const obj = b.addObject(.{	17	const obj = b.addObject(.{
18	.name = "issue_5825",	18	.name = "issue_5825",
19	.root_source_file = .{ .path = "main.zig" },	19	.root_source_file = b.path("main.zig"),
20	.optimize = optimize,	20	.optimize = optimize,
21	.target = target,	21	.target = target,
22	});	22	});

test/standalone/options/build.zig+1-1

...	@@ -2,7 +2,7 @@ const std = @import("std");	...	@@ -2,7 +2,7 @@ const std = @import("std");
2		2
3	pub fn build(b: *std.Build) void {	3	pub fn build(b: *std.Build) void {
4	const main = b.addTest(.{	4	const main = b.addTest(.{
5	.root_source_file = .{ .path = "src/main.zig" },	5	.root_source_file = b.path("src/main.zig"),
6	.target = b.host,	6	.target = b.host,
7	.optimize = .Debug,	7	.optimize = .Debug,
8	});	8	});

test/standalone/sigpipe/build.zig+1-1

...	@@ -29,7 +29,7 @@ pub fn build(b: *std.build.Builder) !void {	...	@@ -29,7 +29,7 @@ pub fn build(b: *std.build.Builder) !void {
29	options.addOption(bool, "keep_sigpipe", keep_sigpipe);	29	options.addOption(bool, "keep_sigpipe", keep_sigpipe);
30	const exe = b.addExecutable(.{	30	const exe = b.addExecutable(.{
31	.name = "breakpipe",	31	.name = "breakpipe",
32	.root_source_file = .{ .path = "breakpipe.zig" },	32	.root_source_file = b.path("breakpipe.zig"),
33	});	33	});
34	exe.addOptions("build_options", options);	34	exe.addOptions("build_options", options);
35	const run = b.addRunArtifact(exe);	35	const run = b.addRunArtifact(exe);

test/standalone/windows_argv/build.zig+5-5

...	@@ -11,7 +11,7 @@ pub fn build(b: *std.Build) !void {	...	@@ -11,7 +11,7 @@ pub fn build(b: *std.Build) !void {
11		11
12	const lib_gnu = b.addStaticLibrary(.{	12	const lib_gnu = b.addStaticLibrary(.{
13	.name = "toargv-gnu",	13	.name = "toargv-gnu",
14	.root_source_file = .{ .path = "lib.zig" },	14	.root_source_file = b.path("lib.zig"),
15	.target = b.resolveTargetQuery(.{	15	.target = b.resolveTargetQuery(.{
16	.abi = .gnu,	16	.abi = .gnu,
17	}),	17	}),
...	@@ -25,7 +25,7 @@ pub fn build(b: *std.Build) !void {	...	@@ -25,7 +25,7 @@ pub fn build(b: *std.Build) !void {
25	.optimize = optimize,	25	.optimize = optimize,
26	});	26	});
27	verify_gnu.addCSourceFile(.{	27	verify_gnu.addCSourceFile(.{
28	.file = .{ .path = "verify.c" },	28	.file = b.path("verify.c"),
29	.flags = &.{ "-DUNICODE", "-D_UNICODE" },	29	.flags = &.{ "-DUNICODE", "-D_UNICODE" },
30	});	30	});
31	verify_gnu.mingw_unicode_entry_point = true;	31	verify_gnu.mingw_unicode_entry_point = true;
...	@@ -34,7 +34,7 @@ pub fn build(b: *std.Build) !void {	...	@@ -34,7 +34,7 @@ pub fn build(b: *std.Build) !void {
34		34
35	const fuzz = b.addExecutable(.{	35	const fuzz = b.addExecutable(.{
36	.name = "fuzz",	36	.name = "fuzz",
37	.root_source_file = .{ .path = "fuzz.zig" },	37	.root_source_file = b.path("fuzz.zig"),
38	.target = b.host,	38	.target = b.host,
39	.optimize = optimize,	39	.optimize = optimize,
40	});	40	});
...	@@ -69,7 +69,7 @@ pub fn build(b: *std.Build) !void {	...	@@ -69,7 +69,7 @@ pub fn build(b: *std.Build) !void {
69	if (has_msvc) {	69	if (has_msvc) {
70	const lib_msvc = b.addStaticLibrary(.{	70	const lib_msvc = b.addStaticLibrary(.{
71	.name = "toargv-msvc",	71	.name = "toargv-msvc",
72	.root_source_file = .{ .path = "lib.zig" },	72	.root_source_file = b.path("lib.zig"),
73	.target = b.resolveTargetQuery(.{	73	.target = b.resolveTargetQuery(.{
74	.abi = .msvc,	74	.abi = .msvc,
75	}),	75	}),
...	@@ -83,7 +83,7 @@ pub fn build(b: *std.Build) !void {	...	@@ -83,7 +83,7 @@ pub fn build(b: *std.Build) !void {
83	.optimize = optimize,	83	.optimize = optimize,
84	});	84	});
85	verify_msvc.addCSourceFile(.{	85	verify_msvc.addCSourceFile(.{
86	.file = .{ .path = "verify.c" },	86	.file = b.path("verify.c"),
87	.flags = &.{ "-DUNICODE", "-D_UNICODE" },	87	.flags = &.{ "-DUNICODE", "-D_UNICODE" },
88	});	88	});
89	verify_msvc.linkLibrary(lib_msvc);	89	verify_msvc.linkLibrary(lib_msvc);

test/standalone/windows_spawn/build.zig+2-2

...	@@ -12,14 +12,14 @@ pub fn build(b: *std.Build) void {	...	@@ -12,14 +12,14 @@ pub fn build(b: *std.Build) void {
12		12
13	const hello = b.addExecutable(.{	13	const hello = b.addExecutable(.{
14	.name = "hello",	14	.name = "hello",
15	.root_source_file = .{ .path = "hello.zig" },	15	.root_source_file = b.path("hello.zig"),
16	.optimize = optimize,	16	.optimize = optimize,
17	.target = target,	17	.target = target,
18	});	18	});
19		19
20	const main = b.addExecutable(.{	20	const main = b.addExecutable(.{
21	.name = "main",	21	.name = "main",
22	.root_source_file = .{ .path = "main.zig" },	22	.root_source_file = b.path("main.zig"),
23	.optimize = optimize,	23	.optimize = optimize,
24	.target = target,	24	.target = target,
25	});	25	});

author	Jacob Young <jacobly@ziglang.org> 2024-05-04 14:29:17-04:00
committer	Jacob Young <jacobly@ziglang.org> 2024-05-05 09:42:51-04:00
log	e3424332d3fa1264e1f6861b76bb0d1b2996728d
tree	2d786805328dd51b8d8e804ab6b655fc398d2f3f
parent	d582575aba5264aaa02a8af0cdb7da7c4f4c6220

...	@@ -15,44 +15,44 @@ pub fn syscall1(number: usize, arg1: usize) usize {	...	@@ -15,44 +15,44 @@ pub fn syscall1(number: usize, arg1: usize) usize {
15	// the below code, this is not used. A literal `%` can be	15	// the below code, this is not used. A literal `%` can be
16	// obtained by escaping it with a double percent: `%%`.	16	// obtained by escaping it with a double percent: `%%`.
17	// Often multiline string syntax comes in handy here.	17	// Often multiline string syntax comes in handy here.
18	\\syscall	18	\\syscall
19	// Next is the output. It is possible in the future Zig will	19	// Next is the output. It is possible in the future Zig will
20	// support multiple outputs, depending on how	20	// support multiple outputs, depending on how
21	// https://github.com/ziglang/zig/issues/215 is resolved.	21	// https://github.com/ziglang/zig/issues/215 is resolved.
22	// It is allowed for there to be no outputs, in which case	22	// It is allowed for there to be no outputs, in which case
23	// this colon would be directly followed by the colon for the inputs.	23	// this colon would be directly followed by the colon for the inputs.
24	:	24	:
25	// This specifies the name to be used in `%[ret]` syntax in	25	// This specifies the name to be used in `%[ret]` syntax in
26	// the above assembly string. This example does not use it,	26	// the above assembly string. This example does not use it,
27	// but the syntax is mandatory.	27	// but the syntax is mandatory.
28	[ret]	28	[ret]
29	// Next is the output constraint string. This feature is still	29	// Next is the output constraint string. This feature is still
30	// considered unstable in Zig, and so LLVM/GCC documentation	30	// considered unstable in Zig, and so LLVM/GCC documentation
31	// must be used to understand the semantics.	31	// must be used to understand the semantics.
32	// http://releases.llvm.org/10.0.0/docs/LangRef.html#inline-asm-constraint-string	32	// http://releases.llvm.org/10.0.0/docs/LangRef.html#inline-asm-constraint-string
33	// https://gcc.gnu.org/onlinedocs/gcc/Extended-Asm.html	33	// https://gcc.gnu.org/onlinedocs/gcc/Extended-Asm.html
34	// In this example, the constraint string means "the result value of	34	// In this example, the constraint string means "the result value of
35	// this inline assembly instruction is whatever is in $rax".	35	// this inline assembly instruction is whatever is in $rax".
36	"={rax}"	36	"={rax}"
37	// Next is either a value binding, or `->` and then a type. The	37	// Next is either a value binding, or `->` and then a type. The
38	// type is the result type of the inline assembly expression.	38	// type is the result type of the inline assembly expression.
39	// If it is a value binding, then `%[ret]` syntax would be used	39	// If it is a value binding, then `%[ret]` syntax would be used
40	// to refer to the register bound to the value.	40	// to refer to the register bound to the value.
41	(-> usize),	41	(-> usize),
42	// Next is the list of inputs.	42	// Next is the list of inputs.
43	// The constraint for these inputs means, "when the assembly code is	43	// The constraint for these inputs means, "when the assembly code is
44	// executed, $rax shall have the value of `number` and $rdi shall have	44	// executed, $rax shall have the value of `number` and $rdi shall have
45	// the value of `arg1`". Any number of input parameters is allowed,	45	// the value of `arg1`". Any number of input parameters is allowed,
46	// including none.	46	// including none.
47	: [number] "{rax}" (number),	47	: [number] "{rax}" (number),
48	[arg1] "{rdi}" (arg1),	48	[arg1] "{rdi}" (arg1),
49	// Next is the list of clobbers. These declare a set of registers whose	49	// Next is the list of clobbers. These declare a set of registers whose
50	// values will not be preserved by the execution of this assembly code.	50	// values will not be preserved by the execution of this assembly code.
51	// These do not include output or input registers. The special clobber	51	// These do not include output or input registers. The special clobber
52	// value of "memory" means that the assembly writes to arbitrary undeclared	52	// value of "memory" means that the assembly writes to arbitrary undeclared
53	// memory locations - not only the memory pointed to by a declared indirect	53	// memory locations - not only the memory pointed to by a declared indirect
54	// output. In this example we list $rcx and $r11 because it is known the	54	// output. In this example we list $rcx and $r11 because it is known the
55	// kernel syscall does not preserve these registers.	55	// kernel syscall does not preserve these registers.
56	: "rcx", "r11"	56	: "rcx", "r11"
57	);	57	);
58	}	58	}

...	@@ -3,19 +3,19 @@ const mem = @import("std").mem; // will be used to compare bytes	...	@@ -3,19 +3,19 @@ const mem = @import("std").mem; // will be used to compare bytes
3		3
4	pub fn main() void {	4	pub fn main() void {
5	const bytes = "hello";	5	const bytes = "hello";
6	print("{}\n", .{@TypeOf(bytes)}); // *const [5:0]u8	6	print("{}\n", .{@TypeOf(bytes)}); // *const [5:0]u8
7	print("{d}\n", .{bytes.len}); // 5	7	print("{d}\n", .{bytes.len}); // 5
8	print("{c}\n", .{bytes[1]}); // 'e'	8	print("{c}\n", .{bytes[1]}); // 'e'
9	print("{d}\n", .{bytes[5]}); // 0	9	print("{d}\n", .{bytes[5]}); // 0
10	print("{}\n", .{'e' == '\x65'}); // true	10	print("{}\n", .{'e' == '\x65'}); // true
11	print("{d}\n", .{'\u{1f4a9}'}); // 128169	11	print("{d}\n", .{'\u{1f4a9}'}); // 128169
12	print("{d}\n", .{'💯'}); // 128175	12	print("{d}\n", .{'💯'}); // 128175
13	print("{u}\n", .{'⚡'});	13	print("{u}\n", .{'⚡'});
14	print("{}\n", .{mem.eql(u8, "hello", "h\x65llo")}); // true	14	print("{}\n", .{mem.eql(u8, "hello", "h\x65llo")}); // true
15	print("{}\n", .{mem.eql(u8, "💯", "\xf0\x9f\x92\xaf")}); // also true	15	print("{}\n", .{mem.eql(u8, "💯", "\xf0\x9f\x92\xaf")}); // also true
16	const invalid_utf8 = "\xff\xfe"; // non-UTF-8 strings are possible with \xNN notation.	16	const invalid_utf8 = "\xff\xfe"; // non-UTF-8 strings are possible with \xNN notation.
17	print("0x{x}\n", .{invalid_utf8[1]}); // indexing them returns individual bytes...	17	print("0x{x}\n", .{invalid_utf8[1]}); // indexing them returns individual bytes...
18	print("0x{x}\n", .{"💯"[1]}); // ...as does indexing part-way through non-ASCII characters	18	print("0x{x}\n", .{"💯"[1]}); // ...as does indexing part-way through non-ASCII characters
19	}	19	}
20		20
21	// exe=succeed	21	// exe=succeed

...	@@ -29,7 +29,7 @@ const DylibSymlinkInfo = struct {	...	@@ -29,7 +29,7 @@ const DylibSymlinkInfo = struct {
29	name_only_filename: []const u8,	29	name_only_filename: []const u8,
30	};	30	};
31		31
32	pub const base_id = .install_artifact;	32	pub const base_id: Step.Id = .install_artifact;
33		33
34	pub const Options = struct {	34	pub const Options = struct {
35	/// Which installation directory to put the main output file into.	35	/// Which installation directory to put the main output file into.
...	@@ -52,7 +52,7 @@ pub const Options = struct {	...	@@ -52,7 +52,7 @@ pub const Options = struct {
52	};	52	};
53		53
54	pub fn create(owner: std.Build, artifact: Step.Compile, options: Options) *InstallArtifact {	54	pub fn create(owner: std.Build, artifact: Step.Compile, options: Options) *InstallArtifact {
55	const self = owner.allocator.create(InstallArtifact) catch @panic("OOM");	55	const install_artifact = owner.allocator.create(InstallArtifact) catch @panic("OOM");
56	const dest_dir: ?InstallDir = switch (options.dest_dir) {	56	const dest_dir: ?InstallDir = switch (options.dest_dir) {
57	.disabled => null,	57	.disabled => null,
58	.default => switch (artifact.kind) {	58	.default => switch (artifact.kind) {
...	@@ -62,7 +62,7 @@ pub fn create(owner: std.Build, artifact: Step.Compile, options: Options) *Ins	...	@@ -62,7 +62,7 @@ pub fn create(owner: std.Build, artifact: Step.Compile, options: Options) *Ins
62	},	62	},
63	.override => \|o\| o,	63	.override => \|o\| o,
64	};	64	};
65	self.* = .{	65	install_artifact.* = .{
66	.step = Step.init(.{	66	.step = Step.init(.{
67	.id = base_id,	67	.id = base_id,
68	.name = owner.fmt("install {s}", .{artifact.name}),	68	.name = owner.fmt("install {s}", .{artifact.name}),
...	@@ -104,28 +104,28 @@ pub fn create(owner: std.Build, artifact: Step.Compile, options: Options) *Ins	...	@@ -104,28 +104,28 @@ pub fn create(owner: std.Build, artifact: Step.Compile, options: Options) *Ins
104	.artifact = artifact,	104	.artifact = artifact,
105	};	105	};
106		106
107	self.step.dependOn(&artifact.step);	107	install_artifact.step.dependOn(&artifact.step);
108		108
109	if (self.dest_dir != null) self.emitted_bin = artifact.getEmittedBin();	109	if (install_artifact.dest_dir != null) install_artifact.emitted_bin = artifact.getEmittedBin();
110	if (self.pdb_dir != null) self.emitted_pdb = artifact.getEmittedPdb();	110	if (install_artifact.pdb_dir != null) install_artifact.emitted_pdb = artifact.getEmittedPdb();
111	// https://github.com/ziglang/zig/issues/9698	111	// https://github.com/ziglang/zig/issues/9698
112	//if (self.h_dir != null) self.emitted_h = artifact.getEmittedH();	112	//if (install_artifact.h_dir != null) install_artifact.emitted_h = artifact.getEmittedH();
113	if (self.implib_dir != null) self.emitted_implib = artifact.getEmittedImplib();	113	if (install_artifact.implib_dir != null) install_artifact.emitted_implib = artifact.getEmittedImplib();
114		114
115	return self;	115	return install_artifact;
116	}	116	}
117		117
118	fn make(step: Step, prog_node: std.Progress.Node) !void {	118	fn make(step: Step, prog_node: std.Progress.Node) !void {
119	_ = prog_node;	119	_ = prog_node;
120	const self: *InstallArtifact = @fieldParentPtr("step", step);	120	const install_artifact: *InstallArtifact = @fieldParentPtr("step", step);
121	const b = step.owner;	121	const b = step.owner;
122	const cwd = fs.cwd();	122	const cwd = fs.cwd();
123		123
124	var all_cached = true;	124	var all_cached = true;
125		125
126	if (self.dest_dir) \|dest_dir\| {	126	if (install_artifact.dest_dir) \|dest_dir\| {
127	const full_dest_path = b.getInstallPath(dest_dir, self.dest_sub_path);	127	const full_dest_path = b.getInstallPath(dest_dir, install_artifact.dest_sub_path);
128	const full_src_path = self.emitted_bin.?.getPath2(b, step);	128	const full_src_path = install_artifact.emitted_bin.?.getPath2(b, step);
129	const p = fs.Dir.updateFile(cwd, full_src_path, cwd, full_dest_path, .{}) catch \|err\| {	129	const p = fs.Dir.updateFile(cwd, full_src_path, cwd, full_dest_path, .{}) catch \|err\| {
130	return step.fail("unable to update file from '{s}' to '{s}': {s}", .{	130	return step.fail("unable to update file from '{s}' to '{s}': {s}", .{
131	full_src_path, full_dest_path, @errorName(err),	131	full_src_path, full_dest_path, @errorName(err),
...	@@ -133,15 +133,15 @@ fn make(step: Step, prog_node: std.Progress.Node) !void {	...	@@ -133,15 +133,15 @@ fn make(step: Step, prog_node: std.Progress.Node) !void {
133	};	133	};
134	all_cached = all_cached and p == .fresh;	134	all_cached = all_cached and p == .fresh;
135		135
136	if (self.dylib_symlinks) \|dls\| {	136	if (install_artifact.dylib_symlinks) \|dls\| {
137	try Step.Compile.doAtomicSymLinks(step, full_dest_path, dls.major_only_filename, dls.name_only_filename);	137	try Step.Compile.doAtomicSymLinks(step, full_dest_path, dls.major_only_filename, dls.name_only_filename);
138	}	138	}
139		139
140	self.artifact.installed_path = full_dest_path;	140	install_artifact.artifact.installed_path = full_dest_path;
141	}	141	}
142		142
143	if (self.implib_dir) \|implib_dir\| {	143	if (install_artifact.implib_dir) \|implib_dir\| {
144	const full_src_path = self.emitted_implib.?.getPath2(b, step);	144	const full_src_path = install_artifact.emitted_implib.?.getPath2(b, step);
145	const full_implib_path = b.getInstallPath(implib_dir, fs.path.basename(full_src_path));	145	const full_implib_path = b.getInstallPath(implib_dir, fs.path.basename(full_src_path));
146	const p = fs.Dir.updateFile(cwd, full_src_path, cwd, full_implib_path, .{}) catch \|err\| {	146	const p = fs.Dir.updateFile(cwd, full_src_path, cwd, full_implib_path, .{}) catch \|err\| {
147	return step.fail("unable to update file from '{s}' to '{s}': {s}", .{	147	return step.fail("unable to update file from '{s}' to '{s}': {s}", .{
...	@@ -151,8 +151,8 @@ fn make(step: Step, prog_node: std.Progress.Node) !void {	...	@@ -151,8 +151,8 @@ fn make(step: Step, prog_node: std.Progress.Node) !void {
151	all_cached = all_cached and p == .fresh;	151	all_cached = all_cached and p == .fresh;
152	}	152	}
153		153
154	if (self.pdb_dir) \|pdb_dir\| {	154	if (install_artifact.pdb_dir) \|pdb_dir\| {
155	const full_src_path = self.emitted_pdb.?.getPath2(b, step);	155	const full_src_path = install_artifact.emitted_pdb.?.getPath2(b, step);
156	const full_pdb_path = b.getInstallPath(pdb_dir, fs.path.basename(full_src_path));	156	const full_pdb_path = b.getInstallPath(pdb_dir, fs.path.basename(full_src_path));
157	const p = fs.Dir.updateFile(cwd, full_src_path, cwd, full_pdb_path, .{}) catch \|err\| {	157	const p = fs.Dir.updateFile(cwd, full_src_path, cwd, full_pdb_path, .{}) catch \|err\| {
158	return step.fail("unable to update file from '{s}' to '{s}': {s}", .{	158	return step.fail("unable to update file from '{s}' to '{s}': {s}", .{
...	@@ -162,8 +162,8 @@ fn make(step: Step, prog_node: std.Progress.Node) !void {	...	@@ -162,8 +162,8 @@ fn make(step: Step, prog_node: std.Progress.Node) !void {
162	all_cached = all_cached and p == .fresh;	162	all_cached = all_cached and p == .fresh;
163	}	163	}
164		164
165	if (self.h_dir) \|h_dir\| {	165	if (install_artifact.h_dir) \|h_dir\| {
166	if (self.emitted_h) \|emitted_h\| {	166	if (install_artifact.emitted_h) \|emitted_h\| {
167	const full_src_path = emitted_h.getPath2(b, step);	167	const full_src_path = emitted_h.getPath2(b, step);
168	const full_h_path = b.getInstallPath(h_dir, fs.path.basename(full_src_path));	168	const full_h_path = b.getInstallPath(h_dir, fs.path.basename(full_src_path));
169	const p = fs.Dir.updateFile(cwd, full_src_path, cwd, full_h_path, .{}) catch \|err\| {	169	const p = fs.Dir.updateFile(cwd, full_src_path, cwd, full_h_path, .{}) catch \|err\| {
...	@@ -174,7 +174,7 @@ fn make(step: Step, prog_node: std.Progress.Node) !void {	...	@@ -174,7 +174,7 @@ fn make(step: Step, prog_node: std.Progress.Node) !void {
174	all_cached = all_cached and p == .fresh;	174	all_cached = all_cached and p == .fresh;
175	}	175	}
176		176
177	for (self.artifact.installed_headers.items) \|installation\| switch (installation) {	177	for (install_artifact.artifact.installed_headers.items) \|installation\| switch (installation) {
178	.file => \|file\| {	178	.file => \|file\| {
179	const full_src_path = file.source.getPath2(b, step);	179	const full_src_path = file.source.getPath2(b, step);
180	const full_h_path = b.getInstallPath(h_dir, file.dest_rel_path);	180	const full_h_path = b.getInstallPath(h_dir, file.dest_rel_path);

Build: cleanup