From 80a36a9947164557a0d57496506d3dc534ff404c Mon Sep 17 00:00:00 2001 From: Yves Biener Date: Mon, 26 May 2025 14:23:18 +0200 Subject: [PATCH] refactor: zigify imports and usages --- examples/demo.zig | 3 ++- examples/elements/button.zig | 5 +++-- examples/elements/input.zig | 7 ++++--- examples/elements/scrollable.zig | 5 +++-- examples/errors.zig | 7 ++++--- examples/layouts/grid.zig | 3 ++- examples/layouts/horizontal.zig | 3 ++- examples/layouts/mixed.zig | 3 ++- examples/layouts/vertical.zig | 3 ++- examples/styles/palette.zig | 3 ++- examples/styles/text.zig | 5 +++-- src/element.zig | 2 +- src/testing.zig | 5 +++-- 13 files changed, 33 insertions(+), 21 deletions(-) diff --git a/examples/demo.zig b/examples/demo.zig index 1f0725a..7bb18e8 100644 --- a/examples/demo.zig +++ b/examples/demo.zig @@ -7,7 +7,7 @@ const QuitText = struct { pub fn content(ctx: *anyopaque, cells: []zterm.Cell, size: zterm.Point) !void { _ = ctx; - std.debug.assert(cells.len == @as(usize, size.x) * @as(usize, size.y)); + assert(cells.len == @as(usize, size.x) * @as(usize, size.y)); const y = 2; const x = size.x / 2 -| (text.len / 2); @@ -191,6 +191,7 @@ pub fn main() !void { const log = std.log.scoped(.default); const std = @import("std"); +const assert = std.debug.assert; const zterm = @import("zterm"); const input = zterm.input; const App = zterm.App(union(enum) {}); diff --git a/examples/elements/button.zig b/examples/elements/button.zig index b4ad5a3..9a80804 100644 --- a/examples/elements/button.zig +++ b/examples/elements/button.zig @@ -7,7 +7,7 @@ const QuitText = struct { fn content(ctx: *anyopaque, cells: []zterm.Cell, size: zterm.Point) !void { _ = ctx; - std.debug.assert(cells.len == @as(usize, size.x) * @as(usize, size.y)); + assert(cells.len == @as(usize, size.x) * @as(usize, size.y)); const row = 2; const col = size.x / 2 -| (text.len / 2); @@ -57,7 +57,7 @@ const Clickable = struct { fn content(ctx: *anyopaque, cells: []zterm.Cell, size: zterm.Point) !void { const this: *@This() = @ptrCast(@alignCast(ctx)); - std.debug.assert(cells.len == @as(usize, size.x) * @as(usize, size.y)); + assert(cells.len == @as(usize, size.x) * @as(usize, size.y)); const row = size.y / 2 -| (text.len / 2); const col = size.x / 2 -| (text.len / 2); @@ -140,6 +140,7 @@ pub fn main() !void { const log = std.log.scoped(.default); const std = @import("std"); +const assert = std.debug.assert; const zterm = @import("zterm"); const App = zterm.App(union(enum) { click: [:0]const u8, diff --git a/examples/elements/input.zig b/examples/elements/input.zig index 714652c..d714154 100644 --- a/examples/elements/input.zig +++ b/examples/elements/input.zig @@ -7,7 +7,7 @@ const QuitText = struct { fn content(ctx: *anyopaque, cells: []zterm.Cell, size: zterm.Point) !void { _ = ctx; - std.debug.assert(cells.len == @as(usize, size.x) * @as(usize, size.y)); + assert(cells.len == @as(usize, size.x) * @as(usize, size.y)); const row = 2; const col = size.x / 2 -| (text.len / 2); @@ -67,7 +67,7 @@ const InputField = struct { fn content(ctx: *anyopaque, cells: []zterm.Cell, size: zterm.Point) !void { const this: *@This() = @ptrCast(@alignCast(ctx)); - std.debug.assert(cells.len == @as(usize, size.x) * @as(usize, size.y)); + assert(cells.len == @as(usize, size.x) * @as(usize, size.y)); if (this.input.items.len == 0) return; @@ -110,7 +110,7 @@ const MouseDraw = struct { } fn content(ctx: *anyopaque, cells: []zterm.Cell, size: zterm.Point) !void { - std.debug.assert(cells.len == @as(usize, size.x) * @as(usize, size.y)); + assert(cells.len == @as(usize, size.x) * @as(usize, size.y)); const this: *@This() = @ptrCast(@alignCast(ctx)); if (this.position) |pos| { @@ -220,6 +220,7 @@ pub fn main() !void { const log = std.log.scoped(.default); const std = @import("std"); +const assert = std.debug.assert; const zterm = @import("zterm"); const App = zterm.App(union(enum) { accept: []u21, diff --git a/examples/elements/scrollable.zig b/examples/elements/scrollable.zig index f73b89b..dfd6a00 100644 --- a/examples/elements/scrollable.zig +++ b/examples/elements/scrollable.zig @@ -7,7 +7,7 @@ const QuitText = struct { fn content(ctx: *anyopaque, cells: []zterm.Cell, size: zterm.Point) !void { _ = ctx; - std.debug.assert(cells.len == @as(usize, size.x) * @as(usize, size.y)); + assert(cells.len == @as(usize, size.x) * @as(usize, size.y)); const row = 2; const col = size.x / 2 -| (text.len / 2); @@ -36,7 +36,7 @@ const HelloWorldText = packed struct { fn content(ctx: *anyopaque, cells: []zterm.Cell, size: zterm.Point) !void { _ = ctx; - std.debug.assert(cells.len == @as(usize, size.x) * @as(usize, size.y)); + assert(cells.len == @as(usize, size.x) * @as(usize, size.y)); const row = size.y / 2; const col = size.x / 2 -| (text.len / 2); @@ -192,6 +192,7 @@ pub fn main() !void { const log = std.log.scoped(.default); const std = @import("std"); +const assert = std.debug.assert; const zterm = @import("zterm"); const input = zterm.input; const App = zterm.App(union(enum) {}); diff --git a/examples/errors.zig b/examples/errors.zig index b2dd1c5..08c7cff 100644 --- a/examples/errors.zig +++ b/examples/errors.zig @@ -7,7 +7,7 @@ const QuitText = struct { fn content(ctx: *anyopaque, cells: []zterm.Cell, size: zterm.Point) !void { _ = ctx; - std.debug.assert(cells.len == @as(usize, size.x) * @as(usize, size.y)); + assert(cells.len == @as(usize, size.x) * @as(usize, size.y)); const row = 2; const col = size.x / 2 -| (text.len / 2); @@ -33,7 +33,7 @@ const InfoText = struct { fn content(ctx: *anyopaque, cells: []zterm.Cell, size: zterm.Point) !void { _ = ctx; - std.debug.assert(cells.len == @as(usize, size.x) * @as(usize, size.y)); + assert(cells.len == @as(usize, size.x) * @as(usize, size.y)); const row = 2; const col = size.x / 2 -| (text.len / 2); @@ -68,7 +68,7 @@ const ErrorNotification = struct { fn content(ctx: *anyopaque, cells: []zterm.Cell, size: zterm.Point) !void { const this: *@This() = @ptrCast(@alignCast(ctx)); - std.debug.assert(cells.len == @as(usize, size.x) * @as(usize, size.y)); + assert(cells.len == @as(usize, size.x) * @as(usize, size.y)); if (this.msg) |msg| { const row = size.y -| 2; @@ -153,5 +153,6 @@ pub fn main() !void { const log = std.log.scoped(.default); const std = @import("std"); +const assert = std.debug.assert; const zterm = @import("zterm"); const App = zterm.App(union(enum) {}); diff --git a/examples/layouts/grid.zig b/examples/layouts/grid.zig index e8e9505..d98bc42 100644 --- a/examples/layouts/grid.zig +++ b/examples/layouts/grid.zig @@ -10,7 +10,7 @@ const QuitText = struct { fn content(ctx: *anyopaque, cells: []zterm.Cell, size: zterm.Point) !void { _ = ctx; - std.debug.assert(cells.len == @as(usize, size.x) * @as(usize, size.y)); + assert(cells.len == @as(usize, size.x) * @as(usize, size.y)); const row = 2; const col = size.x / 2 -| (text.len / 2); @@ -109,5 +109,6 @@ pub fn main() !void { const log = std.log.scoped(.default); const std = @import("std"); +const assert = std.debug.assert; const zterm = @import("zterm"); const App = zterm.App(union(enum) {}); diff --git a/examples/layouts/horizontal.zig b/examples/layouts/horizontal.zig index 648daea..7a4d3da 100644 --- a/examples/layouts/horizontal.zig +++ b/examples/layouts/horizontal.zig @@ -10,7 +10,7 @@ const QuitText = struct { fn content(ctx: *anyopaque, cells: []zterm.Cell, size: zterm.Point) !void { _ = ctx; - std.debug.assert(cells.len == @as(usize, size.x) * @as(usize, size.y)); + assert(cells.len == @as(usize, size.x) * @as(usize, size.y)); const row = 2; const col = size.x / 2 -| (text.len / 2); @@ -101,5 +101,6 @@ pub fn main() !void { const log = std.log.scoped(.default); const std = @import("std"); +const assert = std.debug.assert; const zterm = @import("zterm"); const App = zterm.App(union(enum) {}); diff --git a/examples/layouts/mixed.zig b/examples/layouts/mixed.zig index 3f1f7dc..62e66c1 100644 --- a/examples/layouts/mixed.zig +++ b/examples/layouts/mixed.zig @@ -10,7 +10,7 @@ const QuitText = struct { fn content(ctx: *anyopaque, cells: []zterm.Cell, size: zterm.Point) !void { _ = ctx; - std.debug.assert(cells.len == @as(usize, size.x) * @as(usize, size.y)); + assert(cells.len == @as(usize, size.x) * @as(usize, size.y)); const row = 2; const col = size.x / 2 -| (text.len / 2); @@ -117,5 +117,6 @@ pub fn main() !void { const log = std.log.scoped(.default); const std = @import("std"); +const assert = std.debug.assert; const zterm = @import("zterm"); const App = zterm.App(union(enum) {}); diff --git a/examples/layouts/vertical.zig b/examples/layouts/vertical.zig index d7df6a5..648c2fe 100644 --- a/examples/layouts/vertical.zig +++ b/examples/layouts/vertical.zig @@ -10,7 +10,7 @@ const QuitText = struct { fn content(ctx: *anyopaque, cells: []zterm.Cell, size: zterm.Point) !void { _ = ctx; - std.debug.assert(cells.len == @as(usize, size.x) * @as(usize, size.y)); + assert(cells.len == @as(usize, size.x) * @as(usize, size.y)); const row = 2; const col = size.x / 2 -| (text.len / 2); @@ -100,5 +100,6 @@ pub fn main() !void { const log = std.log.scoped(.default); const std = @import("std"); +const assert = std.debug.assert; const zterm = @import("zterm"); const App = zterm.App(union(enum) {}); diff --git a/examples/styles/palette.zig b/examples/styles/palette.zig index ffa9eb7..c39aecd 100644 --- a/examples/styles/palette.zig +++ b/examples/styles/palette.zig @@ -7,7 +7,7 @@ const QuitText = struct { fn content(ctx: *anyopaque, cells: []zterm.Cell, size: zterm.Point) !void { _ = ctx; - std.debug.assert(cells.len == @as(usize, size.x) * @as(usize, size.y)); + assert(cells.len == @as(usize, size.x) * @as(usize, size.y)); const row = 2; const col = size.x / 2 -| (text.len / 2); @@ -96,5 +96,6 @@ pub fn main() !void { const log = std.log.scoped(.default); const std = @import("std"); +const assert = std.debug.assert; const zterm = @import("zterm"); const App = zterm.App(union(enum) {}); diff --git a/examples/styles/text.zig b/examples/styles/text.zig index ac5f46c..3e0a7a6 100644 --- a/examples/styles/text.zig +++ b/examples/styles/text.zig @@ -7,7 +7,7 @@ const QuitText = struct { fn content(ctx: *anyopaque, cells: []zterm.Cell, size: zterm.Point) !void { _ = ctx; - std.debug.assert(cells.len == @as(usize, size.x) * @as(usize, size.y)); + assert(cells.len == @as(usize, size.x) * @as(usize, size.y)); const row = 2; const col = size.x / 2 -| (text.len / 2); @@ -34,7 +34,7 @@ const TextStyles = struct { fn content(ctx: *anyopaque, cells: []zterm.Cell, size: zterm.Point) !void { @setEvalBranchQuota(50000); _ = ctx; - std.debug.assert(cells.len == @as(usize, size.x) * @as(usize, size.y)); + assert(cells.len == @as(usize, size.x) * @as(usize, size.y)); var row: usize = 0; var col: usize = 0; @@ -151,5 +151,6 @@ pub fn main() !void { const log = std.log.scoped(.default); const std = @import("std"); +const assert = std.debug.assert; const zterm = @import("zterm"); const App = zterm.App(union(enum) {}); diff --git a/src/element.zig b/src/element.zig index 3beb1ff..665b614 100644 --- a/src/element.zig +++ b/src/element.zig @@ -194,7 +194,7 @@ pub fn Scrollable(Event: type) type { fn content(ctx: *anyopaque, cells: []Cell, size: Point) !void { const this: *@This() = @ptrCast(@alignCast(ctx)); - std.debug.assert(cells.len == @as(usize, this.size.x) * @as(usize, this.size.y)); + assert(cells.len == @as(usize, this.size.x) * @as(usize, this.size.y)); const offset_x: usize = if (this.configuration.x_axis) 1 else 0; const offset_y: usize = if (this.configuration.y_axis) 1 else 0; diff --git a/src/testing.zig b/src/testing.zig index 2898cc5..50d30f6 100644 --- a/src/testing.zig +++ b/src/testing.zig @@ -181,8 +181,8 @@ pub fn expectEqualCells(origin: Point, size: Point, expected: []const Cell, actu // test failed try buffer.flush(); - std.debug.lockStdErr(); - defer std.debug.unlockStdErr(); + debug.lockStdErr(); + defer debug.unlockStdErr(); const std_writer = std.io.getStdErr().writer(); try std_writer.writeAll(output.items); @@ -190,6 +190,7 @@ pub fn expectEqualCells(origin: Point, size: Point, expected: []const Cell, actu } const std = @import("std"); +const debug = std.debug; const testing = std.testing; const Allocator = std.mem.Allocator; const event = @import("event.zig");