Skip to content

Small fixes for zig master #194

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ManDeJan wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Small fixes for zig master #194

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a941326
fix test-test for zig master
ManDeJan May 10, 2025
6388054
fix empty_sigset -> .sigemptyset() for zig master
ManDeJan May 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/tty.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ pub const PosixTty = struct {
.handler = .{ .handler = PosixTty.handleWinch },
.mask = switch (builtin.os.tag) {
.macos => 0,
else => posix.empty_sigset,
else => posix.sigemptyset(),
},
.flags = 0,
};
Expand Down Expand Up @@ -93,7 +93,7 @@ pub const PosixTty = struct {
.handler = .{ .handler = posix.SIG.DFL },
.mask = switch (builtin.os.tag) {
.macos => 0,
else => posix.empty_sigset,
else => posix.sigemptyset(),
},
.flags = 0,
};
Expand Down
7 changes: 4 additions & 3 deletions src/vxfw/vxfw.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -550,18 +550,19 @@ test "All widgets have a doctest and refAllDecls test" {
file.name[0..idx]
else
continue;
const data = try cwd.readFileAllocOptions(std.testing.allocator, file.name, 10_000_000, null, @alignOf(u8), 0x00);
const data = try cwd.readFileAllocOptions(std.testing.allocator, file.name, 10_000_000, null, .of(u8), 0x00);
defer std.testing.allocator.free(data);
var ast = try std.zig.Ast.parse(std.testing.allocator, data, .zig);
defer ast.deinit(std.testing.allocator);

var has_doctest: bool = false;
var has_refAllDecls: bool = false;
for (ast.rootDecls()) |root_decl| {
const decl = ast.nodes.get(root_decl);
const decl = ast.nodes.get(@intFromEnum(root_decl));
switch (decl.tag) {
.test_decl => {
const test_name = ast.tokenSlice(decl.data.lhs);
const opt_token, _ = decl.data.opt_token_and_node;
const test_name = ast.tokenSlice(opt_token.unwrap() orelse continue);
if (std.mem.eql(u8, "\"refAllDecls\"", test_name))
has_refAllDecls = true
else if (std.mem.eql(u8, container_name, test_name))
Expand Down