authorgravatar for mail@linusgroh.deLinus Groh <mail@linusgroh.de> 2026-05-03 21:18:24+01:00
committergravatar for alex@alexrp.comAlex Rønne Petersen <alex@alexrp.com> 2026-05-05 04:12:52+02:00
log0add2dfc4131c69dbca6866d814eb5538468c0a0
tree1c8ea4b67c42b41e60a4ff80d08db4ffd829fa94
parent32ea57af50c1719c99f795ebe688d5a541117e97

std.Io.File: Remove deprecated option types

7 files changed, 14 insertions(+), 22 deletions(-)

lib/std/Build/Cache/Path.zig+1-1
...@@ -59,7 +59,7 @@ pub fn joinStringZ(p: Path, gpa: Allocator, sub_path: []const u8) Allocator.Erro...@@ -59,7 +59,7 @@ pub fn joinStringZ(p: Path, gpa: Allocator, sub_path: []const u8) Allocator.Erro
59 return p.root_dir.joinZ(gpa, parts);59 return p.root_dir.joinZ(gpa, parts);
60}60}
6161
62pub fn openFile(p: Path, io: Io, sub_path: []const u8, flags: Io.File.OpenFlags) !Io.File {62pub fn openFile(p: Path, io: Io, sub_path: []const u8, flags: Io.Dir.OpenFileOptions) !Io.File {
63 var buf: [fs.max_path_bytes]u8 = undefined;63 var buf: [fs.max_path_bytes]u8 = undefined;
64 const joined_path = if (p.sub_path.len == 0) sub_path else p: {64 const joined_path = if (p.sub_path.len == 0) sub_path else p: {
65 break :p std.fmt.bufPrint(&buf, "{s}" ++ fs.path.sep_str ++ "{s}", .{65 break :p std.fmt.bufPrint(&buf, "{s}" ++ fs.path.sep_str ++ "{s}", .{
lib/std/Io.zig+3-3
...@@ -2922,7 +2922,7 @@ pub fn failingDirAccess(userdata: ?*anyopaque, dir: Dir, sub_path: []const u8, o...@@ -2922,7 +2922,7 @@ pub fn failingDirAccess(userdata: ?*anyopaque, dir: Dir, sub_path: []const u8, o
2922 return error.FileNotFound;2922 return error.FileNotFound;
2923}2923}
29242924
2925pub fn failingDirCreateFile(userdata: ?*anyopaque, dir: Dir, sub_path: []const u8, options: File.CreateFlags) File.OpenError!File {2925pub fn failingDirCreateFile(userdata: ?*anyopaque, dir: Dir, sub_path: []const u8, options: Dir.CreateFileOptions) File.OpenError!File {
2926 _ = userdata;2926 _ = userdata;
2927 _ = dir;2927 _ = dir;
2928 _ = sub_path;2928 _ = sub_path;
...@@ -2938,7 +2938,7 @@ pub fn failingDirCreateFileAtomic(userdata: ?*anyopaque, dir: Dir, sub_path: []c...@@ -2938,7 +2938,7 @@ pub fn failingDirCreateFileAtomic(userdata: ?*anyopaque, dir: Dir, sub_path: []c
2938 return error.NoSpaceLeft;2938 return error.NoSpaceLeft;
2939}2939}
29402940
2941pub fn failingDirOpenFile(userdata: ?*anyopaque, dir: Dir, sub_path: []const u8, flags: File.OpenFlags) File.OpenError!File {2941pub fn failingDirOpenFile(userdata: ?*anyopaque, dir: Dir, sub_path: []const u8, flags: Dir.OpenFileOptions) File.OpenError!File {
2942 _ = userdata;2942 _ = userdata;
2943 _ = dir;2943 _ = dir;
2944 _ = sub_path;2944 _ = sub_path;
...@@ -3275,7 +3275,7 @@ pub fn unreachableFileMemoryMapWrite(userdata: ?*anyopaque, mm: *File.MemoryMap)...@@ -3275,7 +3275,7 @@ pub fn unreachableFileMemoryMapWrite(userdata: ?*anyopaque, mm: *File.MemoryMap)
3275 unreachable;3275 unreachable;
3276}3276}
32773277
3278pub fn failingProcessExecutableOpen(userdata: ?*anyopaque, flags: File.OpenFlags) std.process.OpenExecutableError!File {3278pub fn failingProcessExecutableOpen(userdata: ?*anyopaque, flags: Dir.OpenFileOptions) std.process.OpenExecutableError!File {
3279 _ = userdata;3279 _ = userdata;
3280 _ = flags;3280 _ = flags;
3281 return error.FileNotFound;3281 return error.FileNotFound;
lib/std/Io/Dispatch.zig+3-3
...@@ -2468,7 +2468,7 @@ fn dirCreateFile(...@@ -2468,7 +2468,7 @@ fn dirCreateFile(
2468 userdata: ?*anyopaque,2468 userdata: ?*anyopaque,
2469 dir: Dir,2469 dir: Dir,
2470 sub_path: []const u8,2470 sub_path: []const u8,
2471 flags: File.CreateFlags,2471 flags: Dir.CreateFileOptions,
2472) File.OpenError!File {2472) File.OpenError!File {
2473 const ev: *Evented = @ptrCast(@alignCast(userdata));2473 const ev: *Evented = @ptrCast(@alignCast(userdata));
2474 _ = ev;2474 _ = ev;
...@@ -2601,7 +2601,7 @@ fn dirOpenFile(...@@ -2601,7 +2601,7 @@ fn dirOpenFile(
2601 userdata: ?*anyopaque,2601 userdata: ?*anyopaque,
2602 dir: Dir,2602 dir: Dir,
2603 sub_path: []const u8,2603 sub_path: []const u8,
2604 flags: File.OpenFlags,2604 flags: Dir.OpenFileOptions,
2605) File.OpenError!File {2605) File.OpenError!File {
2606 const ev: *Evented = @ptrCast(@alignCast(userdata));2606 const ev: *Evented = @ptrCast(@alignCast(userdata));
26072607
...@@ -3936,7 +3936,7 @@ fn fileMemoryMapWrite(userdata: ?*anyopaque, mm: *File.MemoryMap) File.WritePosi...@@ -3936,7 +3936,7 @@ fn fileMemoryMapWrite(userdata: ?*anyopaque, mm: *File.MemoryMap) File.WritePosi
39363936
3937fn processExecutableOpen(3937fn processExecutableOpen(
3938 userdata: ?*anyopaque,3938 userdata: ?*anyopaque,
3939 flags: File.OpenFlags,3939 flags: Dir.OpenFileOptions,
3940) process.OpenExecutableError!File {3940) process.OpenExecutableError!File {
3941 const ev: *Evented = @ptrCast(@alignCast(userdata));3941 const ev: *Evented = @ptrCast(@alignCast(userdata));
3942 // _NSGetExecutablePath() returns a path that might be a symlink to3942 // _NSGetExecutablePath() returns a path that might be a symlink to
lib/std/Io/File.zig-9
...@@ -142,21 +142,12 @@ pub fn stat(file: File, io: Io) StatError!Stat {...@@ -142,21 +142,12 @@ pub fn stat(file: File, io: Io) StatError!Stat {
142 return io.vtable.fileStat(io.userdata, file);142 return io.vtable.fileStat(io.userdata, file);
143}143}
144144
145/// Deprecated, renamed to `Dir.OpenFileOptions.Mode`.
146pub const OpenMode = Dir.OpenFileOptions.Mode;
147
148pub const Lock = enum {145pub const Lock = enum {
149 none,146 none,
150 shared,147 shared,
151 exclusive,148 exclusive,
152};149};
153150
154/// Deprecated, renamed to `Dir.OpenFileOptions`
155pub const OpenFlags = Dir.OpenFileOptions;
156
157/// Deprecated, renamed to `Dir.CreateFileOptions`.
158pub const CreateFlags = Dir.CreateFileOptions;
159
160pub const OpenError = error{151pub const OpenError = error{
161 PipeBusy,152 PipeBusy,
162 NoDevice,153 NoDevice,
lib/std/Io/Kqueue.zig+2-2
...@@ -877,7 +877,7 @@ fn dirAccess(userdata: ?*anyopaque, dir: Dir, sub_path: []const u8, options: Dir...@@ -877,7 +877,7 @@ fn dirAccess(userdata: ?*anyopaque, dir: Dir, sub_path: []const u8, options: Dir
877 _ = options;877 _ = options;
878 @panic("TODO");878 @panic("TODO");
879}879}
880fn dirCreateFile(userdata: ?*anyopaque, dir: Dir, sub_path: []const u8, flags: File.CreateFlags) File.OpenError!File {880fn dirCreateFile(userdata: ?*anyopaque, dir: Dir, sub_path: []const u8, flags: Dir.CreateFileOptions) File.OpenError!File {
881 const k: *Kqueue = @ptrCast(@alignCast(userdata));881 const k: *Kqueue = @ptrCast(@alignCast(userdata));
882 _ = k;882 _ = k;
883 _ = dir;883 _ = dir;
...@@ -885,7 +885,7 @@ fn dirCreateFile(userdata: ?*anyopaque, dir: Dir, sub_path: []const u8, flags: F...@@ -885,7 +885,7 @@ fn dirCreateFile(userdata: ?*anyopaque, dir: Dir, sub_path: []const u8, flags: F
885 _ = flags;885 _ = flags;
886 @panic("TODO");886 @panic("TODO");
887}887}
888fn dirOpenFile(userdata: ?*anyopaque, dir: Dir, sub_path: []const u8, flags: File.OpenFlags) File.OpenError!File {888fn dirOpenFile(userdata: ?*anyopaque, dir: Dir, sub_path: []const u8, flags: Dir.OpenFileOptions) File.OpenError!File {
889 const k: *Kqueue = @ptrCast(@alignCast(userdata));889 const k: *Kqueue = @ptrCast(@alignCast(userdata));
890 _ = k;890 _ = k;
891 _ = dir;891 _ = dir;
lib/std/Io/Uring.zig+3-3
...@@ -2812,7 +2812,7 @@ fn dirCreateFile(...@@ -2812,7 +2812,7 @@ fn dirCreateFile(
2812 userdata: ?*anyopaque,2812 userdata: ?*anyopaque,
2813 dir: Dir,2813 dir: Dir,
2814 sub_path: []const u8,2814 sub_path: []const u8,
2815 flags: File.CreateFlags,2815 flags: Dir.CreateFileOptions,
2816) File.OpenError!File {2816) File.OpenError!File {
2817 const ev: *Evented = @ptrCast(@alignCast(userdata));2817 const ev: *Evented = @ptrCast(@alignCast(userdata));
28182818
...@@ -2996,7 +2996,7 @@ fn dirOpenFile(...@@ -2996,7 +2996,7 @@ fn dirOpenFile(
2996 userdata: ?*anyopaque,2996 userdata: ?*anyopaque,
2997 dir: Dir,2997 dir: Dir,
2998 sub_path: []const u8,2998 sub_path: []const u8,
2999 flags: File.OpenFlags,2999 flags: Dir.OpenFileOptions,
3000) File.OpenError!File {3000) File.OpenError!File {
3001 const ev: *Evented = @ptrCast(@alignCast(userdata));3001 const ev: *Evented = @ptrCast(@alignCast(userdata));
30023002
...@@ -4104,7 +4104,7 @@ fn fileMemoryMapWrite(userdata: ?*anyopaque, mm: *File.MemoryMap) File.WritePosi...@@ -4104,7 +4104,7 @@ fn fileMemoryMapWrite(userdata: ?*anyopaque, mm: *File.MemoryMap) File.WritePosi
41044104
4105fn processExecutableOpen(4105fn processExecutableOpen(
4106 userdata: ?*anyopaque,4106 userdata: ?*anyopaque,
4107 flags: File.OpenFlags,4107 flags: Dir.OpenFileOptions,
4108) process.OpenExecutableError!File {4108) process.OpenExecutableError!File {
4109 const ev: *Evented = @ptrCast(@alignCast(userdata));4109 const ev: *Evented = @ptrCast(@alignCast(userdata));
4110 return dirOpenFile(ev, .{ .handle = linux.AT.FDCWD }, "/proc/self/exe", flags);4110 return dirOpenFile(ev, .{ .handle = linux.AT.FDCWD }, "/proc/self/exe", flags);
lib/std/process.zig+2-1
...@@ -3,6 +3,7 @@ const native_os = builtin.os.tag;...@@ -3,6 +3,7 @@ const native_os = builtin.os.tag;
33
4const std = @import("std.zig");4const std = @import("std.zig");
5const Io = std.Io;5const Io = std.Io;
6const Dir = std.Io.Dir;
6const File = std.Io.File;7const File = std.Io.File;
7const fs = std.fs;8const fs = std.fs;
8const mem = std.mem;9const mem = std.mem;
...@@ -784,7 +785,7 @@ pub fn executableDirPathAlloc(io: Io, allocator: Allocator) ExecutablePathAllocE...@@ -784,7 +785,7 @@ pub fn executableDirPathAlloc(io: Io, allocator: Allocator) ExecutablePathAllocE
784785
785pub const OpenExecutableError = File.OpenError || ExecutablePathError || File.LockError;786pub const OpenExecutableError = File.OpenError || ExecutablePathError || File.LockError;
786787
787pub fn openExecutable(io: Io, flags: File.OpenFlags) OpenExecutableError!File {788pub fn openExecutable(io: Io, flags: Dir.OpenFileOptions) OpenExecutableError!File {
788 return io.vtable.processExecutableOpen(io.userdata, flags);789 return io.vtable.processExecutableOpen(io.userdata, flags);
789}790}
790791