@zigc/lib 0.16.0-dev.3144 → 0.16.0-dev.3153
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/compiler/reduce.zig +5 -1
- package/compiler/std-docs.zig +8 -1
- package/package.json +1 -1
- package/std/Build/Step/CheckObject.zig +3 -3
- package/std/Build/Step/ConfigHeader.zig +34 -32
- package/std/Build/Step/Run.zig +3 -3
- package/std/Build/Step/TranslateC.zig +0 -6
- package/std/Build/Step.zig +6 -13
- package/std/Build/WebServer.zig +8 -1
- package/std/Build.zig +14 -14
- package/std/Io/Threaded.zig +1 -1
- package/std/Io/Uring.zig +1 -1
- package/std/array_hash_map.zig +96 -555
- package/std/c.zig +17 -17
- package/std/json/Stringify.zig +3 -3
- package/std/json/dynamic.zig +4 -4
- package/std/os/emscripten.zig +1 -1
- package/std/os/linux.zig +2 -2
- package/std/process/Child.zig +1 -1
- package/std/std.zig +7 -6
- package/std/zig/AstGen.zig +3 -3
- package/std/zig/system.zig +18 -4
package/compiler/reduce.zig
CHANGED
|
@@ -291,7 +291,11 @@ fn termToInteresting(term: std.process.Child.Term) Interestingness {
|
|
|
291
291
|
std.debug.print("interestingness check terminated with signal {t}\n", .{sig});
|
|
292
292
|
return .boring;
|
|
293
293
|
},
|
|
294
|
-
|
|
294
|
+
.stopped => |sig| {
|
|
295
|
+
std.debug.print("interestingness check stopped with signal {t}\n", .{sig});
|
|
296
|
+
return .boring;
|
|
297
|
+
},
|
|
298
|
+
.unknown => {
|
|
295
299
|
std.debug.print("interestingness check aborted unexpectedly\n", .{});
|
|
296
300
|
return .boring;
|
|
297
301
|
},
|
package/compiler/std-docs.zig
CHANGED
|
@@ -423,7 +423,14 @@ fn buildWasmBinary(
|
|
|
423
423
|
);
|
|
424
424
|
return error.WasmCompilationFailed;
|
|
425
425
|
},
|
|
426
|
-
.stopped
|
|
426
|
+
.stopped => |sig| {
|
|
427
|
+
std.log.err(
|
|
428
|
+
"the following command stopped unexpectedly with signal {t}:\n{s}",
|
|
429
|
+
.{ sig, try std.Build.Step.allocPrintCmd(arena, .inherit, null, argv.items) },
|
|
430
|
+
);
|
|
431
|
+
return error.WasmCompilationFailed;
|
|
432
|
+
},
|
|
433
|
+
.unknown => {
|
|
427
434
|
std.log.err(
|
|
428
435
|
"the following command terminated unexpectedly:\n{s}",
|
|
429
436
|
.{try std.Build.Step.allocPrintCmd(arena, .inherit, null, argv.items)},
|
package/package.json
CHANGED
|
@@ -1814,16 +1814,16 @@ const ElfDumper = struct {
|
|
|
1814
1814
|
files.putAssumeCapacityNoClobber(object.off - @sizeOf(elf.ar_hdr), object.name);
|
|
1815
1815
|
}
|
|
1816
1816
|
|
|
1817
|
-
var symbols
|
|
1817
|
+
var symbols: std.array_hash_map.Auto(usize, std.array_list.Managed([]const u8)) = .empty;
|
|
1818
1818
|
defer {
|
|
1819
1819
|
for (symbols.values()) |*value| {
|
|
1820
1820
|
value.deinit();
|
|
1821
1821
|
}
|
|
1822
|
-
symbols.deinit();
|
|
1822
|
+
symbols.deinit(ctx.gpa);
|
|
1823
1823
|
}
|
|
1824
1824
|
|
|
1825
1825
|
for (ctx.symtab.items) |entry| {
|
|
1826
|
-
const gop = try symbols.getOrPut(@intCast(entry.off));
|
|
1826
|
+
const gop = try symbols.getOrPut(ctx.gpa, @intCast(entry.off));
|
|
1827
1827
|
if (!gop.found_existing) {
|
|
1828
1828
|
gop.value_ptr.* = std.array_list.Managed([]const u8).init(ctx.gpa);
|
|
1829
1829
|
}
|
|
@@ -38,7 +38,7 @@ pub const Value = union(enum) {
|
|
|
38
38
|
};
|
|
39
39
|
|
|
40
40
|
step: Step,
|
|
41
|
-
values: std.
|
|
41
|
+
values: std.array_hash_map.String(Value),
|
|
42
42
|
/// This directory contains the generated file under the name `include_path`.
|
|
43
43
|
generated_dir: std.Build.GeneratedFile,
|
|
44
44
|
|
|
@@ -95,7 +95,7 @@ pub fn create(owner: *std.Build, options: Options) *ConfigHeader {
|
|
|
95
95
|
.first_ret_addr = options.first_ret_addr orelse @returnAddress(),
|
|
96
96
|
}),
|
|
97
97
|
.style = options.style,
|
|
98
|
-
.values = .
|
|
98
|
+
.values = .empty,
|
|
99
99
|
|
|
100
100
|
.max_bytes = options.max_bytes,
|
|
101
101
|
.include_path = include_path,
|
|
@@ -110,7 +110,8 @@ pub fn create(owner: *std.Build, options: Options) *ConfigHeader {
|
|
|
110
110
|
}
|
|
111
111
|
|
|
112
112
|
pub fn addIdent(config_header: *ConfigHeader, name: []const u8, value: []const u8) void {
|
|
113
|
-
config_header.
|
|
113
|
+
const arena = config_header.step.owner.allocator;
|
|
114
|
+
config_header.values.put(arena, name, .{ .ident = value }) catch @panic("OOM");
|
|
114
115
|
}
|
|
115
116
|
|
|
116
117
|
pub fn addValue(config_header: *ConfigHeader, name: []const u8, comptime T: type, value: T) void {
|
|
@@ -131,43 +132,44 @@ pub fn getOutputFile(ch: *ConfigHeader) std.Build.LazyPath {
|
|
|
131
132
|
}
|
|
132
133
|
|
|
133
134
|
fn addValueInner(config_header: *ConfigHeader, name: []const u8, comptime T: type, value: T) !void {
|
|
135
|
+
const arena = config_header.step.owner.allocator;
|
|
134
136
|
switch (@typeInfo(T)) {
|
|
135
137
|
.null => {
|
|
136
|
-
try config_header.values.put(name, .undef);
|
|
138
|
+
try config_header.values.put(arena, name, .undef);
|
|
137
139
|
},
|
|
138
140
|
.void => {
|
|
139
|
-
try config_header.values.put(name, .defined);
|
|
141
|
+
try config_header.values.put(arena, name, .defined);
|
|
140
142
|
},
|
|
141
143
|
.bool => {
|
|
142
|
-
try config_header.values.put(name, .{ .boolean = value });
|
|
144
|
+
try config_header.values.put(arena, name, .{ .boolean = value });
|
|
143
145
|
},
|
|
144
146
|
.int => {
|
|
145
|
-
try config_header.values.put(name, .{ .int = value });
|
|
147
|
+
try config_header.values.put(arena, name, .{ .int = value });
|
|
146
148
|
},
|
|
147
149
|
.comptime_int => {
|
|
148
|
-
try config_header.values.put(name, .{ .int = value });
|
|
150
|
+
try config_header.values.put(arena, name, .{ .int = value });
|
|
149
151
|
},
|
|
150
152
|
.@"enum", .enum_literal => {
|
|
151
|
-
try config_header.values.put(name, .{ .ident = @tagName(value) });
|
|
153
|
+
try config_header.values.put(arena, name, .{ .ident = @tagName(value) });
|
|
152
154
|
},
|
|
153
155
|
.optional => {
|
|
154
156
|
if (value) |x| {
|
|
155
157
|
return addValueInner(config_header, name, @TypeOf(x), x);
|
|
156
158
|
} else {
|
|
157
|
-
try config_header.values.put(name, .undef);
|
|
159
|
+
try config_header.values.put(arena, name, .undef);
|
|
158
160
|
}
|
|
159
161
|
},
|
|
160
162
|
.pointer => |ptr| {
|
|
161
163
|
switch (@typeInfo(ptr.child)) {
|
|
162
164
|
.array => |array| {
|
|
163
165
|
if (ptr.size == .one and array.child == u8) {
|
|
164
|
-
try config_header.values.put(name, .{ .string = value });
|
|
166
|
+
try config_header.values.put(arena, name, .{ .string = value });
|
|
165
167
|
return;
|
|
166
168
|
}
|
|
167
169
|
},
|
|
168
170
|
.int => {
|
|
169
171
|
if (ptr.size == .slice and ptr.child == u8) {
|
|
170
|
-
try config_header.values.put(name, .{ .string = value });
|
|
172
|
+
try config_header.values.put(arena, name, .{ .string = value });
|
|
171
173
|
return;
|
|
172
174
|
}
|
|
173
175
|
},
|
|
@@ -218,8 +220,8 @@ fn make(step: *Step, options: Step.MakeOptions) !void {
|
|
|
218
220
|
});
|
|
219
221
|
};
|
|
220
222
|
switch (config_header.style) {
|
|
221
|
-
.autoconf_undef => try render_autoconf_undef(step, contents, bw, config_header.values, src_path),
|
|
222
|
-
.autoconf_at => try render_autoconf_at(step, contents, &aw, config_header.values, src_path),
|
|
223
|
+
.autoconf_undef => try render_autoconf_undef(step, contents, bw, &config_header.values, src_path),
|
|
224
|
+
.autoconf_at => try render_autoconf_at(step, contents, &aw, &config_header.values, src_path),
|
|
223
225
|
else => unreachable,
|
|
224
226
|
}
|
|
225
227
|
},
|
|
@@ -282,7 +284,7 @@ fn render_autoconf_undef(
|
|
|
282
284
|
step: *Step,
|
|
283
285
|
contents: []const u8,
|
|
284
286
|
bw: *Writer,
|
|
285
|
-
values: std.
|
|
287
|
+
values: *const std.array_hash_map.String(Value),
|
|
286
288
|
src_path: []const u8,
|
|
287
289
|
) !void {
|
|
288
290
|
const build = step.owner;
|
|
@@ -334,7 +336,7 @@ fn render_autoconf_at(
|
|
|
334
336
|
step: *Step,
|
|
335
337
|
contents: []const u8,
|
|
336
338
|
aw: *Writer.Allocating,
|
|
337
|
-
values: std.
|
|
339
|
+
values: *const std.array_hash_map.String(Value),
|
|
338
340
|
src_path: []const u8,
|
|
339
341
|
) !void {
|
|
340
342
|
const build = step.owner;
|
|
@@ -373,7 +375,7 @@ fn render_autoconf_at(
|
|
|
373
375
|
if (!last_line) try bw.writeByte('\n');
|
|
374
376
|
}
|
|
375
377
|
|
|
376
|
-
for (values.
|
|
378
|
+
for (values.entries.slice().items(.key), used) |name, u| {
|
|
377
379
|
if (!u) {
|
|
378
380
|
try step.addError("{s}: error: config header value unused: '{s}'", .{ src_path, name });
|
|
379
381
|
any_errors = true;
|
|
@@ -387,14 +389,14 @@ fn render_cmake(
|
|
|
387
389
|
step: *Step,
|
|
388
390
|
contents: []const u8,
|
|
389
391
|
bw: *Writer,
|
|
390
|
-
values: std.
|
|
392
|
+
values: std.array_hash_map.String(Value),
|
|
391
393
|
src_path: []const u8,
|
|
392
394
|
) !void {
|
|
393
395
|
const build = step.owner;
|
|
394
396
|
const allocator = build.allocator;
|
|
395
397
|
|
|
396
|
-
var values_copy = try values.clone();
|
|
397
|
-
defer values_copy.deinit();
|
|
398
|
+
var values_copy = try values.clone(allocator);
|
|
399
|
+
defer values_copy.deinit(allocator);
|
|
398
400
|
|
|
399
401
|
var any_errors = false;
|
|
400
402
|
var line_index: u32 = 0;
|
|
@@ -523,7 +525,7 @@ fn render_cmake(
|
|
|
523
525
|
fn render_blank(
|
|
524
526
|
gpa: std.mem.Allocator,
|
|
525
527
|
bw: *Writer,
|
|
526
|
-
defines: std.
|
|
528
|
+
defines: std.array_hash_map.String(Value),
|
|
527
529
|
include_path: []const u8,
|
|
528
530
|
include_guard_override: ?[]const u8,
|
|
529
531
|
) !void {
|
|
@@ -555,7 +557,7 @@ fn render_blank(
|
|
|
555
557
|
, .{include_guard_name});
|
|
556
558
|
}
|
|
557
559
|
|
|
558
|
-
fn render_nasm(bw: *Writer, defines: std.
|
|
560
|
+
fn render_nasm(bw: *Writer, defines: std.array_hash_map.String(Value)) !void {
|
|
559
561
|
for (defines.keys(), defines.values()) |name, value| try renderValueNasm(bw, name, value);
|
|
560
562
|
}
|
|
561
563
|
|
|
@@ -586,7 +588,7 @@ fn renderValueNasm(bw: *Writer, name: []const u8, value: Value) !void {
|
|
|
586
588
|
fn expand_variables_autoconf_at(
|
|
587
589
|
bw: *Writer,
|
|
588
590
|
contents: []const u8,
|
|
589
|
-
values: std.
|
|
591
|
+
values: *const std.array_hash_map.String(Value),
|
|
590
592
|
used: []bool,
|
|
591
593
|
) !void {
|
|
592
594
|
const valid_varname_chars = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789_";
|
|
@@ -612,7 +614,7 @@ fn expand_variables_autoconf_at(
|
|
|
612
614
|
try bw.writeAll(key);
|
|
613
615
|
return error.MissingValue;
|
|
614
616
|
};
|
|
615
|
-
const value = values.
|
|
617
|
+
const value = values.entries.slice().items(.value)[index];
|
|
616
618
|
used[index] = true;
|
|
617
619
|
try bw.writeAll(contents[source_offset..curr]);
|
|
618
620
|
switch (value) {
|
|
@@ -633,7 +635,7 @@ fn expand_variables_autoconf_at(
|
|
|
633
635
|
fn expand_variables_cmake(
|
|
634
636
|
allocator: Allocator,
|
|
635
637
|
contents: []const u8,
|
|
636
|
-
values: std.
|
|
638
|
+
values: std.array_hash_map.String(Value),
|
|
637
639
|
) ![]const u8 {
|
|
638
640
|
var result: std.array_list.Managed(u8) = .init(allocator);
|
|
639
641
|
errdefer result.deinit();
|
|
@@ -765,7 +767,7 @@ fn testReplaceVariablesAutoconfAt(
|
|
|
765
767
|
allocator: Allocator,
|
|
766
768
|
contents: []const u8,
|
|
767
769
|
expected: []const u8,
|
|
768
|
-
values: std.
|
|
770
|
+
values: std.array_hash_map.String(Value),
|
|
769
771
|
) !void {
|
|
770
772
|
var aw: Writer.Allocating = .init(allocator);
|
|
771
773
|
defer aw.deinit();
|
|
@@ -784,7 +786,7 @@ fn testReplaceVariablesCMake(
|
|
|
784
786
|
allocator: Allocator,
|
|
785
787
|
contents: []const u8,
|
|
786
788
|
expected: []const u8,
|
|
787
|
-
values: std.
|
|
789
|
+
values: std.array_hash_map.String(Value),
|
|
788
790
|
) !void {
|
|
789
791
|
const actual = try expand_variables_cmake(allocator, contents, values);
|
|
790
792
|
defer allocator.free(actual);
|
|
@@ -794,7 +796,7 @@ fn testReplaceVariablesCMake(
|
|
|
794
796
|
|
|
795
797
|
test "expand_variables_autoconf_at simple cases" {
|
|
796
798
|
const allocator = std.testing.allocator;
|
|
797
|
-
var values: std.
|
|
799
|
+
var values: std.array_hash_map.String(Value) = .init(allocator);
|
|
798
800
|
defer values.deinit();
|
|
799
801
|
|
|
800
802
|
// empty strings are preserved
|
|
@@ -890,7 +892,7 @@ test "expand_variables_autoconf_at simple cases" {
|
|
|
890
892
|
|
|
891
893
|
test "expand_variables_autoconf_at edge cases" {
|
|
892
894
|
const allocator = std.testing.allocator;
|
|
893
|
-
var values: std.
|
|
895
|
+
var values: std.array_hash_map.String(Value) = .init(allocator);
|
|
894
896
|
defer values.deinit();
|
|
895
897
|
|
|
896
898
|
// @-vars resolved only when they wrap valid characters, otherwise considered literals
|
|
@@ -906,7 +908,7 @@ test "expand_variables_autoconf_at edge cases" {
|
|
|
906
908
|
|
|
907
909
|
test "expand_variables_cmake simple cases" {
|
|
908
910
|
const allocator = std.testing.allocator;
|
|
909
|
-
var values: std.
|
|
911
|
+
var values: std.array_hash_map.String(Value) = .init(allocator);
|
|
910
912
|
defer values.deinit();
|
|
911
913
|
|
|
912
914
|
try values.putNoClobber("undef", .undef);
|
|
@@ -994,7 +996,7 @@ test "expand_variables_cmake simple cases" {
|
|
|
994
996
|
|
|
995
997
|
test "expand_variables_cmake edge cases" {
|
|
996
998
|
const allocator = std.testing.allocator;
|
|
997
|
-
var values: std.
|
|
999
|
+
var values: std.array_hash_map.String(Value) = .init(allocator);
|
|
998
1000
|
defer values.deinit();
|
|
999
1001
|
|
|
1000
1002
|
// special symbols
|
|
@@ -1055,7 +1057,7 @@ test "expand_variables_cmake edge cases" {
|
|
|
1055
1057
|
|
|
1056
1058
|
test "expand_variables_cmake escaped characters" {
|
|
1057
1059
|
const allocator = std.testing.allocator;
|
|
1058
|
-
var values: std.
|
|
1060
|
+
var values: std.array_hash_map.String(Value) = .init(allocator);
|
|
1059
1061
|
defer values.deinit();
|
|
1060
1062
|
|
|
1061
1063
|
try values.putNoClobber("string", Value{ .string = "text" });
|
package/std/Build/Step/Run.zig
CHANGED
|
@@ -1173,7 +1173,7 @@ fn formatTerm(term: ?process.Child.Term, w: *std.Io.Writer) std.Io.Writer.Error!
|
|
|
1173
1173
|
if (term) |t| switch (t) {
|
|
1174
1174
|
.exited => |code| try w.print("exited with code {d}", .{code}),
|
|
1175
1175
|
.signal => |sig| try w.print("terminated with signal {t}", .{sig}),
|
|
1176
|
-
.stopped => |sig| try w.print("stopped with signal {
|
|
1176
|
+
.stopped => |sig| try w.print("stopped with signal {t}", .{sig}),
|
|
1177
1177
|
.unknown => |code| try w.print("terminated for unknown reason with code {d}", .{code}),
|
|
1178
1178
|
} else {
|
|
1179
1179
|
try w.writeAll("exited with any code");
|
|
@@ -2804,8 +2804,8 @@ fn hashStdIo(hh: *std.Build.Cache.HashHelper, stdio: StdIo) void {
|
|
|
2804
2804
|
.expect_term => |term| {
|
|
2805
2805
|
hh.add(@as(std.meta.Tag(process.Child.Term), term));
|
|
2806
2806
|
switch (term) {
|
|
2807
|
-
inline .exited, .signal => |x| hh.add(x),
|
|
2808
|
-
.
|
|
2807
|
+
inline .exited, .signal, .stopped => |x| hh.add(x),
|
|
2808
|
+
.unknown => |x| hh.add(x),
|
|
2809
2809
|
}
|
|
2810
2810
|
},
|
|
2811
2811
|
}
|
|
@@ -18,14 +18,12 @@ target: std.Build.ResolvedTarget,
|
|
|
18
18
|
optimize: std.builtin.OptimizeMode,
|
|
19
19
|
output_file: std.Build.GeneratedFile,
|
|
20
20
|
link_libc: bool,
|
|
21
|
-
use_clang: bool,
|
|
22
21
|
|
|
23
22
|
pub const Options = struct {
|
|
24
23
|
root_source_file: std.Build.LazyPath,
|
|
25
24
|
target: std.Build.ResolvedTarget,
|
|
26
25
|
optimize: std.builtin.OptimizeMode,
|
|
27
26
|
link_libc: bool = true,
|
|
28
|
-
use_clang: bool = true,
|
|
29
27
|
};
|
|
30
28
|
|
|
31
29
|
pub fn create(owner: *std.Build, options: Options) *TranslateC {
|
|
@@ -46,7 +44,6 @@ pub fn create(owner: *std.Build, options: Options) *TranslateC {
|
|
|
46
44
|
.optimize = options.optimize,
|
|
47
45
|
.output_file = .{ .step = &translate_c.step },
|
|
48
46
|
.link_libc = options.link_libc,
|
|
49
|
-
.use_clang = options.use_clang,
|
|
50
47
|
.system_libs = .empty,
|
|
51
48
|
};
|
|
52
49
|
source.addStepDependencies(&translate_c.step);
|
|
@@ -175,9 +172,6 @@ fn make(step: *Step, options: Step.MakeOptions) !void {
|
|
|
175
172
|
if (translate_c.link_libc) {
|
|
176
173
|
try argv_list.append("-lc");
|
|
177
174
|
}
|
|
178
|
-
if (!translate_c.use_clang) {
|
|
179
|
-
try argv_list.append("-fno-clang");
|
|
180
|
-
}
|
|
181
175
|
|
|
182
176
|
try argv_list.append("--cache-dir");
|
|
183
177
|
try argv_list.append(b.cache_root.path orelse ".");
|
package/std/Build/Step.zig
CHANGED
|
@@ -725,19 +725,12 @@ pub inline fn handleChildProcUnsupported(s: *Step) error{ OutOfMemory, MakeFaile
|
|
|
725
725
|
/// Asserts that the caller has already populated `s.result_failed_command`.
|
|
726
726
|
pub fn handleChildProcessTerm(s: *Step, term: std.process.Child.Term) error{ MakeFailed, OutOfMemory }!void {
|
|
727
727
|
assert(s.result_failed_command != null);
|
|
728
|
-
switch (term) {
|
|
729
|
-
.exited => |code| {
|
|
730
|
-
|
|
731
|
-
|
|
732
|
-
|
|
733
|
-
|
|
734
|
-
.signal => |sig| {
|
|
735
|
-
return s.fail("process terminated with signal {t}", .{sig});
|
|
736
|
-
},
|
|
737
|
-
.stopped, .unknown => {
|
|
738
|
-
return s.fail("process terminated unexpectedly", .{});
|
|
739
|
-
},
|
|
740
|
-
}
|
|
728
|
+
return switch (term) {
|
|
729
|
+
.exited => |code| if (code != 0) s.fail("process exited with error code {d}", .{code}),
|
|
730
|
+
.signal => |sig| s.fail("process terminated with signal {t}", .{sig}),
|
|
731
|
+
.stopped => |sig| s.fail("process stopped with signal {t}", .{sig}),
|
|
732
|
+
.unknown => s.fail("process terminated unexpectedly", .{}),
|
|
733
|
+
};
|
|
741
734
|
}
|
|
742
735
|
|
|
743
736
|
pub fn allocPrintCmd(
|
package/std/Build/WebServer.zig
CHANGED
|
@@ -681,7 +681,14 @@ fn buildClientWasm(ws: *WebServer, arena: Allocator, optimize: std.builtin.Optim
|
|
|
681
681
|
);
|
|
682
682
|
return error.WasmCompilationFailed;
|
|
683
683
|
},
|
|
684
|
-
.stopped
|
|
684
|
+
.stopped => |sig| {
|
|
685
|
+
log.err(
|
|
686
|
+
"the following command stopped unexpectedly with signal {t}:\n{s}",
|
|
687
|
+
.{ sig, try Build.Step.allocPrintCmd(arena, .inherit, null, argv.items) },
|
|
688
|
+
);
|
|
689
|
+
return error.WasmCompilationFailed;
|
|
690
|
+
},
|
|
691
|
+
.unknown => {
|
|
685
692
|
log.err(
|
|
686
693
|
"the following command terminated unexpectedly:\n{s}",
|
|
687
694
|
.{try Build.Step.allocPrintCmd(arena, .inherit, null, argv.items)},
|
package/std/Build.zig
CHANGED
|
@@ -86,10 +86,10 @@ libc_runtimes_dir: ?[]const u8 = null,
|
|
|
86
86
|
|
|
87
87
|
dep_prefix: []const u8 = "",
|
|
88
88
|
|
|
89
|
-
modules: std.
|
|
89
|
+
modules: std.array_hash_map.String(*Module),
|
|
90
90
|
|
|
91
|
-
named_writefiles: std.
|
|
92
|
-
named_lazy_paths: std.
|
|
91
|
+
named_writefiles: std.array_hash_map.String(*Step.WriteFile),
|
|
92
|
+
named_lazy_paths: std.array_hash_map.String(LazyPath),
|
|
93
93
|
/// The hash of this instance's package. `""` means that this is the root package.
|
|
94
94
|
pkg_hash: []const u8,
|
|
95
95
|
/// A mapping from dependency names to package hashes.
|
|
@@ -312,9 +312,9 @@ pub fn create(
|
|
|
312
312
|
},
|
|
313
313
|
.install_path = undefined,
|
|
314
314
|
.args = null,
|
|
315
|
-
.modules = .
|
|
316
|
-
.named_writefiles = .
|
|
317
|
-
.named_lazy_paths = .
|
|
315
|
+
.modules = .empty,
|
|
316
|
+
.named_writefiles = .empty,
|
|
317
|
+
.named_lazy_paths = .empty,
|
|
318
318
|
.pkg_hash = "",
|
|
319
319
|
.available_deps = available_deps,
|
|
320
320
|
.release_mode = .off,
|
|
@@ -405,9 +405,9 @@ fn createChildOnly(
|
|
|
405
405
|
.enable_wine = parent.enable_wine,
|
|
406
406
|
.libc_runtimes_dir = parent.libc_runtimes_dir,
|
|
407
407
|
.dep_prefix = parent.fmt("{s}{s}.", .{ parent.dep_prefix, dep_name }),
|
|
408
|
-
.modules = .
|
|
409
|
-
.named_writefiles = .
|
|
410
|
-
.named_lazy_paths = .
|
|
408
|
+
.modules = .empty,
|
|
409
|
+
.named_writefiles = .empty,
|
|
410
|
+
.named_lazy_paths = .empty,
|
|
411
411
|
.pkg_hash = pkg_hash,
|
|
412
412
|
.available_deps = pkg_deps,
|
|
413
413
|
.release_mode = parent.release_mode,
|
|
@@ -908,7 +908,7 @@ pub const AssemblyOptions = struct {
|
|
|
908
908
|
/// `createModule` can be used instead to create a private module.
|
|
909
909
|
pub fn addModule(b: *Build, name: []const u8, options: Module.CreateOptions) *Module {
|
|
910
910
|
const module = Module.create(b, options);
|
|
911
|
-
b.modules.put(b.dupe(name), module) catch @panic("OOM");
|
|
911
|
+
b.modules.put(b.graph.arena, b.dupe(name), module) catch @panic("OOM");
|
|
912
912
|
return module;
|
|
913
913
|
}
|
|
914
914
|
|
|
@@ -1056,12 +1056,12 @@ pub fn addWriteFile(b: *Build, file_path: []const u8, data: []const u8) *Step.Wr
|
|
|
1056
1056
|
|
|
1057
1057
|
pub fn addNamedWriteFiles(b: *Build, name: []const u8) *Step.WriteFile {
|
|
1058
1058
|
const wf = Step.WriteFile.create(b);
|
|
1059
|
-
b.named_writefiles.put(b.dupe(name), wf) catch @panic("OOM");
|
|
1059
|
+
b.named_writefiles.put(b.graph.arena, b.dupe(name), wf) catch @panic("OOM");
|
|
1060
1060
|
return wf;
|
|
1061
1061
|
}
|
|
1062
1062
|
|
|
1063
1063
|
pub fn addNamedLazyPath(b: *Build, name: []const u8, lp: LazyPath) void {
|
|
1064
|
-
b.named_lazy_paths.put(b.dupe(name), lp.dupe(b)) catch @panic("OOM");
|
|
1064
|
+
b.named_lazy_paths.put(b.graph.arena, b.dupe(name), lp.dupe(b)) catch @panic("OOM");
|
|
1065
1065
|
}
|
|
1066
1066
|
|
|
1067
1067
|
/// Creates a step for mutating files inside a temporary directory created lazily
|
|
@@ -1899,11 +1899,11 @@ pub fn runAllowFail(
|
|
|
1899
1899
|
}
|
|
1900
1900
|
return stdout;
|
|
1901
1901
|
},
|
|
1902
|
-
.signal => |sig| {
|
|
1902
|
+
.signal, .stopped => |sig| {
|
|
1903
1903
|
out_code.* = @as(u8, @truncate(@intFromEnum(sig)));
|
|
1904
1904
|
return error.ProcessTerminated;
|
|
1905
1905
|
},
|
|
1906
|
-
.
|
|
1906
|
+
.unknown => |code| {
|
|
1907
1907
|
out_code.* = @as(u8, @truncate(code));
|
|
1908
1908
|
return error.ProcessTerminated;
|
|
1909
1909
|
},
|
package/std/Io/Threaded.zig
CHANGED
|
@@ -15281,7 +15281,7 @@ fn childWaitPosix(child: *process.Child) process.Child.WaitError!process.Child.T
|
|
|
15281
15281
|
return switch (code) {
|
|
15282
15282
|
.EXITED => .{ .exited = @truncate(status) },
|
|
15283
15283
|
.KILLED, .DUMPED => .{ .signal = @enumFromInt(status) },
|
|
15284
|
-
.TRAPPED, .STOPPED => .{ .stopped = status },
|
|
15284
|
+
.TRAPPED, .STOPPED => .{ .stopped = @enumFromInt(status) },
|
|
15285
15285
|
_, .CONTINUED => .{ .unknown = status },
|
|
15286
15286
|
};
|
|
15287
15287
|
},
|
package/std/Io/Uring.zig
CHANGED
|
@@ -4729,7 +4729,7 @@ fn childWait(userdata: ?*anyopaque, child: *process.Child) process.Child.WaitErr
|
|
|
4729
4729
|
return switch (code) {
|
|
4730
4730
|
.EXITED => .{ .exited = @truncate(status) },
|
|
4731
4731
|
.KILLED, .DUMPED => .{ .signal = @enumFromInt(status) },
|
|
4732
|
-
.TRAPPED, .STOPPED => .{ .stopped = status },
|
|
4732
|
+
.TRAPPED, .STOPPED => .{ .stopped = @enumFromInt(status) },
|
|
4733
4733
|
_, .CONTINUED => .{ .unknown = status },
|
|
4734
4734
|
};
|
|
4735
4735
|
},
|