diff --git a/examples/fib/build.zig b/examples/fib/build.zig index 0a2e56d8..b4dae9cc 100644 --- a/examples/fib/build.zig +++ b/examples/fib/build.zig @@ -1,6 +1,6 @@ -const Builder = @import("std").build.Builder; +const Build = @import("std").Build; -pub fn build(b: *Builder) void { +pub fn build(b: *Build) void { const target = b.standardTargetOptions(.{}); const optimize = b.standardOptimizeOption(.{}); @@ -10,8 +10,8 @@ pub fn build(b: *Builder) void { .target = target, .optimize = optimize, }); - exe.addAnonymousModule("zware", .{ - .source_file = .{ .path = "../../src/main.zig" }, + exe.root_module.addAnonymousImport("zware", .{ + .root_source_file = .{ .path = "../../src/main.zig" }, }); b.installArtifact(exe); diff --git a/test/interface/build.zig b/test/interface/build.zig index c3a5b4c8..fa8ce780 100644 --- a/test/interface/build.zig +++ b/test/interface/build.zig @@ -1,6 +1,6 @@ -const Builder = @import("std").build.Builder; +const Build = @import("std").Build; -pub fn build(b: *Builder) void { +pub fn build(b: *Build) void { const target = b.standardTargetOptions(.{}); const optimize = b.standardOptimizeOption(.{}); @@ -10,8 +10,8 @@ pub fn build(b: *Builder) void { .target = target, .optimize = optimize, }); - exe.addAnonymousModule("zware", .{ - .source_file = .{ .path = "../../src/main.zig" }, + exe.root_module.addAnonymousImport("zware", .{ + .root_source_file = .{ .path = "../../src/main.zig" }, }); b.installArtifact(exe); diff --git a/test/parsecheck/build.zig b/test/parsecheck/build.zig index fa711634..b66e3942 100644 --- a/test/parsecheck/build.zig +++ b/test/parsecheck/build.zig @@ -1,6 +1,6 @@ -const Builder = @import("std").build.Builder; +const Build = @import("std").Build; -pub fn build(b: *Builder) void { +pub fn build(b: *Build) void { const target = b.standardTargetOptions(.{}); const optimize = b.standardOptimizeOption(.{}); @@ -10,8 +10,8 @@ pub fn build(b: *Builder) void { .target = target, .optimize = optimize, }); - exe.addAnonymousModule("zware", .{ - .source_file = .{ .path = "../../src/main.zig" }, + exe.root_module.addAnonymousImport("zware", .{ + .root_source_file = .{ .path = "../../src/main.zig" }, }); b.installArtifact(exe); diff --git a/test/parsecheck/src/parsecheck.zig b/test/parsecheck/src/parsecheck.zig index 09cc0192..8e8034df 100644 --- a/test/parsecheck/src/parsecheck.zig +++ b/test/parsecheck/src/parsecheck.zig @@ -12,17 +12,27 @@ const GeneralPurposeAllocator = std.heap.GeneralPurposeAllocator; const ArenaAllocator = std.heap.ArenaAllocator; var gpa = GeneralPurposeAllocator(.{}){}; +const native_os = @import("builtin").os.tag; + pub fn main() !void { - var args = process.args(); + defer _ = gpa.deinit(); + + var args = switch (native_os) { + .windows, .wasi => try process.ArgIterator.initWithAllocator(gpa.allocator()), + else => process.ArgIterator.init(), + }; + defer args.deinit(); + _ = args.skip(); const directory = args.next() orelse return error.NoFilename; - defer _ = gpa.deinit(); - var wasm_files = ArrayList([]const u8).init(gpa.allocator()); defer wasm_files.deinit(); - var dir = try std.fs.cwd().openIterableDir(directory, .{}); + var dir = try std.fs.cwd().openDir(directory, .{ + .no_follow = true, + .iterate = true, + }); defer dir.close(); var it = dir.iterate(); @@ -36,7 +46,7 @@ pub fn main() !void { defer _ = arena.deinit(); const alloc = arena.allocator(); - const program = try dir.dir.readFileAlloc(alloc, entry.name, 0xFFFFFFF); + const program = try dir.readFileAlloc(alloc, entry.name, 0xFFFFFFF); if (program.len == 0) continue; var store: Store = Store.init(alloc); diff --git a/tools/zware-gen/build.zig b/tools/zware-gen/build.zig index 8a494632..77657ae3 100644 --- a/tools/zware-gen/build.zig +++ b/tools/zware-gen/build.zig @@ -1,6 +1,6 @@ -const Builder = @import("std").build.Builder; +const Build = @import("std").Build; -pub fn build(b: *Builder) void { +pub fn build(b: *Build) void { const target = b.standardTargetOptions(.{}); const optimize = b.standardOptimizeOption(.{}); @@ -10,8 +10,8 @@ pub fn build(b: *Builder) void { .target = target, .optimize = optimize, }); - exe.addAnonymousModule("zware", .{ - .source_file = .{ .path = "../../src/main.zig" }, + exe.root_module.addAnonymousImport("zware", .{ + .root_source_file = .{ .path = "../../src/main.zig" }, }); b.installArtifact(exe);