authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2026-04-20 02:23:17+02:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2026-04-20 02:23:17+02:00
log6067a8b1a086aaada732febc7f96d58ba80253db
tree2d5a0a813acf12e7c27bda6d6ffd4742eb1b267f
parent76174e1bcef30f5194fb06f1240ff1433cffa9ef
parent50f96d2ca161db0e821b4d08baf6bdb9938a5937

Merge pull request 'std.Io.Dir: fix incorrect return types in setFileOwner and setTimestampsNow' (#31940) from lukasl/zig:fix-dir-setfileowner-error-type into master

Reviewed-on: https://codeberg.org/ziglang/zig/pulls/31940 Reviewed-by: Andrew Kelley <andrew@ziglang.org>

1 files changed, 7 insertions(+), 2 deletions(-)

lib/std/Io/Dir.zig+7-2
...@@ -1993,7 +1993,7 @@ pub fn setFileOwner(...@@ -1993,7 +1993,7 @@ pub fn setFileOwner(
1993 owner: ?File.Uid,1993 owner: ?File.Uid,
1994 group: ?File.Gid,1994 group: ?File.Gid,
1995 options: SetFileOwnerOptions,1995 options: SetFileOwnerOptions,
1996) SetOwnerError!void {1996) SetFileOwnerError!void {
1997 return io.vtable.dirSetFileOwner(io.userdata, dir, sub_path, owner, group, options);1997 return io.vtable.dirSetFileOwner(io.userdata, dir, sub_path, owner, group, options);
1998}1998}
19991999
...@@ -2032,9 +2032,14 @@ pub fn setTimestampsNow(...@@ -2032,9 +2032,14 @@ pub fn setTimestampsNow(
2032 sub_path: []const u8,2032 sub_path: []const u8,
2033 options: SetTimestampsNowOptions,2033 options: SetTimestampsNowOptions,
2034) SetTimestampsError!void {2034) SetTimestampsError!void {
2035 return io.vtable.fileSetTimestamps(io.userdata, dir, sub_path, .{2035 return io.vtable.dirSetTimestamps(io.userdata, dir, sub_path, .{
2036 .follow_symlinks = options.follow_symlinks,2036 .follow_symlinks = options.follow_symlinks,
2037 .access_timestamp = .now,2037 .access_timestamp = .now,
2038 .modify_timestamp = .now,2038 .modify_timestamp = .now,
2039 });2039 });
2040}2040}
2041
2042test {
2043 _ = &setFileOwner;
2044 _ = &setTimestampsNow;
2045}