From 3466056478d2ad988b117a89d7cbe3cc1557425a Mon Sep 17 00:00:00 2001 From: Andrew Kelley Date: Thu, 18 Dec 2025 14:37:45 -0800 Subject: [PATCH] std.Io.Dir.CopyFileOptions: rename override_permissions to more simply `permissions`. In master branch this was `override_mode`. --- lib/std/Io/Dir.zig | 6 +++--- lib/std/fs/test.zig | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/std/Io/Dir.zig b/lib/std/Io/Dir.zig index b67c9d048d2999c3985a0788de5290cf45620a57..72b4a00cdd8795e18d4d8d38e9e5ba644aa75d7f 100644 --- a/lib/std/Io/Dir.zig +++ b/lib/std/Io/Dir.zig @@ -564,7 +564,7 @@ pub fn updateFile( defer src_file.close(io); const src_stat = try src_file.stat(io); - const actual_permissions = options.override_permissions orelse src_stat.permissions; + const actual_permissions = options.permissions orelse src_stat.permissions; check_dest_stat: { const dest_stat = blk: { var dest_file = dest_dir.openFile(io, dest_path, .{}) catch |err| switch (err) { @@ -1645,7 +1645,7 @@ fn deleteTreeOpenInitialSubpath(dir: Dir, io: Io, sub_path: []const u8, kind_hin pub const CopyFileOptions = struct { /// When this is `null` the permissions are copied from the source file. - override_permissions: ?File.Permissions = null, + permissions: ?File.Permissions = null, }; pub const CopyFileError = File.OpenError || File.StatError || @@ -1677,7 +1677,7 @@ pub fn copyFile( var file_reader: File.Reader = .init(.{ .handle = file.handle }, io, &.{}); defer file_reader.file.close(io); - const permissions = options.override_permissions orelse blk: { + const permissions = options.permissions orelse blk: { const st = try file_reader.file.stat(io); file_reader.size = st.size; break :blk st.permissions; diff --git a/lib/std/fs/test.zig b/lib/std/fs/test.zig index dea562578a23ad627c31b35eab8e8917ac23e14a..4e0fba82edd38093341c49efa2ff1dae7b0d4ccc 100644 --- a/lib/std/fs/test.zig +++ b/lib/std/fs/test.zig @@ -1593,7 +1593,7 @@ test "copyFile" { try ctx.dir.copyFile(src_file, ctx.dir, dest_file, io, .{}); defer ctx.dir.deleteFile(io, dest_file) catch {}; - try ctx.dir.copyFile(src_file, ctx.dir, dest_file2, io, .{ .override_mode = File.default_mode }); + try ctx.dir.copyFile(src_file, ctx.dir, dest_file2, io, .{ .permissions = File.default_mode }); defer ctx.dir.deleteFile(io, dest_file2) catch {}; try expectFileContents(io, ctx.dir, dest_file, data); -- 2.54.0