Merge pull request 'GraphemeData and WidthData: make init read errors unreachable and define return errorset' (#16) from rockorager/zg:master into master

Reviewed-on: https://codeberg.org/dude_the_builder/zg/pulls/16

2 files changed, 12 insertions, 12 deletions

diff --git a/src/GraphemeData.zig b/src/GraphemeData.zig
index 0ed79f2..de98bde 100644
--- a/src/GraphemeData.zig
+++ b/src/GraphemeData.zig
@@ -37,7 +37,7 @@ s3: []u8 = undefined,
 
 const Self = @This();
 
-pub fn init(allocator: mem.Allocator) !Self {
+pub fn init(allocator: mem.Allocator) mem.Allocator.Error!Self {
     const decompressor = compress.flate.inflate.decompressor;
     const in_bytes = @embedFile("gbp");
     var in_fbs = std.io.fixedBufferStream(in_bytes);
@@ -48,20 +48,20 @@ pub fn init(allocator: mem.Allocator) !Self {
 
     var self = Self{ .allocator = allocator };
 
-    const s1_len: u16 = try reader.readInt(u16, endian);
+    const s1_len: u16 = reader.readInt(u16, endian) catch unreachable;
     self.s1 = try allocator.alloc(u16, s1_len);
     errdefer allocator.free(self.s1);
-    for (0..s1_len) |i| self.s1[i] = try reader.readInt(u16, endian);
+    for (0..s1_len) |i| self.s1[i] = reader.readInt(u16, endian) catch unreachable;
 
-    const s2_len: u16 = try reader.readInt(u16, endian);
+    const s2_len: u16 = reader.readInt(u16, endian) catch unreachable;
     self.s2 = try allocator.alloc(u16, s2_len);
     errdefer allocator.free(self.s2);
-    for (0..s2_len) |i| self.s2[i] = try reader.readInt(u16, endian);
+    for (0..s2_len) |i| self.s2[i] = reader.readInt(u16, endian) catch unreachable;
 
-    const s3_len: u16 = try reader.readInt(u16, endian);
+    const s3_len: u16 = reader.readInt(u16, endian) catch unreachable;
     self.s3 = try allocator.alloc(u8, s3_len);
     errdefer allocator.free(self.s3);
-    _ = try reader.readAll(self.s3);
+    _ = reader.readAll(self.s3) catch unreachable;
 
     return self;
 }
diff --git a/src/WidthData.zig b/src/WidthData.zig
index 1f1ae6f..1b7fb2e 100644
--- a/src/WidthData.zig
+++ b/src/WidthData.zig
@@ -13,7 +13,7 @@ s2: []i3 = undefined,
 
 const Self = @This();
 
-pub fn init(allocator: mem.Allocator) !Self {
+pub fn init(allocator: mem.Allocator) mem.Allocator.Error!Self {
     const decompressor = compress.flate.inflate.decompressor;
     const in_bytes = @embedFile("dwp");
     var in_fbs = std.io.fixedBufferStream(in_bytes);
@@ -28,15 +28,15 @@ pub fn init(allocator: mem.Allocator) !Self {
     };
     errdefer self.g_data.deinit();
 
-    const stage_1_len: u16 = try reader.readInt(u16, endian);
+    const stage_1_len: u16 = reader.readInt(u16, endian) catch unreachable;
     self.s1 = try allocator.alloc(u16, stage_1_len);
     errdefer allocator.free(self.s1);
-    for (0..stage_1_len) |i| self.s1[i] = try reader.readInt(u16, endian);
+    for (0..stage_1_len) |i| self.s1[i] = reader.readInt(u16, endian) catch unreachable;
 
-    const stage_2_len: u16 = try reader.readInt(u16, endian);
+    const stage_2_len: u16 = reader.readInt(u16, endian) catch unreachable;
     self.s2 = try allocator.alloc(i3, stage_2_len);
     errdefer allocator.free(self.s2);
-    for (0..stage_2_len) |i| self.s2[i] = @intCast(try reader.readInt(i8, endian));
+    for (0..stage_2_len) |i| self.s2[i] = @intCast(reader.readInt(i8, endian) catch unreachable);
 
     return self;
 }