Skip to content
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.

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

Fix examples for zig 0.13.0 #158

Merged
merged 2 commits into from
Dec 31, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 5 additions & 3 deletions examples/bool-deserializer/main.zig
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ fn Deserializer(comptime Reader: type) type {
self.tokens.deinit();
}

fn deserializeBool(self: *Self, ally: ?std.mem.Allocator, v: anytype) Error!@TypeOf(v).Value {
fn deserializeBool(self: *Self, ally: std.mem.Allocator, v: anytype) Error!@TypeOf(v).Value {
const token = try self.tokens.next();
if (token == .true or token == .false) {
return try v.visitBool(ally, De, token == .true);
Expand All @@ -47,13 +47,15 @@ fn Deserializer(comptime Reader: type) type {
}

pub fn main() anyerror!void {
const page_ally = std.heap.page_allocator;

var fbs = std.io.fixedBufferStream("true");
const reader = fbs.reader();

var d = Deserializer(@TypeOf(reader)).init(std.heap.page_allocator, reader);
var d = Deserializer(@TypeOf(reader)).init(page_ally, reader);
defer d.deinit();

const v = try getty.deserialize(null, bool, d.deserializer());
const v = try getty.deserialize(page_ally, bool, d.deserializer());

std.debug.print("{}, {}\n", .{ v, @TypeOf(v) });
}
2 changes: 1 addition & 1 deletion examples/build.zig
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ pub fn build(b: *std.Build) void {

const exe = b.addExecutable(.{
.name = exe_name,
.root_source_file = .{ .path = example_path },
.root_source_file = b.path(example_path),
.target = target,
.optimize = optimize,
});
Expand Down
8 changes: 4 additions & 4 deletions examples/seq-deserializer/main.zig
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ fn Deserializer(comptime Reader: type) type {
self.tokens.deinit();
}

fn deserializeBool(self: *Self, ally: ?std.mem.Allocator, v: anytype) Error!@TypeOf(v).Value {
fn deserializeBool(self: *Self, ally: std.mem.Allocator, v: anytype) Error!@TypeOf(v).Value {
const token = try self.tokens.next();
if (token == .true or token == .false) {
return try v.visitBool(ally, De, token == .true);
Expand All @@ -45,7 +45,7 @@ fn Deserializer(comptime Reader: type) type {
return error.InvalidType;
}

fn deserializeSeq(self: *Self, ally: ?std.mem.Allocator, v: anytype) Error!@TypeOf(v).Value {
fn deserializeSeq(self: *Self, ally: std.mem.Allocator, v: anytype) Error!@TypeOf(v).Value {
const token = try self.tokens.next();
if (token == .array_begin) {
var sa = SeqAccess{ .de = self };
Expand All @@ -66,7 +66,7 @@ fn Deserializer(comptime Reader: type) type {
},
);

fn nextElementSeed(self: *@This(), ally: ?std.mem.Allocator, seed: anytype) Error!?@TypeOf(seed).Value {
fn nextElementSeed(self: *@This(), ally: std.mem.Allocator, seed: anytype) Error!?@TypeOf(seed).Value {
// If ']' is encountered, return null
if (try self.de.tokens.peekNextTokenType() == .array_end) {
return null;
Expand All @@ -92,5 +92,5 @@ pub fn main() anyerror!void {
const v = try getty.deserialize(page_ally, std.ArrayList(bool), d.deserializer());
defer v.deinit();

std.debug.print("{any}, {}\n", .{ v.items, @TypeOf(v) });
std.debug.print("{any}, {}\n", .{ v.value, @TypeOf(v) });
}
2 changes: 1 addition & 1 deletion examples/seq-serializer/main.zig
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,6 @@ pub fn main() anyerror!void {
try getty.serialize(null, list, s);

// std.BoundedArray
var arr = try std.BoundedArray(bool, 2).fromSlice(&.{ true, false });
const arr = try std.BoundedArray(bool, 2).fromSlice(&.{ true, false });
try getty.serialize(null, arr, s);
}
Loading