From 018e34271fe58e540dc46e8bca529ce399625bef Mon Sep 17 00:00:00 2001 From: Andrew Kelley Date: Fri, 19 Dec 2025 10:07:56 -0800 Subject: std.fs.test: fix rebase conflicts --- lib/std/fs/test.zig | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'lib/std') diff --git a/lib/std/fs/test.zig b/lib/std/fs/test.zig index e253aeeb54..19df1189fb 100644 --- a/lib/std/fs/test.zig +++ b/lib/std/fs/test.zig @@ -237,23 +237,24 @@ test "Dir.readLink" { test "Dir.readLink on non-symlinks" { try testWithAllSupportedPathTypes(struct { fn impl(ctx: *TestContext) !void { + const io = ctx.io; const file_path = try ctx.transformPath("file.txt"); - try ctx.dir.writeFile(.{ .sub_path = file_path, .data = "nonsense" }); + try ctx.dir.writeFile(io, .{ .sub_path = file_path, .data = "nonsense" }); const dir_path = try ctx.transformPath("subdir"); - try ctx.dir.makeDir(dir_path); + try ctx.dir.makeDir(io, dir_path, .default_dir); // file - var buffer: [fs.max_path_bytes]u8 = undefined; - try std.testing.expectError(error.NotLink, ctx.dir.readLink(file_path, &buffer)); + var buffer: [Dir.max_path_bytes]u8 = undefined; + try std.testing.expectError(error.NotLink, ctx.dir.readLink(io, file_path, &buffer)); if (builtin.os.tag == .windows) { - var file_path_w = try std.os.windows.sliceToPrefixedFileW(ctx.dir.fd, file_path); + var file_path_w = try std.os.windows.sliceToPrefixedFileW(ctx.dir.handle, file_path); try std.testing.expectError(error.NotLink, ctx.dir.readLinkW(file_path_w.span(), &file_path_w.data)); } // dir - try std.testing.expectError(error.NotLink, ctx.dir.readLink(dir_path, &buffer)); + try std.testing.expectError(error.NotLink, ctx.dir.readLink(io, dir_path, &buffer)); if (builtin.os.tag == .windows) { - var dir_path_w = try std.os.windows.sliceToPrefixedFileW(ctx.dir.fd, dir_path); + var dir_path_w = try std.os.windows.sliceToPrefixedFileW(ctx.dir.handle, dir_path); try std.testing.expectError(error.NotLink, ctx.dir.readLinkW(dir_path_w.span(), &dir_path_w.data)); } } -- cgit v1.2.3