Skip to content

Commit c418198

Browse files
karlseguinkarlseguin
committed
Zig 0.14 compatibility
1 parent 43f42f9 commit c418198

File tree

24 files changed

+66
-180
lines changed

24 files changed

+66
-180
lines changed

‎.github/actions/install/action.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ inputs:
55
zig:
66
description: 'Zig version to install'
77
required: false
8-
default: '0.13.0'
8+
default: '0.14.0'
99
arch:
1010
description: 'CPU arch used to select the v8 lib'
1111
required: false

‎.github/workflows/zig-fmt.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: zig-fmt
22

33
env:
4-
ZIG_VERSION: 0.13.0
4+
ZIG_VERSION: 0.14.0
55

66
on:
77
pull_request:

‎.gitmodules‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
[submodule "vendor/zig-js-runtime"]
22
path = vendor/zig-js-runtime
33
url = https://github.com/lightpanda-io/zig-js-runtime.git/
4+
branch = zig-0.14
45
[submodule "vendor/netsurf/libwapcaplet"]
56
path = vendor/netsurf/libwapcaplet
67
url = https://github.com/lightpanda-io/libwapcaplet.git/
@@ -28,3 +29,4 @@
2829
[submodule "vendor/zig-async-io"]
2930
path = vendor/zig-async-io
3031
url = https://github.com/lightpanda-io/zig-async-io.git/
32+
branch = zig-0.14

‎Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
FROM ubuntu:22.04
22

3-
ARG ZIG=0.13.0
3+
ARG ZIG=0.14.0
44
ARG ZIG_MINISIG=RWSGOq2NVecA2UPNdBUZykf1CCb147pkmdtYxgb3Ti+JO/wCYvhbAb/U
55
ARG OS=linux
66
ARG ARCH=x86_64

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ You can also follow the progress of our Javascript support in our dedicated [zig
137137

138138
### Prerequisites
139139

140-
Lightpanda is written with [Zig](https://ziglang.org/) `0.13.0`. You have to
140+
Lightpanda is written with [Zig](https://ziglang.org/) `0.14.0`. You have to
141141
install it with the right version in order to build the project.
142142

143143
Lightpanda also depends on

‎build.zig‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ pub fn build(b: *std.Build) !void {
108108
// compile
109109
const tests = b.addTest(.{
110110
.root_source_file = b.path("src/main_tests.zig"),
111-
.test_runner = b.path("src/main_tests.zig"),
111+
.test_runner = .{ .path = b.path("src/main_tests.zig"), .mode = .simple },
112112
.target = target,
113113
.optimize = mode,
114114
});
@@ -134,7 +134,7 @@ pub fn build(b: *std.Build) !void {
134134
// compile
135135
const unit_tests = b.addTest(.{
136136
.root_source_file = b.path("src/unit_tests.zig"),
137-
.test_runner = b.path("src/unit_tests.zig"),
137+
.test_runner = .{ .path = b.path("src/unit_tests.zig"), .mode = .simple },
138138
.target = target,
139139
.optimize = mode,
140140
});
@@ -195,7 +195,7 @@ fn common(
195195
step.root_module.addImport("asyncio", asyncio);
196196

197197
const tlsmod = b.addModule("tls", .{
198-
.root_source_file = b.path("vendor/tls.zig/src/main.zig"),
198+
.root_source_file = b.path("vendor/tls.zig/src/root.zig"),
199199
});
200200
step.root_module.addImport("tls", tlsmod);
201201
}

‎src/browser/browser.zig‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -155,9 +155,9 @@ pub const Session = struct {
155155

156156
const ContextT = @TypeOf(ctx);
157157
const InspectorContainer = switch (@typeInfo(ContextT)) {
158-
.Struct => ContextT,
159-
.Pointer => |ptr| ptr.child,
160-
.Void => NoopInspector,
158+
.@"struct" => ContextT,
159+
.pointer => |ptr| ptr.child,
160+
.void => NoopInspector,
161161
else => @compileError("invalid context type"),
162162
};
163163

@@ -662,7 +662,7 @@ pub const Page = struct {
662662

663663
return .{
664664
.element = e,
665-
.kind = kind(try parser.elementGetAttribute(e, "type")),
665+
.kind = parseKind(try parser.elementGetAttribute(e, "type")),
666666
.isasync = try parser.elementGetAttribute(e, "async") != null,
667667

668668
.src = try parser.elementGetAttribute(e, "src") orelse "inline",
@@ -674,7 +674,7 @@ pub const Page = struct {
674674
// > type indicates that the script is a "classic script", containing
675675
// > JavaScript code.
676676
// https://developer.mozilla.org/en-US/docs/Web/HTML/Element/script#attribute_is_not_set_default_an_empty_string_or_a_javascript_mime_type
677-
fn kind(stype: ?[]const u8) Kind {
677+
fn parseKind(stype: ?[]const u8) Kind {
678678
if (stype == null or stype.?.len == 0) return .javascript;
679679
if (std.mem.eql(u8, stype.?, "application/javascript")) return .javascript;
680680
if (std.mem.eql(u8, stype.?, "module")) return .module;

‎src/browser/mime.zig‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,7 @@ pub const Mime = struct {
245245
const bit_len = @bitSizeOf(@TypeOf(target.*)) - 8;
246246
const byte_len = bit_len / 8;
247247

248-
const T = @Type(.{ .Int = .{
248+
const T = @Type(.{ .int = .{
249249
.bits = bit_len,
250250
.signedness = .unsigned,
251251
} });

‎src/cdp/cdp.zig‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -457,7 +457,7 @@ pub fn Command(comptime CDP_T: type, comptime Sender: type) type {
457457
pub fn sendResult(self: *Self, result: anytype, opts: SendResultOpts) !void {
458458
return self.sender.sendJSON(.{
459459
.id = self.input.id,
460-
.result = if (comptime @typeInfo(@TypeOf(result)) == .Null) struct {}{} else result,
460+
.result = if (comptime @typeInfo(@TypeOf(result)) == .null) struct {}{} else result,
461461
.sessionId = if (opts.include_session_id) self.input.session_id else null,
462462
});
463463
}
@@ -469,7 +469,7 @@ pub fn Command(comptime CDP_T: type, comptime Sender: type) type {
469469
// Events ALWAYS go to the client. self.sender should not be used
470470
return self.cdp.sendJSON(.{
471471
.method = method,
472-
.params = if (comptime @typeInfo(@TypeOf(p)) == .Null) struct {}{} else p,
472+
.params = if (comptime @typeInfo(@TypeOf(p)) == .null) struct {}{} else p,
473473
.sessionId = opts.session_id,
474474
});
475475
}

‎src/cdp/testing.zig‎

Lines changed: 4 additions & 97 deletions
Original file line numberDiff line numberDiff line change
@@ -176,8 +176,8 @@ const TestContext = struct {
176176

177177
pub fn processMessage(self: *TestContext, msg: anytype) !void {
178178
var json_message: []const u8 = undefined;
179-
if (@typeInfo(@TypeOf(msg)) != .Pointer) {
180-
json_message = try json.stringifyAlloc(self.arena.allocator(), msg, .{});
179+
if (@typeInfo(@TypeOf(msg)) != .pointer) {
180+
json_message = try std.json.stringifyAlloc(self.arena.allocator(), msg, .{});
181181
} else {
182182
// assume this is a string we want to send as-is, if it isn't, we'll
183183
// get a compile error, so no big deal.
@@ -198,7 +198,7 @@ const TestContext = struct {
198198
pub fn expectSentResult(self: *TestContext, expected: anytype, opts: ExpectResultOpts) !void {
199199
const expected_result = .{
200200
.id = opts.id,
201-
.result = if (comptime @typeInfo(@TypeOf(expected)) == .Null) struct {}{} else expected,
201+
.result = if (comptime @typeInfo(@TypeOf(expected)) == .null) struct {}{} else expected,
202202
.sessionId = opts.session_id,
203203
};
204204

@@ -212,7 +212,7 @@ const TestContext = struct {
212212
pub fn expectSentEvent(self: *TestContext, method: []const u8, params: anytype, opts: ExpectEventOpts) !void {
213213
const expected_event = .{
214214
.method = method,
215-
.params = if (comptime @typeInfo(@TypeOf(params)) == .Null) struct {}{} else params,
215+
.params = if (comptime @typeInfo(@TypeOf(params)) == .null) struct {}{} else params,
216216
.sessionId = opts.session_id,
217217
};
218218

@@ -324,96 +324,3 @@ fn compareJsonValues(a: std.json.Value, b: std.json.Value) bool {
324324
},
325325
}
326326
}
327-
328-
// fn compareAnyToJsonValue(expected: anytype, actual: json.Value) bool {
329-
// switch (@typeInfo(@TypeOf(expected))) {
330-
// .Optional => {
331-
// if (expected) |e| {
332-
// return compareAnyToJsonValue(e, actual);
333-
// }
334-
// return actual == .null;
335-
// },
336-
// .Int, .ComptimeInt => {
337-
// if (actual != .integer) {
338-
// return false;
339-
// }
340-
// return expected == actual.integer;
341-
// },
342-
// .Float, .ComptimeFloat => {
343-
// if (actual != .float) {
344-
// return false;
345-
// }
346-
// return expected == actual.float;
347-
// },
348-
// .Bool => {
349-
// if (actual != .bool) {
350-
// return false;
351-
// }
352-
// return expected == actual.bool;
353-
// },
354-
// .Pointer => |ptr| switch (ptr.size) {
355-
// .One => switch (@typeInfo(ptr.child)) {
356-
// .Struct => return compareAnyToJsonValue(expected.*, actual),
357-
// .Array => |arr| if (arr.child == u8) {
358-
// if (actual != .string) {
359-
// return false;
360-
// }
361-
// return std.mem.eql(u8, expected, actual.string);
362-
// },
363-
// else => {},
364-
// },
365-
// .Slice => switch (ptr.child) {
366-
// u8 => {
367-
// if (actual != .string) {
368-
// return false;
369-
// }
370-
// return std.mem.eql(u8, expected, actual.string);
371-
// },
372-
// else => {},
373-
// },
374-
// else => {},
375-
// },
376-
// .Struct => |s| {
377-
// if (s.is_tuple) {
378-
// // how an array might look in an anytype
379-
// if (actual != .array) {
380-
// return false;
381-
// }
382-
// if (s.fields.len != actual.array.items.len) {
383-
// return false;
384-
// }
385-
386-
// inline for (s.fields, 0..) |f, i| {
387-
// const e = @field(expected, f.name);
388-
// if (compareAnyToJsonValue(e, actual.array.items[i]) == false) {
389-
// return false;
390-
// }
391-
// }
392-
// return true;
393-
// }
394-
395-
// if (s.fields.len == 0) {
396-
// return (actual == .array and actual.array.items.len == 0);
397-
// }
398-
399-
// if (actual != .object) {
400-
// return false;
401-
// }
402-
// inline for (s.fields) |f| {
403-
// const e = @field(expected, f.name);
404-
// if (actual.object.get(f.name)) |a| {
405-
// if (compareAnyToJsonValue(e, a) == false) {
406-
// return false;
407-
// }
408-
// } else if (@typeInfo(f.type) != .Optional or e != null) {
409-
// // We don't JSON serialize nulls. So if we're expecting
410-
// // a null, that should show up as a missing field.
411-
// return false;
412-
// }
413-
// }
414-
// return true;
415-
// },
416-
// else => {},
417-
// }
418-
// @compileError("Can't compare " ++ @typeName(@TypeOf(expected)));
419-
// }

0 commit comments

Comments
 (0)