remove shortcut FontStyles

they were duplicates with the field names in the FontStyle struct,
which is not really clean. Besides, I think it's ok to write

.{ .bold = true }

instead for example.

Author: joachimschmidt557

src/format.zig

@@ -159,7 +159,7 @@ test "reset to default, old non-null" {
     var fixed_buf_stream = fixedBufferStream(&buf);
 
     try updateStyle(fixed_buf_stream.writer(), Style{}, Style{
-        .font_style = FontStyle.bold,
+        .font_style = .{ .bold = true },
     });
 
     const expected = "\x1B[0m";
@@ -173,7 +173,7 @@ test "bold style" {
     var fixed_buf_stream = fixedBufferStream(&buf);
 
     try updateStyle(fixed_buf_stream.writer(), Style{
-        .font_style = FontStyle.bold,
+        .font_style = .{ .bold = true },
     }, Style{});
 
     const expected = "\x1B[1m";
@@ -187,9 +187,9 @@ test "add bold style" {
     var fixed_buf_stream = fixedBufferStream(&buf);
 
     try updateStyle(fixed_buf_stream.writer(), Style{
-        .font_style = FontStyle{ .bold = true, .italic = true },
+        .font_style = .{ .bold = true, .italic = true },
     }, Style{
-        .font_style = FontStyle.italic,
+        .font_style = .{ .italic = true },
     });
 
     const expected = "\x1B[1m";
@@ -203,9 +203,9 @@ test "reset required font style" {
     var fixed_buf_stream = fixedBufferStream(&buf);
 
     try updateStyle(fixed_buf_stream.writer(), Style{
-        .font_style = FontStyle.bold,
+        .font_style = .{ .bold = true },
     }, Style{
-        .font_style = FontStyle{ .bold = true, .underline = true },
+        .font_style = .{ .bold = true, .underline = true },
     });
 
     const expected = "\x1B[0m\x1B[1m";

src/parse_style.zig

@@ -36,7 +36,7 @@ pub fn parseStyle(code: []const u8) ?Style {
     var red: u8 = 0;
     var green: u8 = 0;
 
-    var iter = std.mem.split(u8, code, ";");
+    var iter = std.mem.splitScalar(u8, code, ';');
     while (iter.next()) |str| {
         const part = std.fmt.parseInt(u8, str, 10) catch return null;
 
@@ -164,7 +164,7 @@ test "parse empty style" {
 test "parse bold style" {
     const actual = parseStyle("01");
     const expected = Style{
-        .font_style = FontStyle.bold,
+        .font_style = .{ .bold = true },
     };
 
     try expectEqual(@as(?Style, expected), actual);
@@ -175,7 +175,7 @@ test "parse yellow style" {
     const expected = Style{
         .foreground = Color.Yellow,
 
-        .font_style = FontStyle{},
+        .font_style = .{},
     };
 
     try expectEqual(@as(?Style, expected), actual);
@@ -186,7 +186,7 @@ test "parse some fixed color" {
     const expected = Style{
         .foreground = Color{ .Fixed = 220 },
 
-        .font_style = FontStyle.bold,
+        .font_style = .{ .bold = true },
     };
 
     try expectEqual(@as(?Style, expected), actual);
@@ -197,7 +197,7 @@ test "parse some rgb color" {
     const expected = Style{
         .foreground = Color{ .RGB = .{ .r = 123, .g = 123, .b = 123 } },
 
-        .font_style = FontStyle.bold,
+        .font_style = .{ .bold = true },
     };
 
     try expectEqual(@as(?Style, expected), actual);

src/style.zig

@@ -51,50 +51,6 @@ pub const FontStyle = packed struct {
 
     const Self = @This();
 
-    pub const bold = Self{
-        .bold = true,
-    };
-
-    pub const dim = Self{
-        .dim = true,
-    };
-
-    pub const italic = Self{
-        .italic = true,
-    };
-
-    pub const underline = Self{
-        .underline = true,
-    };
-
-    pub const slowblink = Self{
-        .slowblink = true,
-    };
-
-    pub const rapidblink = Self{
-        .rapidblink = true,
-    };
-
-    pub const reverse = Self{
-        .reverse = true,
-    };
-
-    pub const hidden = Self{
-        .hidden = true,
-    };
-
-    pub const crossedout = Self{
-        .crossedout = true,
-    };
-
-    pub const fraktur = Self{
-        .fraktur = true,
-    };
-
-    pub const overline = Self{
-        .overline = true,
-    };
-
     pub fn toU11(self: Self) u11 {
         return @bitCast(self);
     }
@@ -130,17 +86,17 @@ pub const FontStyle = packed struct {
 
 test "FontStyle bits" {
     try expectEqual(@as(u11, 0), (FontStyle{}).toU11());
-    try expectEqual(@as(u11, 1), (FontStyle.bold).toU11());
-    try expectEqual(@as(u11, 1 << 2), (FontStyle.italic).toU11());
+    try expectEqual(@as(u11, 1), (FontStyle{ .bold = true }).toU11());
+    try expectEqual(@as(u11, 1 << 2), (FontStyle{ .italic = true }).toU11());
     try expectEqual(@as(u11, 1 << 2) | 1, (FontStyle{ .bold = true, .italic = true }).toU11());
     try expectEqual(FontStyle{}, FontStyle.fromU11((FontStyle{}).toU11()));
-    try expectEqual(FontStyle.bold, FontStyle.fromU11((FontStyle.bold).toU11()));
+    try expectEqual(FontStyle{ .bold = true }, FontStyle.fromU11((FontStyle{ .bold = true }).toU11()));
 }
 
 test "FontStyle subsetOf" {
     const default = FontStyle{};
-    const bold = FontStyle.bold;
-    const italic = FontStyle.italic;
+    const bold = FontStyle{ .bold = true };
+    const italic = FontStyle{ .italic = true };
     const bold_and_italic = FontStyle{ .bold = true, .italic = true };
 
     try expect(default.subsetOf(default));
@@ -159,8 +115,8 @@ test "FontStyle subsetOf" {
 
 test "FontStyle without" {
     const default = FontStyle{};
-    const bold = FontStyle.bold;
-    const italic = FontStyle.italic;
+    const bold = FontStyle{ .bold = true };
+    const italic = FontStyle{ .italic = true };
     const bold_and_italic = FontStyle{ .bold = true, .italic = true };
 
     try expectEqual(default, default.without(default));
@@ -202,10 +158,10 @@ pub const Style = struct {
 test "style equality" {
     const a = Style{};
     const b = Style{
-        .font_style = FontStyle.bold,
+        .font_style = .{ .bold = true },
     };
     const c = Style{
-        .foreground = Color.Red,
+        .foreground = .Red,
     };
 
     try expect(a.isDefault());