| ... | @@ -11,7 +11,7 @@ const linux = std.os.linux; | ... | @@ -11,7 +11,7 @@ const linux = std.os.linux; |
| 11 | const windows = std.os.windows; | 11 | const windows = std.os.windows; |
| 12 | | 12 | |
| 13 | io: Io, | 13 | io: Io, |
| 14 | file: std.Io.File, | 14 | file: Io.File, |
| 15 | flags: packed struct { | 15 | flags: packed struct { |
| 16 | block_size: std.mem.Alignment, | 16 | block_size: std.mem.Alignment, |
| 17 | copy_file_range_unsupported: bool, | 17 | copy_file_range_unsupported: bool, |
| ... | @@ -29,7 +29,7 @@ writers: std.SinglyLinkedList, | ... | @@ -29,7 +29,7 @@ writers: std.SinglyLinkedList, |
| 29 | | 29 | |
| 30 | pub const growth_factor = 4; | 30 | pub const growth_factor = 4; |
| 31 | | 31 | |
| 32 | pub const Error = std.posix.MMapError || std.posix.MRemapError || Io.File.LengthError || error{ | 32 | pub const Error = Io.File.MemoryMap.CreateError || Io.File.LengthError || error{ |
| 33 | NotFile, | 33 | NotFile, |
| 34 | SystemResources, | 34 | SystemResources, |
| 35 | IsDir, | 35 | IsDir, |
| ... | @@ -42,7 +42,7 @@ pub const Error = std.posix.MMapError || std.posix.MRemapError || Io.File.Length | ... | @@ -42,7 +42,7 @@ pub const Error = std.posix.MMapError || std.posix.MRemapError || Io.File.Length |
| 42 | NonResizable, | 42 | NonResizable, |
| 43 | }; | 43 | }; |
| 44 | | 44 | |
| 45 | pub fn init(file: std.Io.File, gpa: std.mem.Allocator, io: Io) !MappedFile { | 45 | pub fn init(file: Io.File, gpa: std.mem.Allocator, io: Io) !MappedFile { |
| 46 | var mf: MappedFile = .{ | 46 | var mf: MappedFile = .{ |
| 47 | .io = io, | 47 | .io = io, |
| 48 | .file = file, | 48 | .file = file, |
| ... | @@ -396,7 +396,7 @@ pub const Node = extern struct { | ... | @@ -396,7 +396,7 @@ pub const Node = extern struct { |
| 396 | mf: *MappedFile, | 396 | mf: *MappedFile, |
| 397 | writer_node: std.SinglyLinkedList.Node, | 397 | writer_node: std.SinglyLinkedList.Node, |
| 398 | ni: Node.Index, | 398 | ni: Node.Index, |
| 399 | interface: std.Io.Writer, | 399 | interface: Io.Writer, |
| 400 | err: ?Error, | 400 | err: ?Error, |
| 401 | | 401 | |
| 402 | pub fn deinit(w: *Writer) void { | 402 | pub fn deinit(w: *Writer) void { |
| ... | @@ -404,18 +404,18 @@ pub const Node = extern struct { | ... | @@ -404,18 +404,18 @@ pub const Node = extern struct { |
| 404 | w.* = undefined; | 404 | w.* = undefined; |
| 405 | } | 405 | } |
| 406 | | 406 | |
| 407 | const vtable: std.Io.Writer.VTable = .{ | 407 | const vtable: Io.Writer.VTable = .{ |
| 408 | .drain = drain, | 408 | .drain = drain, |
| 409 | .sendFile = sendFile, | 409 | .sendFile = sendFile, |
| 410 | .flush = std.Io.Writer.noopFlush, | 410 | .flush = Io.Writer.noopFlush, |
| 411 | .rebase = growingRebase, | 411 | .rebase = growingRebase, |
| 412 | }; | 412 | }; |
| 413 | | 413 | |
| 414 | fn drain( | 414 | fn drain( |
| 415 | interface: *std.Io.Writer, | 415 | interface: *Io.Writer, |
| 416 | data: []const []const u8, | 416 | data: []const []const u8, |
| 417 | splat: usize, | 417 | splat: usize, |
| 418 | ) std.Io.Writer.Error!usize { | 418 | ) Io.Writer.Error!usize { |
| 419 | const pattern = data[data.len - 1]; | 419 | const pattern = data[data.len - 1]; |
| 420 | const splat_len = pattern.len * splat; | 420 | const splat_len = pattern.len * splat; |
| 421 | const start_len = interface.end; | 421 | const start_len = interface.end; |
| ... | @@ -442,10 +442,10 @@ pub const Node = extern struct { | ... | @@ -442,10 +442,10 @@ pub const Node = extern struct { |
| 442 | } | 442 | } |
| 443 | | 443 | |
| 444 | fn sendFile( | 444 | fn sendFile( |
| 445 | interface: *std.Io.Writer, | 445 | interface: *Io.Writer, |
| 446 | file_reader: *std.Io.File.Reader, | 446 | file_reader: *Io.File.Reader, |
| 447 | limit: std.Io.Limit, | 447 | limit: Io.Limit, |
| 448 | ) std.Io.Writer.FileError!usize { | 448 | ) Io.Writer.FileError!usize { |
| 449 | if (limit == .nothing) return 0; | 449 | if (limit == .nothing) return 0; |
| 450 | const pos = file_reader.logicalPos(); | 450 | const pos = file_reader.logicalPos(); |
| 451 | const additional = if (file_reader.getSize()) |size| size - pos else |_| std.atomic.cache_line; | 451 | const additional = if (file_reader.getSize()) |size| size - pos else |_| std.atomic.cache_line; |
| ... | @@ -489,10 +489,10 @@ pub const Node = extern struct { | ... | @@ -489,10 +489,10 @@ pub const Node = extern struct { |
| 489 | } | 489 | } |
| 490 | | 490 | |
| 491 | fn growingRebase( | 491 | fn growingRebase( |
| 492 | interface: *std.Io.Writer, | 492 | interface: *Io.Writer, |
| 493 | preserve: usize, | 493 | preserve: usize, |
| 494 | unused_capacity: usize, | 494 | unused_capacity: usize, |
| 495 | ) std.Io.Writer.Error!void { | 495 | ) Io.Writer.Error!void { |
| 496 | _ = preserve; | 496 | _ = preserve; |
| 497 | const total_capacity = interface.end + unused_capacity; | 497 | const total_capacity = interface.end + unused_capacity; |
| 498 | if (interface.buffer.len >= total_capacity) return; | 498 | if (interface.buffer.len >= total_capacity) return; |
| ... | @@ -941,7 +941,7 @@ fn copyRange(mf: *MappedFile, old_file_offset: u64, new_file_offset: u64, size: | ... | @@ -941,7 +941,7 @@ fn copyRange(mf: *MappedFile, old_file_offset: u64, new_file_offset: u64, size: |
| 941 | | 941 | |
| 942 | fn copyFileRange( | 942 | fn copyFileRange( |
| 943 | mf: *MappedFile, | 943 | mf: *MappedFile, |
| 944 | old_file: std.Io.File, | 944 | old_file: Io.File, |
| 945 | old_file_offset: u64, | 945 | old_file_offset: u64, |
| 946 | new_file_offset: u64, | 946 | new_file_offset: u64, |
| 947 | size: u64, | 947 | size: u64, |
Andrew Kelley <andrew@ziglang.org> 2026-01-22 19:06:52-08:00
src