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
5959 return p.root_dir.joinZ(gpa, parts);
6060}
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 {
6363 var buf: [fs.max_path_bytes]u8 = undefined;
6464 const joined_path = if (p.sub_path.len == 0) sub_path else p: {
6565 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
29222922 return error.FileNotFound;
29232923}
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 {
29262926 _ = userdata;
29272927 _ = dir;
29282928 _ = sub_path;
......@@ -2938,7 +2938,7 @@ pub fn failingDirCreateFileAtomic(userdata: ?*anyopaque, dir: Dir, sub_path: []c
29382938 return error.NoSpaceLeft;
29392939}
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 {
29422942 _ = userdata;
29432943 _ = dir;
29442944 _ = sub_path;
......@@ -3275,7 +3275,7 @@ pub fn unreachableFileMemoryMapWrite(userdata: ?*anyopaque, mm: *File.MemoryMap)
32753275 unreachable;
32763276}
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 {
32793279 _ = userdata;
32803280 _ = flags;
32813281 return error.FileNotFound;
lib/std/Io/Dispatch.zig+3-3
......@@ -2468,7 +2468,7 @@ fn dirCreateFile(
24682468 userdata: ?*anyopaque,
24692469 dir: Dir,
24702470 sub_path: []const u8,
2471 flags: File.CreateFlags,
2471 flags: Dir.CreateFileOptions,
24722472) File.OpenError!File {
24732473 const ev: *Evented = @ptrCast(@alignCast(userdata));
24742474 _ = ev;
......@@ -2601,7 +2601,7 @@ fn dirOpenFile(
26012601 userdata: ?*anyopaque,
26022602 dir: Dir,
26032603 sub_path: []const u8,
2604 flags: File.OpenFlags,
2604 flags: Dir.OpenFileOptions,
26052605) File.OpenError!File {
26062606 const ev: *Evented = @ptrCast(@alignCast(userdata));
26072607
......@@ -3936,7 +3936,7 @@ fn fileMemoryMapWrite(userdata: ?*anyopaque, mm: *File.MemoryMap) File.WritePosi
39363936
39373937fn processExecutableOpen(
39383938 userdata: ?*anyopaque,
3939 flags: File.OpenFlags,
3939 flags: Dir.OpenFileOptions,
39403940) process.OpenExecutableError!File {
39413941 const ev: *Evented = @ptrCast(@alignCast(userdata));
39423942 // _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 {
142142 return io.vtable.fileStat(io.userdata, file);
143143}
144144
145/// Deprecated, renamed to `Dir.OpenFileOptions.Mode`.
146pub const OpenMode = Dir.OpenFileOptions.Mode;
147
148145pub const Lock = enum {
149146 none,
150147 shared,
151148 exclusive,
152149};
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
160151pub const OpenError = error{
161152 PipeBusy,
162153 NoDevice,
lib/std/Io/Kqueue.zig+2-2
......@@ -877,7 +877,7 @@ fn dirAccess(userdata: ?*anyopaque, dir: Dir, sub_path: []const u8, options: Dir
877877 _ = options;
878878 @panic("TODO");
879879}
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 {
881881 const k: *Kqueue = @ptrCast(@alignCast(userdata));
882882 _ = k;
883883 _ = dir;
......@@ -885,7 +885,7 @@ fn dirCreateFile(userdata: ?*anyopaque, dir: Dir, sub_path: []const u8, flags: F
885885 _ = flags;
886886 @panic("TODO");
887887}
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 {
889889 const k: *Kqueue = @ptrCast(@alignCast(userdata));
890890 _ = k;
891891 _ = dir;
lib/std/Io/Uring.zig+3-3
......@@ -2812,7 +2812,7 @@ fn dirCreateFile(
28122812 userdata: ?*anyopaque,
28132813 dir: Dir,
28142814 sub_path: []const u8,
2815 flags: File.CreateFlags,
2815 flags: Dir.CreateFileOptions,
28162816) File.OpenError!File {
28172817 const ev: *Evented = @ptrCast(@alignCast(userdata));
28182818
......@@ -2996,7 +2996,7 @@ fn dirOpenFile(
29962996 userdata: ?*anyopaque,
29972997 dir: Dir,
29982998 sub_path: []const u8,
2999 flags: File.OpenFlags,
2999 flags: Dir.OpenFileOptions,
30003000) File.OpenError!File {
30013001 const ev: *Evented = @ptrCast(@alignCast(userdata));
30023002
......@@ -4104,7 +4104,7 @@ fn fileMemoryMapWrite(userdata: ?*anyopaque, mm: *File.MemoryMap) File.WritePosi
41044104
41054105fn processExecutableOpen(
41064106 userdata: ?*anyopaque,
4107 flags: File.OpenFlags,
4107 flags: Dir.OpenFileOptions,
41084108) process.OpenExecutableError!File {
41094109 const ev: *Evented = @ptrCast(@alignCast(userdata));
41104110 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;
33
44const std = @import("std.zig");
55const Io = std.Io;
6const Dir = std.Io.Dir;
67const File = std.Io.File;
78const fs = std.fs;
89const mem = std.mem;
......@@ -784,7 +785,7 @@ pub fn executableDirPathAlloc(io: Io, allocator: Allocator) ExecutablePathAllocE
784785
785786pub 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 {
788789 return io.vtable.processExecutableOpen(io.userdata, flags);
789790}
790791