authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2026-01-22 19:06:52-08:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2026-01-22 21:25:53-08:00
log193c747b03da8ec7af55cb5fcb53f8f1bee39d5c
tree71940363ea60e16d0f8e98514f809c055849362f
parent1badb2a840c47d49b49fa685db7a1553c0a40ee7

link.MappedFile: refactor std.Io -> Io


1 files changed, 15 insertions(+), 15 deletions(-)

src/link/MappedFile.zig+15-15
......@@ -11,7 +11,7 @@ const linux = std.os.linux;
1111const windows = std.os.windows;
1212
1313io: Io,
14file: std.Io.File,
14file: Io.File,
1515flags: packed struct {
1616 block_size: std.mem.Alignment,
1717 copy_file_range_unsupported: bool,
......@@ -29,7 +29,7 @@ writers: std.SinglyLinkedList,
2929
3030pub const growth_factor = 4;
3131
32pub const Error = std.posix.MMapError || std.posix.MRemapError || Io.File.LengthError || error{
32pub const Error = Io.File.MemoryMap.CreateError || Io.File.LengthError || error{
3333 NotFile,
3434 SystemResources,
3535 IsDir,
......@@ -42,7 +42,7 @@ pub const Error = std.posix.MMapError || std.posix.MRemapError || Io.File.Length
4242 NonResizable,
4343};
4444
45pub fn init(file: std.Io.File, gpa: std.mem.Allocator, io: Io) !MappedFile {
45pub fn init(file: Io.File, gpa: std.mem.Allocator, io: Io) !MappedFile {
4646 var mf: MappedFile = .{
4747 .io = io,
4848 .file = file,
......@@ -396,7 +396,7 @@ pub const Node = extern struct {
396396 mf: *MappedFile,
397397 writer_node: std.SinglyLinkedList.Node,
398398 ni: Node.Index,
399 interface: std.Io.Writer,
399 interface: Io.Writer,
400400 err: ?Error,
401401
402402 pub fn deinit(w: *Writer) void {
......@@ -404,18 +404,18 @@ pub const Node = extern struct {
404404 w.* = undefined;
405405 }
406406
407 const vtable: std.Io.Writer.VTable = .{
407 const vtable: Io.Writer.VTable = .{
408408 .drain = drain,
409409 .sendFile = sendFile,
410 .flush = std.Io.Writer.noopFlush,
410 .flush = Io.Writer.noopFlush,
411411 .rebase = growingRebase,
412412 };
413413
414414 fn drain(
415 interface: *std.Io.Writer,
415 interface: *Io.Writer,
416416 data: []const []const u8,
417417 splat: usize,
418 ) std.Io.Writer.Error!usize {
418 ) Io.Writer.Error!usize {
419419 const pattern = data[data.len - 1];
420420 const splat_len = pattern.len * splat;
421421 const start_len = interface.end;
......@@ -442,10 +442,10 @@ pub const Node = extern struct {
442442 }
443443
444444 fn sendFile(
445 interface: *std.Io.Writer,
446 file_reader: *std.Io.File.Reader,
447 limit: std.Io.Limit,
448 ) std.Io.Writer.FileError!usize {
445 interface: *Io.Writer,
446 file_reader: *Io.File.Reader,
447 limit: Io.Limit,
448 ) Io.Writer.FileError!usize {
449449 if (limit == .nothing) return 0;
450450 const pos = file_reader.logicalPos();
451451 const additional = if (file_reader.getSize()) |size| size - pos else |_| std.atomic.cache_line;
......@@ -489,10 +489,10 @@ pub const Node = extern struct {
489489 }
490490
491491 fn growingRebase(
492 interface: *std.Io.Writer,
492 interface: *Io.Writer,
493493 preserve: usize,
494494 unused_capacity: usize,
495 ) std.Io.Writer.Error!void {
495 ) Io.Writer.Error!void {
496496 _ = preserve;
497497 const total_capacity = interface.end + unused_capacity;
498498 if (interface.buffer.len >= total_capacity) return;
......@@ -941,7 +941,7 @@ fn copyRange(mf: *MappedFile, old_file_offset: u64, new_file_offset: u64, size:
941941
942942fn copyFileRange(
943943 mf: *MappedFile,
944 old_file: std.Io.File,
944 old_file: Io.File,
945945 old_file_offset: u64,
946946 new_file_offset: u64,
947947 size: u64,