update to zig 0.16.0

Author: joachimschmidt557

README.md

@@ -11,7 +11,7 @@ This was originally code which was extracted from
 [lscolors](https://github.com/ziglibs/lscolors) for use in
 other zig libraries. More features have been added since.
 
-`ansi_term` is designed to work with Zig 0.15.2.
+`ansi_term` is designed to work with Zig 0.16.0.
 
 ## Documentation
 

src/clear.zig

@@ -1,26 +1,29 @@
+const std = @import("std");
+const Io = std.Io;
+
 const esc = "\x1B";
 const csi = esc ++ "[";
 
-pub fn clearCurrentLine(writer: anytype) !void {
+pub fn clearCurrentLine(writer: *Io.Writer) !void {
     try writer.writeAll(csi ++ "2K");
 }
 
-pub fn clearFromCursorToLineBeginning(writer: anytype) !void {
+pub fn clearFromCursorToLineBeginning(writer: *Io.Writer) !void {
     try writer.writeAll(csi ++ "1K");
 }
 
-pub fn clearFromCursorToLineEnd(writer: anytype) !void {
+pub fn clearFromCursorToLineEnd(writer: *Io.Writer) !void {
     try writer.writeAll(csi ++ "K");
 }
 
-pub fn clearScreen(writer: anytype) !void {
+pub fn clearScreen(writer: *Io.Writer) !void {
     try writer.writeAll(csi ++ "2J");
 }
 
-pub fn clearFromCursorToScreenBeginning(writer: anytype) !void {
+pub fn clearFromCursorToScreenBeginning(writer: *Io.Writer) !void {
     try writer.writeAll(csi ++ "1J");
 }
 
-pub fn clearFromCursorToScreenEnd(writer: anytype) !void {
+pub fn clearFromCursorToScreenEnd(writer: *Io.Writer) !void {
     try writer.writeAll(csi ++ "J");
 }

src/cursor.zig

@@ -1,6 +1,6 @@
 const std = @import("std");
 const testing = std.testing;
-const fixedBufferStream = std.io.fixedBufferStream;
+const Io = std.Io;
 const esc = "\x1B";
 const csi = esc ++ "[";
 
@@ -13,91 +13,91 @@ pub const CursorMode = enum(u8) {
     I_beam,
 };
 
-pub fn setCursorMode(writer: anytype, mode: CursorMode) !void {
+pub fn setCursorMode(writer: *Io.Writer, mode: CursorMode) Io.Writer.Error!void {
     const modeNumber = @intFromEnum(mode);
     try writer.print(csi ++ "{d} q", .{modeNumber});
 }
 
-pub fn hideCursor(writer: anytype) !void {
+pub fn hideCursor(writer: *Io.Writer) Io.Writer.Error!void {
     try writer.writeAll(csi ++ "?25l");
 }
 
-pub fn showCursor(writer: anytype) !void {
+pub fn showCursor(writer: *Io.Writer) Io.Writer.Error!void {
     try writer.writeAll(csi ++ "?25h");
 }
 
-pub fn saveCursor(writer: anytype) !void {
+pub fn saveCursor(writer: *Io.Writer) Io.Writer.Error!void {
     try writer.writeAll(csi ++ "s");
 }
 
-pub fn restoreCursor(writer: anytype) !void {
+pub fn restoreCursor(writer: *Io.Writer) Io.Writer.Error!void {
     try writer.writeAll(csi ++ "u");
 }
 
-pub fn setCursor(writer: anytype, x: usize, y: usize) !void {
+pub fn setCursor(writer: *Io.Writer, x: usize, y: usize) Io.Writer.Error!void {
     try writer.print(csi ++ "{};{}H", .{ y + 1, x + 1 });
 }
 
-pub fn setCursorRow(writer: anytype, row: usize) !void {
+pub fn setCursorRow(writer: *Io.Writer, row: usize) Io.Writer.Error!void {
     try writer.print(csi ++ "{}H", .{row + 1});
 }
 
-pub fn setCursorColumn(writer: anytype, column: usize) !void {
+pub fn setCursorColumn(writer: *Io.Writer, column: usize) Io.Writer.Error!void {
     try writer.print(csi ++ "{}G", .{column + 1});
 }
 
-pub fn cursorUp(writer: anytype, lines: usize) !void {
+pub fn cursorUp(writer: *Io.Writer, lines: usize) Io.Writer.Error!void {
     try writer.print(csi ++ "{}A", .{lines});
 }
 
-pub fn cursorDown(writer: anytype, lines: usize) !void {
+pub fn cursorDown(writer: *Io.Writer, lines: usize) Io.Writer.Error!void {
     try writer.print(csi ++ "{}B", .{lines});
 }
 
-pub fn cursorForward(writer: anytype, columns: usize) !void {
+pub fn cursorForward(writer: *Io.Writer, columns: usize) Io.Writer.Error!void {
     try writer.print(csi ++ "{}C", .{columns});
 }
 
-pub fn cursorBackward(writer: anytype, columns: usize) !void {
+pub fn cursorBackward(writer: *Io.Writer, columns: usize) Io.Writer.Error!void {
     try writer.print(csi ++ "{}D", .{columns});
 }
 
-pub fn cursorNextLine(writer: anytype, lines: usize) !void {
+pub fn cursorNextLine(writer: *Io.Writer, lines: usize) Io.Writer.Error!void {
     try writer.print(csi ++ "{}E", .{lines});
 }
 
-pub fn cursorPreviousLine(writer: anytype, lines: usize) !void {
+pub fn cursorPreviousLine(writer: *Io.Writer, lines: usize) Io.Writer.Error!void {
     try writer.print(csi ++ "{}F", .{lines});
 }
 
-pub fn scrollUp(writer: anytype, lines: usize) !void {
+pub fn scrollUp(writer: *Io.Writer, lines: usize) Io.Writer.Error!void {
     try writer.print(csi ++ "{}S", .{lines});
 }
 
-pub fn scrollDown(writer: anytype, lines: usize) !void {
+pub fn scrollDown(writer: *Io.Writer, lines: usize) Io.Writer.Error!void {
     try writer.print(csi ++ "{}T", .{lines});
 }
 
 test "test cursor mode BLINKING_UNDERSCORE" {
     var buf: [1024]u8 = undefined;
-    var fixed_buf_stream = fixedBufferStream(&buf);
+    var fixed_writer: Io.Writer = .fixed(&buf);
 
-    try setCursorMode(fixed_buf_stream.writer(), .blinking_underscore);
+    try setCursorMode(&fixed_writer, .blinking_underscore);
     // the space is needed
     const expected = csi ++ "3 q";
-    const actual = fixed_buf_stream.getWritten();
+    const actual = fixed_writer.buffered();
 
     try testing.expectEqualSlices(u8, expected, actual);
 }
 
 test "test cursor mode BLINKING_I_BEAM" {
     var buf: [1024]u8 = undefined;
-    var fixed_buf_stream = fixedBufferStream(&buf);
+    var fixed_writer: Io.Writer = .fixed(&buf);
 
-    try setCursorMode(fixed_buf_stream.writer(), .blinking_I_beam);
+    try setCursorMode(&fixed_writer, .blinking_I_beam);
     // the space is needed
     const expected = csi ++ "5 q";
-    const actual = fixed_buf_stream.getWritten();
+    const actual = fixed_writer.buffered();
 
     try testing.expectEqualSlices(u8, expected, actual);
 }