de: Update visitors to return errors instead of panicking

getty-zig · Oct 1, 2021 · ffa8360 · ffa8360
1 parent 9493fe4
commit ffa8360
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 9 deletions.
diff --git a/src/de.zig b/src/de.zig
@@ -1,7 +1,7 @@
 const Allocator = @import("std").mem.Allocator;
 
 pub const de = struct {
-    pub const Error = error{
+    pub const Error = Allocator.Error || error{
         Unsupported,
 
         DuplicateField,

diff --git a/src/de/impl/visitor/array.zig b/src/de/impl/visitor/array.zig
@@ -35,7 +35,7 @@ pub fn Visitor(comptime Value: type) type {
             }
 
             if (try sequenceAccess.nextElement(Child)) |_| {
-                @panic("expected end of sequence, found element");
+                return error.InvalidLength;
             }
 
             return seq;

diff --git a/src/de/impl/visitor/enum.zig b/src/de/impl/visitor/enum.zig
@@ -41,7 +41,7 @@ pub fn Visitor(comptime T: type) type {
         fn visitSlice(self: *Self, comptime Error: type, input: anytype) Error!Value {
             _ = self;
 
-            return meta.stringToEnum(Value, input) orelse @panic("could not find enum value");
+            return meta.stringToEnum(Value, input) orelse return error.UnknownVariant;
         }
     };
 }
diff --git a/src/de/impl/visitor/int.zig b/src/de/impl/visitor/int.zig
@@ -27,7 +27,7 @@ pub fn Visitor(comptime T: type) type {
 
         fn visitFloat(_: *Self, comptime Error: type, input: anytype) Error!Value {
             if (math.round(input) != input or (input > math.maxInt(T) or input < math.minInt(T))) {
-                @panic("Failure during float-to-int cast");
+                return error.InvalidValue;
             }
 
             return @floatToInt(T, input);

diff --git a/src/de/impl/visitor/slice.zig b/src/de/impl/visitor/slice.zig
@@ -30,15 +30,14 @@ pub fn Visitor(comptime T: type) type {
             errdefer list.deinit();
 
             while (try seqAccess.nextElement(std.meta.Child(Value))) |elem| {
-                // TODO: change unreachable
-                list.append(elem) catch unreachable;
+                try list.append(elem);
             }
 
             return list.toOwnedSlice();
         }
 
         fn visitSlice(self: *Self, comptime Error: type, input: anytype) Error!Value {
-            return self.allocator.dupe(std.meta.Child(Value), input) catch unreachable;
+            return try self.allocator.dupe(std.meta.Child(Value), input);
         }
     };
 }
diff --git a/src/de/impl/visitor/struct.zig b/src/de/impl/visitor/struct.zig
@@ -30,15 +30,15 @@ pub fn Visitor(comptime Value: type) type {
             inline for (std.meta.fields(Value)) |field| {
                 if (try mapAccess.nextKey([]const u8)) |key| {
                     if (!std.mem.eql(u8, field.name, key)) {
-                        @panic("incorrect key");
+                        return error.MissingField;
                     }
 
                     @field(map, field.name) = try mapAccess.nextValue(field.field_type);
                 }
             }
 
             if (try mapAccess.nextKey([]const u8)) |_| {
-                @panic("expected end of map, found key");
+                return error.UnknownField;
             }
 
             return map;