Applied-Software/ghostty
5
0
Fork 0
mirror of https://github.com/ghostty-org/ghostty.git synced 2025-07-16 16:56:09 +03:00
Code Issues Packages Projects Releases Wiki Activity

config: unify some error types for now

Browse Source
This commit is contained in:
Mitchell Hashimoto
2023-09-11 13:55:06 -07:00
parent 6f7fdf002f
commit b7f4c1d707
2 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/cli_args.zig
View File

@ -90,7 +90,7 @@ pub fn parse(comptime T: type, alloc: Allocator, dst: *T, iter: anytype) !void {
error.InvalidField => try dst._errors.add(arena_alloc, .{ error.InvalidField => try dst._errors.add(arena_alloc, .{
.message = try std.fmt.allocPrintZ( .message = try std.fmt.allocPrintZ(
arena_alloc, arena_alloc,
"unknown field: {s}", "{s}: unknown field",
.{key}, .{key},
), ),
}), }),

18
src/config/Config.zig
View File

@ -1145,10 +1145,6 @@ pub const Color = struct {
g: u8, g: u8,
b: u8, b: u8,
pub const Error = error{
InvalidFormat,
};
/// Convert this to the terminal RGB struct /// Convert this to the terminal RGB struct
pub fn toTerminalRGB(self: Color) terminal.color.RGB { pub fn toTerminalRGB(self: Color) terminal.color.RGB {
return .{ .r = self.r, .g = self.g, .b = self.b }; return .{ .r = self.r, .g = self.g, .b = self.b };
@ -1175,7 +1171,7 @@ pub const Color = struct {
const trimmed = if (input.len != 0 and input[0] == '#') input[1..] else input; const trimmed = if (input.len != 0 and input[0] == '#') input[1..] else input;
// We expect exactly 6 for RRGGBB // We expect exactly 6 for RRGGBB
if (trimmed.len != 6) return Error.InvalidFormat; if (trimmed.len != 6) return error.InvalidValue;
// Parse the colors two at a time. // Parse the colors two at a time.
var result: Color = undefined; var result: Color = undefined;
@ -1214,17 +1210,13 @@ pub const Palette = struct {
/// The actual value that is updated as we parse. /// The actual value that is updated as we parse.
value: terminal.color.Palette = terminal.color.default, value: terminal.color.Palette = terminal.color.default,
pub const Error = error{
InvalidFormat,
};
pub fn parseCLI( pub fn parseCLI(
self: *Self, self: *Self,
input: ?[]const u8, input: ?[]const u8,
) !void { ) !void {
const value = input orelse return error.ValueRequired; const value = input orelse return error.ValueRequired;
const eqlIdx = std.mem.indexOf(u8, value, "=") orelse const eqlIdx = std.mem.indexOf(u8, value, "=") orelse
return Error.InvalidFormat; return error.InvalidValue;
const key = try std.fmt.parseInt(u8, value[0..eqlIdx], 10); const key = try std.fmt.parseInt(u8, value[0..eqlIdx], 10);
const rgb = try Color.parseCLI(value[eqlIdx + 1 ..]); const rgb = try Color.parseCLI(value[eqlIdx + 1 ..]);
@ -1326,14 +1318,14 @@ pub const RepeatableFontVariation = struct {
pub fn parseCLI(self: *Self, alloc: Allocator, input_: ?[]const u8) !void { pub fn parseCLI(self: *Self, alloc: Allocator, input_: ?[]const u8) !void {
const input = input_ orelse return error.ValueRequired; const input = input_ orelse return error.ValueRequired;
const eql_idx = std.mem.indexOf(u8, input, "=") orelse return error.InvalidFormat; const eql_idx = std.mem.indexOf(u8, input, "=") orelse return error.InvalidValue;
const whitespace = " \t"; const whitespace = " \t";
const key = std.mem.trim(u8, input[0..eql_idx], whitespace); const key = std.mem.trim(u8, input[0..eql_idx], whitespace);
const value = std.mem.trim(u8, input[eql_idx + 1 ..], whitespace); const value = std.mem.trim(u8, input[eql_idx + 1 ..], whitespace);
if (key.len != 4) return error.InvalidFormat; if (key.len != 4) return error.InvalidValue;
try self.list.append(alloc, .{ try self.list.append(alloc, .{
.id = fontpkg.face.Variation.Id.init(@ptrCast(key.ptr)), .id = fontpkg.face.Variation.Id.init(@ptrCast(key.ptr)),
.value = std.fmt.parseFloat(f64, value) catch return error.InvalidFormat, .value = std.fmt.parseFloat(f64, value) catch return error.InvalidValue,
}); });
} }