From d5d5f7f06397d73f497d352f2f38b1a53d932b0d Mon Sep 17 00:00:00 2001
From: Uko Kokņevičs
Date: Mon, 19 Feb 2024 23:38:33 +0200
Subject: Big update to modern zig

---
 src/KeyReader.zig | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

(limited to 'src/KeyReader.zig')

diff --git a/src/KeyReader.zig b/src/KeyReader.zig
index 2265975..28e6dcb 100644
--- a/src/KeyReader.zig
+++ b/src/KeyReader.zig
@@ -83,7 +83,7 @@ fn readByte(reader: File.Reader) Error!?u8 {
     return reader.readByte() catch |err| switch (err) {
         error.WouldBlock => null,
         error.EndOfStream => null,
-        else => return @errSetCast(File.Reader.Error, err),
+        else => return @as(Error, @errorCast(err)),
     };
 }
 
@@ -135,7 +135,7 @@ fn readControlSequence(self: *KeyReader, reader: File.Reader) !Key {
                     if (parameter_list.len == 0) {
                         return key;
                     } else if (parameter_list.len == 1) {
-                        var count = std.math.max(1, parameter_list[0]) - 1;
+                        var count = @max(1, parameter_list[0]) - 1;
                         try self.key_buf.ensureUnusedCapacity(count);
                         while (count > 0) : (count -= 1) {
                             self.key_buf.appendAssumeCapacity(key);
@@ -143,7 +143,7 @@ fn readControlSequence(self: *KeyReader, reader: File.Reader) !Key {
 
                         return key;
                     } else if (parameter_list.len == 2) {
-                        var count = std.math.max(1, parameter_list[0]) - 1;
+                        var count = @max(1, parameter_list[0]) - 1;
                         if (modKey(key, parameter_list[1])) |mod_key| {
                             try self.key_buf.ensureUnusedCapacity(count);
                             while (count > 0) : (count -= 1) {
@@ -159,7 +159,7 @@ fn readControlSequence(self: *KeyReader, reader: File.Reader) !Key {
 
         std.log.err(
             "Unknown terminal sequence '^[[{s}{s}{c}'",
-            .{parameters.items, intermediates.items, final},
+            .{ parameters.items, intermediates.items, final },
         );
 
         try self.key_buf.ensureUnusedCapacity(parameters.items.len + intermediates.items.len + 1);
@@ -169,7 +169,7 @@ fn readControlSequence(self: *KeyReader, reader: File.Reader) !Key {
     } else {
         std.log.err(
             "Unknown terminal sequence '^[[{s}{s}'",
-            .{parameters.items, intermediates.items},
+            .{ parameters.items, intermediates.items },
         );
     }
 
@@ -212,11 +212,13 @@ fn splitParameters(allocator: Allocator, parameters_string: []const u8) Allocato
                 usize,
                 parameter_string,
                 10,
-            ) catch { return null; };
+            ) catch {
+                return null;
+            };
 
             try parameters.append(parameter);
         }
     }
 
-    return parameters.toOwnedSlice();
+    return try parameters.toOwnedSlice();
 }
-- 
cgit v1.2.3