From 150407e2d3c8a0910880eea27e8da0cdd76ffb71 Mon Sep 17 00:00:00 2001 From: Ed Yu Date: Fri, 20 Oct 2023 09:45:35 -0700 Subject: [PATCH 1/6] Update to zig 0.12.0-dev.1127+32bc07767 --- build.zig.zon | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/build.zig.zon b/build.zig.zon index 8e27c87..17484f9 100644 --- a/build.zig.zon +++ b/build.zig.zon @@ -1,11 +1,11 @@ .{ .name = "zap", - .version = "0.1.14-pre", - + .version = "0.1.15-pre", + .paths = .{ "build.zig.zon", "build.zig", "src" }, .dependencies = .{ .@"facil.io" = .{ - .url = "https://github.com/zigzap/facil.io/archive/refs/tags/zap-0.0.12.tar.gz", - .hash = "12200301960bbde64052db068cf31a64091ce1f671898513d9b8d9e2be5b0e4b13a3", - } - } + .url = "https://github.com/edyu/facil.io/archive/refs/tags/v0.0.13.tar.gz", + .hash = "12200cc667b6ad0f5f48050ca5f8baac3c87a13131d93c7fe876b26c51c405493f44", + }, + }, } From c5d86376f8b472f349ff669d059c5d6e5e3d5f32 Mon Sep 17 00:00:00 2001 From: Ed Yu Date: Fri, 20 Oct 2023 10:02:09 -0700 Subject: [PATCH 2/6] Update examples to zig 0.12.0-dev.1127+32bc07767 --- build.zig.zon | 2 +- examples/cookies/cookies.zig | 2 +- examples/http_params/http_params.zig | 2 +- tools/announceybot.zig | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build.zig.zon b/build.zig.zon index 17484f9..9158720 100644 --- a/build.zig.zon +++ b/build.zig.zon @@ -1,7 +1,7 @@ .{ .name = "zap", .version = "0.1.15-pre", - .paths = .{ "build.zig.zon", "build.zig", "src" }, + .paths = .{"."}, .dependencies = .{ .@"facil.io" = .{ .url = "https://github.com/edyu/facil.io/archive/refs/tags/v0.0.13.tar.gz", diff --git a/examples/cookies/cookies.zig b/examples/cookies/cookies.zig index 67ab034..03d21a7 100644 --- a/examples/cookies/cookies.zig +++ b/examples/cookies/cookies.zig @@ -15,7 +15,7 @@ fn makeRequest(a: std.mem.Allocator, url: []const u8) !void { defer req.deinit(); try req.headers.append("cookie", "ZIG_ZAP=awesome"); - try req.start(); + try req.start(.{}); try req.wait(); } diff --git a/examples/http_params/http_params.zig b/examples/http_params/http_params.zig index 1bb739d..44b20fa 100644 --- a/examples/http_params/http_params.zig +++ b/examples/http_params/http_params.zig @@ -14,7 +14,7 @@ fn makeRequest(a: std.mem.Allocator, url: []const u8) !void { var req = try http_client.request(.GET, uri, h, .{}); defer req.deinit(); - try req.start(); + try req.start(.{}); try req.wait(); } diff --git a/tools/announceybot.zig b/tools/announceybot.zig index 6dbef9d..d2088d8 100644 --- a/tools/announceybot.zig +++ b/tools/announceybot.zig @@ -167,7 +167,7 @@ fn sendToDiscordPart(allocator: std.mem.Allocator, url: []const u8, message_json req.transfer_encoding = .chunked; // connect, send request - try req.start(); + try req.start(.{}); // send POST payload try req.writer().writeAll(message_json); From 79fb534e805dd93b8ab3ec4a9df733bf0901055b Mon Sep 17 00:00:00 2001 From: Ed Yu Date: Tue, 24 Oct 2023 15:09:40 -0700 Subject: [PATCH 3/6] Update to new zig master api changes --- examples/cookies/cookies.zig | 4 ++-- examples/http_params/http_params.zig | 4 ++-- tools/announceybot.zig | 6 +++--- tools/pkghash.zig | 4 ++-- wrk/zigstd/main.zig | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/examples/cookies/cookies.zig b/examples/cookies/cookies.zig index 03d21a7..583fc89 100644 --- a/examples/cookies/cookies.zig +++ b/examples/cookies/cookies.zig @@ -11,11 +11,11 @@ fn makeRequest(a: std.mem.Allocator, url: []const u8) !void { var http_client: std.http.Client = .{ .allocator = a }; defer http_client.deinit(); - var req = try http_client.request(.GET, uri, h, .{}); + var req = try http_client.open(.GET, uri, h, .{}); defer req.deinit(); try req.headers.append("cookie", "ZIG_ZAP=awesome"); - try req.start(.{}); + try req.send(.{}); try req.wait(); } diff --git a/examples/http_params/http_params.zig b/examples/http_params/http_params.zig index 44b20fa..5b056fa 100644 --- a/examples/http_params/http_params.zig +++ b/examples/http_params/http_params.zig @@ -11,10 +11,10 @@ fn makeRequest(a: std.mem.Allocator, url: []const u8) !void { var http_client: std.http.Client = .{ .allocator = a }; defer http_client.deinit(); - var req = try http_client.request(.GET, uri, h, .{}); + var req = try http_client.open(.GET, uri, h, .{}); defer req.deinit(); - try req.start(.{}); + try req.send(.{}); try req.wait(); } diff --git a/tools/announceybot.zig b/tools/announceybot.zig index d2088d8..b7c415a 100644 --- a/tools/announceybot.zig +++ b/tools/announceybot.zig @@ -88,7 +88,7 @@ fn get_tag_annotation(allocator: std.mem.Allocator, tagname: []const u8) ![]cons tagname, }; - const result = try std.ChildProcess.exec(.{ + const result = try std.ChildProcess.run(.{ .allocator = allocator, .argv = &args, }); @@ -161,13 +161,13 @@ fn sendToDiscordPart(allocator: std.mem.Allocator, url: []const u8, message_json defer http_client.deinit(); // request - var req = try http_client.request(.POST, uri, h, .{}); + var req = try http_client.open(.POST, uri, h, .{}); defer req.deinit(); req.transfer_encoding = .chunked; // connect, send request - try req.start(.{}); + try req.send(.{}); // send POST payload try req.writer().writeAll(message_json); diff --git a/tools/pkghash.zig b/tools/pkghash.zig index f3997fc..61d4009 100644 --- a/tools/pkghash.zig +++ b/tools/pkghash.zig @@ -71,7 +71,7 @@ pub const usage_pkg = ; pub fn gitLatestTag(gpa: Allocator, pkg_dir: []const u8) ![]const u8 { - const result = try std.ChildProcess.exec(.{ + const result = try std.ChildProcess.run(.{ .allocator = gpa, .argv = &.{ "git", @@ -97,7 +97,7 @@ pub fn gitLatestTag(gpa: Allocator, pkg_dir: []const u8) ![]const u8 { } pub fn gitFileList(gpa: Allocator, pkg_dir: []const u8) ![]const u8 { - const result = try std.ChildProcess.exec(.{ + const result = try std.ChildProcess.run(.{ .allocator = gpa, .argv = &.{ "git", diff --git a/wrk/zigstd/main.zig b/wrk/zigstd/main.zig index 30e0636..8c26ce9 100644 --- a/wrk/zigstd/main.zig +++ b/wrk/zigstd/main.zig @@ -30,7 +30,7 @@ pub fn main() !void { res.transfer_encoding = .{ .content_length = server_body.len }; try res.headers.append("content-type", "text/plain"); try res.headers.append("connection", "close"); - try res.do(); + try res.send(); var buf: [128]u8 = undefined; _ = try res.readAll(&buf); From 3de8e97451d0224b5b4254da7ac3c5e5358046ca Mon Sep 17 00:00:00 2001 From: Ed Yu Date: Tue, 21 Nov 2023 15:07:08 -0800 Subject: [PATCH 4/6] Replace immutable var to const due to zig 0.12.0-dev.1664+8ca4a5240 --- build.zig | 8 +++--- examples/bindataformpost/bindataformpost.zig | 4 +-- examples/cookies/cookies.zig | 4 +-- examples/endpoint/endpoint.zig | 4 +-- examples/endpoint/main.zig | 2 +- examples/hello_json/hello_json.zig | 2 +- examples/http_params/http_params.zig | 4 +-- examples/middleware/middleware.zig | 8 +++--- .../middleware_with_endpoint.zig | 8 +++--- .../userpass_session_auth.zig | 2 +- examples/websockets/websockets.zig | 6 ++-- src/fio.zig | 28 +++++++++---------- src/http_auth.zig | 4 +-- src/middleware.zig | 4 +-- src/mustache.zig | 8 +++--- src/websockets.zig | 16 +++++------ src/zap.zig | 18 ++++++------ tools/announceybot.zig | 4 +-- wrk/zigstd/main.zig | 2 +- 19 files changed, 68 insertions(+), 68 deletions(-) diff --git a/build.zig b/build.zig index 39d3dc4..5e7d5c7 100644 --- a/build.zig +++ b/build.zig @@ -12,7 +12,7 @@ pub fn build(b: *std.build.Builder) !void { }); // create a module to be used internally. - var zap_module = b.createModule(.{ + const zap_module = b.createModule(.{ .source_file = .{ .path = "src/zap.zig" }, }); @@ -200,7 +200,7 @@ pub fn build(b: *std.build.Builder) !void { // // pkghash // - var pkghash_exe = b.addExecutable(.{ + const pkghash_exe = b.addExecutable(.{ .name = "pkghash", .root_source_file = .{ .path = "./tools/pkghash.zig" }, .target = target, @@ -214,13 +214,13 @@ pub fn build(b: *std.build.Builder) !void { // // announceybot // - var announceybot_exe = b.addExecutable(.{ + const announceybot_exe = b.addExecutable(.{ .name = "announceybot", .root_source_file = .{ .path = "./tools/announceybot.zig" }, .target = target, .optimize = optimize, }); - var announceybot_step = b.step("announceybot", "Build announceybot"); + const announceybot_step = b.step("announceybot", "Build announceybot"); const announceybot_build_step = b.addInstallArtifact(announceybot_exe, .{}); announceybot_step.dependOn(&announceybot_build_step.step); all_step.dependOn(&announceybot_build_step.step); diff --git a/examples/bindataformpost/bindataformpost.zig b/examples/bindataformpost/bindataformpost.zig index 1a60849..4455d2a 100644 --- a/examples/bindataformpost/bindataformpost.zig +++ b/examples/bindataformpost/bindataformpost.zig @@ -16,7 +16,7 @@ const Handler = struct { // check for query params (for ?terminate=true) r.parseQuery(); - var param_count = r.getParamCount(); + const param_count = r.getParamCount(); std.log.info("param_count: {}", .{param_count}); // iterate over all params @@ -87,7 +87,7 @@ pub fn main() !void { var gpa = std.heap.GeneralPurposeAllocator(.{ .thread_safe = true, }){}; - var allocator = gpa.allocator(); + const allocator = gpa.allocator(); Handler.alloc = allocator; diff --git a/examples/cookies/cookies.zig b/examples/cookies/cookies.zig index 583fc89..f716151 100644 --- a/examples/cookies/cookies.zig +++ b/examples/cookies/cookies.zig @@ -28,7 +28,7 @@ pub fn main() !void { var gpa = std.heap.GeneralPurposeAllocator(.{ .thread_safe = true, }){}; - var allocator = gpa.allocator(); + const allocator = gpa.allocator(); const Handler = struct { var alloc: std.mem.Allocator = undefined; @@ -39,7 +39,7 @@ pub fn main() !void { r.parseCookies(false); - var cookie_count = r.getCookiesCount(); + const cookie_count = r.getCookiesCount(); std.log.info("cookie_count: {}", .{cookie_count}); // iterate over all cookies as strings diff --git a/examples/endpoint/endpoint.zig b/examples/endpoint/endpoint.zig index ac4b408..4eebfd3 100644 --- a/examples/endpoint/endpoint.zig +++ b/examples/endpoint/endpoint.zig @@ -82,7 +82,7 @@ fn listUsers(self: *Self, r: zap.SimpleRequest) void { fn postUser(e: *zap.SimpleEndpoint, r: zap.SimpleRequest) void { const self = @fieldParentPtr(Self, "endpoint", e); if (r.body) |body| { - var maybe_user: ?std.json.Parsed(User) = std.json.parseFromSlice(User, self.alloc, body, .{}) catch null; + const maybe_user: ?std.json.Parsed(User) = std.json.parseFromSlice(User, self.alloc, body, .{}) catch null; if (maybe_user) |u| { defer u.deinit(); if (self.users.addByName(u.value.first_name, u.value.last_name)) |id| { @@ -104,7 +104,7 @@ fn putUser(e: *zap.SimpleEndpoint, r: zap.SimpleRequest) void { if (self.userIdFromPath(path)) |id| { if (self.users.get(id)) |_| { if (r.body) |body| { - var maybe_user: ?std.json.Parsed(User) = std.json.parseFromSlice(User, self.alloc, body, .{}) catch null; + const maybe_user: ?std.json.Parsed(User) = std.json.parseFromSlice(User, self.alloc, body, .{}) catch null; if (maybe_user) |u| { defer u.deinit(); var jsonbuf: [128]u8 = undefined; diff --git a/examples/endpoint/main.zig b/examples/endpoint/main.zig index c387d94..f8c1889 100644 --- a/examples/endpoint/main.zig +++ b/examples/endpoint/main.zig @@ -16,7 +16,7 @@ pub fn main() !void { var gpa = std.heap.GeneralPurposeAllocator(.{ .thread_safe = true, }){}; - var allocator = gpa.allocator(); + const allocator = gpa.allocator(); // we scope everything that can allocate within this block for leak detection { diff --git a/examples/hello_json/hello_json.zig b/examples/hello_json/hello_json.zig index b477230..329f7d4 100644 --- a/examples/hello_json/hello_json.zig +++ b/examples/hello_json/hello_json.zig @@ -41,7 +41,7 @@ fn setupUserData(a: std.mem.Allocator) !void { } pub fn main() !void { - var a = std.heap.page_allocator; + const a = std.heap.page_allocator; try setupUserData(a); var listener = zap.SimpleHttpListener.init(.{ .port = 3000, diff --git a/examples/http_params/http_params.zig b/examples/http_params/http_params.zig index 5b056fa..9508d03 100644 --- a/examples/http_params/http_params.zig +++ b/examples/http_params/http_params.zig @@ -27,7 +27,7 @@ pub fn main() !void { var gpa = std.heap.GeneralPurposeAllocator(.{ .thread_safe = true, }){}; - var allocator = gpa.allocator(); + const allocator = gpa.allocator(); const Handler = struct { var alloc: std.mem.Allocator = undefined; @@ -44,7 +44,7 @@ pub fn main() !void { // check for query parameters r.parseQuery(); - var param_count = r.getParamCount(); + const param_count = r.getParamCount(); std.log.info("param_count: {}", .{param_count}); // iterate over all params as strings diff --git a/examples/middleware/middleware.zig b/examples/middleware/middleware.zig index 6b4983e..4152c0f 100644 --- a/examples/middleware/middleware.zig +++ b/examples/middleware/middleware.zig @@ -72,7 +72,7 @@ const UserMiddleWare = struct { pub fn onRequest(handler: *Handler, r: zap.SimpleRequest, context: *Context) bool { // this is how we would get our self pointer - var self = @fieldParentPtr(Self, "handler", handler); + const self = @fieldParentPtr(Self, "handler", handler); _ = self; // do our work: fill in the user field of the context @@ -115,7 +115,7 @@ const SessionMiddleWare = struct { // note that the first parameter is of type *Handler, not *Self !!! pub fn onRequest(handler: *Handler, r: zap.SimpleRequest, context: *Context) bool { // this is how we would get our self pointer - var self = @fieldParentPtr(Self, "handler", handler); + const self = @fieldParentPtr(Self, "handler", handler); _ = self; context.session = Session{ @@ -151,7 +151,7 @@ const HtmlMiddleWare = struct { pub fn onRequest(handler: *Handler, r: zap.SimpleRequest, context: *Context) bool { // this is how we would get our self pointer - var self = @fieldParentPtr(Self, "handler", handler); + const self = @fieldParentPtr(Self, "handler", handler); _ = self; std.debug.print("\n\nHtmlMiddleware: handling request with context: {any}\n\n", .{context}); @@ -190,7 +190,7 @@ pub fn main() !void { var gpa = std.heap.GeneralPurposeAllocator(.{ .thread_safe = true, }){}; - var allocator = gpa.allocator(); + const allocator = gpa.allocator(); SharedAllocator.init(allocator); // we create our HTML middleware component that handles the request diff --git a/examples/middleware_with_endpoint/middleware_with_endpoint.zig b/examples/middleware_with_endpoint/middleware_with_endpoint.zig index f22397f..b97fdf9 100644 --- a/examples/middleware_with_endpoint/middleware_with_endpoint.zig +++ b/examples/middleware_with_endpoint/middleware_with_endpoint.zig @@ -59,7 +59,7 @@ const UserMiddleWare = struct { pub fn onRequest(handler: *Handler, r: zap.SimpleRequest, context: *Context) bool { // this is how we would get our self pointer - var self = @fieldParentPtr(Self, "handler", handler); + const self = @fieldParentPtr(Self, "handler", handler); _ = self; // do our work: fill in the user field of the context @@ -104,7 +104,7 @@ const SessionMiddleWare = struct { // note that the first parameter is of type *Handler, not *Self !!! pub fn onRequest(handler: *Handler, r: zap.SimpleRequest, context: *Context) bool { // this is how we would get our self pointer - var self = @fieldParentPtr(Self, "handler", handler); + const self = @fieldParentPtr(Self, "handler", handler); _ = self; context.session = Session{ @@ -154,7 +154,7 @@ const HtmlEndpoint = struct { } pub fn get(ep: *zap.SimpleEndpoint, r: zap.SimpleRequest) void { - var self = @fieldParentPtr(Self, "endpoint", ep); + const self = @fieldParentPtr(Self, "endpoint", ep); _ = self; var buf: [1024]u8 = undefined; @@ -199,7 +199,7 @@ pub fn main() !void { var gpa = std.heap.GeneralPurposeAllocator(.{ .thread_safe = true, }){}; - var allocator = gpa.allocator(); + const allocator = gpa.allocator(); SharedAllocator.init(allocator); // create the endpoint diff --git a/examples/userpass_session_auth/userpass_session_auth.zig b/examples/userpass_session_auth/userpass_session_auth.zig index 5de5e05..72645b3 100644 --- a/examples/userpass_session_auth/userpass_session_auth.zig +++ b/examples/userpass_session_auth/userpass_session_auth.zig @@ -123,7 +123,7 @@ pub fn main() !void { // we start a block here so the defers will run before we call the gpa // to detect leaks { - var allocator = gpa.allocator(); + const allocator = gpa.allocator(); var listener = zap.SimpleHttpListener.init(.{ .port = 3000, .on_request = on_request, diff --git a/examples/websockets/websockets.zig b/examples/websockets/websockets.zig index 09975bb..2799b96 100644 --- a/examples/websockets/websockets.zig +++ b/examples/websockets/websockets.zig @@ -46,8 +46,8 @@ const ContextManager = struct { self.lock.lock(); defer self.lock.unlock(); - var ctx = try self.allocator.create(Context); - var userName = try std.fmt.allocPrint( + const ctx = try self.allocator.create(Context); + const userName = try std.fmt.allocPrint( self.allocator, "{s}{d}", .{ self.usernamePrefix, self.contexts.items.len }, @@ -201,7 +201,7 @@ pub fn main() !void { var gpa = std.heap.GeneralPurposeAllocator(.{ .thread_safe = true, }){}; - var allocator = gpa.allocator(); + const allocator = gpa.allocator(); GlobalContextManager = ContextManager.init(allocator, "chatroom", "user-"); defer GlobalContextManager.deinit(); diff --git a/src/fio.zig b/src/fio.zig index b687017..fa1328f 100644 --- a/src/fio.zig +++ b/src/fio.zig @@ -118,10 +118,10 @@ pub const struct_fio_str_info_s = extern struct { pub const fio_str_info_s = struct_fio_str_info_s; pub extern fn http_send_body(h: [*c]http_s, data: ?*anyopaque, length: usize) c_int; pub fn fiobj_each1(arg_o: FIOBJ, arg_start_at: usize, arg_task: ?*const fn (FIOBJ, ?*anyopaque) callconv(.C) c_int, arg_arg: ?*anyopaque) callconv(.C) usize { - var o = arg_o; - var start_at = arg_start_at; - var task = arg_task; - var arg = arg_arg; + const o = arg_o; + const start_at = arg_start_at; + const task = arg_task; + const arg = arg_arg; if ((((o != 0) and ((o & @as(c_ulong, @bitCast(@as(c_long, @as(c_int, 1))))) == @as(c_ulong, @bitCast(@as(c_long, @as(c_int, 0)))))) and ((o & @as(c_ulong, @bitCast(@as(c_long, @as(c_int, 6))))) != @as(c_ulong, @bitCast(@as(c_long, @as(c_int, 6)))))) and (fiobj_type_vtable(o).*.each != null)) return fiobj_type_vtable(o).*.each.?(o, start_at, task, arg); return 0; } @@ -241,8 +241,8 @@ pub const fiobj_object_header_s = extern struct { ref: u32, }; pub fn fiobj_type_is(arg_o: FIOBJ, arg_type: fiobj_type_enum) callconv(.C) usize { - var o = arg_o; - var @"type" = arg_type; + const o = arg_o; + const @"type" = arg_type; while (true) { switch (@as(c_int, @bitCast(@as(c_uint, @"type")))) { @as(c_int, 1) => return @as(usize, @bitCast(@as(c_long, @intFromBool(((o & @as(c_ulong, @bitCast(@as(c_long, @as(c_int, 1))))) != 0) or (@as(c_int, @bitCast(@as(c_uint, @as([*c]fiobj_type_enum, @ptrFromInt(o))[@as(c_uint, @intCast(@as(c_int, 0)))]))) == FIOBJ_T_NUMBER))))), @@ -264,7 +264,7 @@ pub fn fiobj_type_is(arg_o: FIOBJ, arg_type: fiobj_type_enum) callconv(.C) usize return @as(usize, @bitCast(@as(c_long, @intFromBool((((o != 0) and ((o & @as(c_ulong, @bitCast(@as(c_long, @as(c_int, 1))))) == @as(c_ulong, @bitCast(@as(c_long, @as(c_int, 0)))))) and ((o & @as(c_ulong, @bitCast(@as(c_long, @as(c_int, 6))))) != @as(c_ulong, @bitCast(@as(c_long, @as(c_int, 6)))))) and (@as(c_int, @bitCast(@as(c_uint, @as([*c]fiobj_type_enum, @ptrCast(@alignCast(@as(?*anyopaque, @ptrFromInt(o & ~@as(usize, @bitCast(@as(c_long, @as(c_int, 7)))))))))[@as(c_uint, @intCast(@as(c_int, 0)))]))) == @as(c_int, @bitCast(@as(c_uint, @"type")))))))); } pub fn fiobj_type(arg_o: FIOBJ) callconv(.C) fiobj_type_enum { - var o = arg_o; + const o = arg_o; if (!(o != 0)) return @as(u8, @bitCast(@as(i8, @truncate(FIOBJ_T_NULL)))); if ((o & @as(c_ulong, @bitCast(@as(c_long, @as(c_int, 1))))) != 0) return @as(u8, @bitCast(@as(i8, @truncate(FIOBJ_T_NUMBER)))); if ((o & @as(c_ulong, @bitCast(@as(c_long, @as(c_int, 6))))) == @as(c_ulong, @bitCast(@as(c_long, @as(c_int, 6))))) return @as(u8, @bitCast(@as(u8, @truncate(o)))); @@ -279,7 +279,7 @@ pub extern const FIOBJECT_VTABLE_ARRAY: fiobj_object_vtable_s; pub extern const FIOBJECT_VTABLE_HASH: fiobj_object_vtable_s; pub extern const FIOBJECT_VTABLE_DATA: fiobj_object_vtable_s; pub fn fiobj_type_vtable(arg_o: FIOBJ) callconv(.C) [*c]const fiobj_object_vtable_s { - var o = arg_o; + const o = arg_o; while (true) { switch (@as(c_int, @bitCast(@as(c_uint, fiobj_type(o))))) { @as(c_int, 1) => return &FIOBJECT_VTABLE_NUMBER, @@ -314,7 +314,7 @@ pub fn fiobj_obj2float(o: FIOBJ) callconv(.C) f64 { pub extern fn fio_ltocstr(c_long) fio_str_info_s; pub fn fiobj_obj2cstr(o: FIOBJ) callconv(.C) fio_str_info_s { if (!(o != 0)) { - var ret: fio_str_info_s = fio_str_info_s{ + const ret: fio_str_info_s = fio_str_info_s{ .capa = @as(usize, @bitCast(@as(c_long, @as(c_int, 0)))), .len = @as(usize, @bitCast(@as(c_long, @as(c_int, 4)))), .data = @as([*c]u8, @ptrFromInt(@intFromPtr("null"))), @@ -327,7 +327,7 @@ pub fn fiobj_obj2cstr(o: FIOBJ) callconv(.C) fio_str_info_s { switch (@as(c_int, @bitCast(@as(c_uint, @as(u8, @bitCast(@as(u8, @truncate(o)))))))) { @as(c_int, 6) => { { - var ret: fio_str_info_s = fio_str_info_s{ + const ret: fio_str_info_s = fio_str_info_s{ .capa = @as(usize, @bitCast(@as(c_long, @as(c_int, 0)))), .len = @as(usize, @bitCast(@as(c_long, @as(c_int, 4)))), .data = @as([*c]u8, @ptrFromInt(@intFromPtr("null"))), @@ -337,7 +337,7 @@ pub fn fiobj_obj2cstr(o: FIOBJ) callconv(.C) fio_str_info_s { }, @as(c_int, 38) => { { - var ret: fio_str_info_s = fio_str_info_s{ + const ret: fio_str_info_s = fio_str_info_s{ .capa = @as(usize, @bitCast(@as(c_long, @as(c_int, 0)))), .len = @as(usize, @bitCast(@as(c_long, @as(c_int, 5)))), .data = @as([*c]u8, @ptrFromInt(@intFromPtr("false"))), @@ -347,7 +347,7 @@ pub fn fiobj_obj2cstr(o: FIOBJ) callconv(.C) fio_str_info_s { }, @as(c_int, 22) => { { - var ret: fio_str_info_s = fio_str_info_s{ + const ret: fio_str_info_s = fio_str_info_s{ .capa = @as(usize, @bitCast(@as(c_long, @as(c_int, 0)))), .len = @as(usize, @bitCast(@as(c_long, @as(c_int, 4)))), .data = @as([*c]u8, @ptrFromInt(@intFromPtr("true"))), @@ -509,8 +509,8 @@ pub extern fn http_date2rfc7231(target: [*c]u8, tmbuf: [*c]struct_tm) usize; pub extern fn http_date2rfc2109(target: [*c]u8, tmbuf: [*c]struct_tm) usize; pub extern fn http_date2rfc2822(target: [*c]u8, tmbuf: [*c]struct_tm) usize; pub fn http_date2str(arg_target: [*c]u8, arg_tmbuf: [*c]struct_tm) callconv(.C) usize { - var target = arg_target; - var tmbuf = arg_tmbuf; + const target = arg_target; + const tmbuf = arg_tmbuf; return http_date2rfc7231(target, tmbuf); } pub extern fn http_time2str(target: [*c]u8, t: time_t) usize; diff --git a/src/http_auth.zig b/src/http_auth.zig index c883ef7..3b833fd 100644 --- a/src/http_auth.zig +++ b/src/http_auth.zig @@ -117,7 +117,7 @@ pub fn BasicAuth(comptime Lookup: type, comptime kind: BasicAuthStrategy) type { ); return .AuthFailed; } - var decoded = buffer[0..decoded_size]; + const decoded = buffer[0..decoded_size]; decoder.decode(decoded, encoded) catch |err| { zap.debug( "ERROR: UserPassAuth: unable to decode `{s}`: {any}\n", @@ -373,7 +373,7 @@ pub fn UserPassSessionAuth(comptime Lookup: type, comptime lockedPwLookups: bool lookup: *Lookup, args: UserPassSessionAuthArgs, ) !Self { - var ret: Self = .{ + const ret: Self = .{ .allocator = allocator, .settings = .{ .usernameParam = try allocator.dupe(u8, args.usernameParam), diff --git a/src/middleware.zig b/src/middleware.zig index b435701..64bd08f 100644 --- a/src/middleware.zig +++ b/src/middleware.zig @@ -210,7 +210,7 @@ test "it" { std.debug.print("field {} : name = {s} : type = {any}\n", .{ i, f.name, f.type }); } - var mixed: Mixed = .{ + const mixed: Mixed = .{ // it's all optionals which we made default to null in MixContexts }; std.debug.print("mixed = {any}\n", .{mixed}); @@ -233,7 +233,7 @@ test "it" { }; // this will fail if we don't specify - var nonOpts: NonOpts = .{ + const nonOpts: NonOpts = .{ .user = &user, .session = &session, }; diff --git a/src/mustache.zig b/src/mustache.zig index 05edaa5..4a67a7d 100644 --- a/src/mustache.zig +++ b/src/mustache.zig @@ -57,7 +57,7 @@ pub const MustacheError = error{ pub fn mustacheNew(load_args: MustacheLoadArgs) MustacheError!*Mustache { var err: mustache_error_en = undefined; - var args: MustacheLoadArgsFio = .{ + const args: MustacheLoadArgsFio = .{ .filename = filn: { if (load_args.filename) |filn| break :filn filn.ptr else break :filn null; }, @@ -73,7 +73,7 @@ pub fn mustacheNew(load_args: MustacheLoadArgs) MustacheError!*Mustache { .err = &err, }; - var ret = fiobj_mustache_new(args); + const ret = fiobj_mustache_new(args); switch (err) { 0 => return ret.?, 1 => return MustacheError.MUSTACHE_ERR_TOO_DEEP, @@ -178,7 +178,7 @@ pub fn fiobjectify( }, .Struct => |S| { // create a new fio hashmap - var m = fio.fiobj_hash_new(); + const m = fio.fiobj_hash_new(); // std.debug.print("new struct\n", .{}); inline for (S.fields) |Field| { // don't include void fields @@ -215,7 +215,7 @@ pub fn fiobjectify( return fio.fiobj_str_new(util.toCharPtr(value), value.len); } - var arr = fio.fiobj_ary_new2(value.len); + const arr = fio.fiobj_ary_new2(value.len); for (value) |x| { const v = fiobjectify(x); fio.fiobj_ary_push(arr, v); diff --git a/src/websockets.zig b/src/websockets.zig index 1fef326..62afe92 100644 --- a/src/websockets.zig +++ b/src/websockets.zig @@ -43,7 +43,7 @@ pub fn Handler(comptime ContextType: type) type { /// This function will end the HTTP stage of the connection and attempt to "upgrade" to a WebSockets connection. pub fn upgrade(h: [*c]fio.http_s, settings: *WebSocketSettings) WebSocketError!void { - var fio_settings: fio.websocket_settings_s = .{ + const fio_settings: fio.websocket_settings_s = .{ .on_message = internal_on_message, .on_open = internal_on_open, .on_ready = internal_on_ready, @@ -57,8 +57,8 @@ pub fn Handler(comptime ContextType: type) type { } fn internal_on_message(handle: WsHandle, msg: fio.fio_str_info_s, is_text: u8) callconv(.C) void { - var user_provided_settings: ?*WebSocketSettings = @as(?*WebSocketSettings, @ptrCast(@alignCast(fio.websocket_udata_get(handle)))); - var message = msg.data[0..msg.len]; + const user_provided_settings: ?*WebSocketSettings = @as(?*WebSocketSettings, @ptrCast(@alignCast(fio.websocket_udata_get(handle)))); + const message = msg.data[0..msg.len]; if (user_provided_settings) |settings| { if (settings.on_message) |on_message| { on_message(settings.context, handle, message, is_text == 1); @@ -67,7 +67,7 @@ pub fn Handler(comptime ContextType: type) type { } fn internal_on_open(handle: WsHandle) callconv(.C) void { - var user_provided_settings: ?*WebSocketSettings = @as(?*WebSocketSettings, @ptrCast(@alignCast(fio.websocket_udata_get(handle)))); + const user_provided_settings: ?*WebSocketSettings = @as(?*WebSocketSettings, @ptrCast(@alignCast(fio.websocket_udata_get(handle)))); if (user_provided_settings) |settings| { if (settings.on_open) |on_open| { on_open(settings.context, handle); @@ -76,7 +76,7 @@ pub fn Handler(comptime ContextType: type) type { } fn internal_on_ready(handle: WsHandle) callconv(.C) void { - var user_provided_settings: ?*WebSocketSettings = @as(?*WebSocketSettings, @ptrCast(@alignCast(fio.websocket_udata_get(handle)))); + const user_provided_settings: ?*WebSocketSettings = @as(?*WebSocketSettings, @ptrCast(@alignCast(fio.websocket_udata_get(handle)))); if (user_provided_settings) |settings| { if (settings.on_ready) |on_ready| { on_ready(settings.context, handle); @@ -85,7 +85,7 @@ pub fn Handler(comptime ContextType: type) type { } fn internal_on_shutdown(handle: WsHandle) callconv(.C) void { - var user_provided_settings: ?*WebSocketSettings = @as(?*WebSocketSettings, @ptrCast(@alignCast(fio.websocket_udata_get(handle)))); + const user_provided_settings: ?*WebSocketSettings = @as(?*WebSocketSettings, @ptrCast(@alignCast(fio.websocket_udata_get(handle)))); if (user_provided_settings) |settings| { if (settings.on_shutdown) |on_shutdown| { on_shutdown(settings.context, handle); @@ -94,7 +94,7 @@ pub fn Handler(comptime ContextType: type) type { } fn internal_on_close(uuid: isize, udata: ?*anyopaque) callconv(.C) void { - var user_provided_settings: ?*WebSocketSettings = @as(?*WebSocketSettings, @ptrCast(@alignCast(udata))); + const user_provided_settings: ?*WebSocketSettings = @as(?*WebSocketSettings, @ptrCast(@alignCast(udata))); if (user_provided_settings) |settings| { if (settings.on_close) |on_close| { on_close(settings.context, uuid); @@ -170,7 +170,7 @@ pub fn Handler(comptime ContextType: type) type { /// we need it to look up the ziggified callbacks. pub inline fn subscribe(handle: WsHandle, args: *SubscribeArgs) WebSocketError!usize { if (handle == null) return error.SubscribeError; - var fio_args: fio.websocket_subscribe_s_zigcompat = .{ + const fio_args: fio.websocket_subscribe_s_zigcompat = .{ .ws = handle.?, .channel = util.str2fio(args.channel), .on_message = if (args.on_message) |_| internal_subscription_on_message else null, diff --git a/src/zap.zig b/src/zap.zig index 925a6e6..77af496 100644 --- a/src/zap.zig +++ b/src/zap.zig @@ -142,8 +142,8 @@ pub const SimpleRequest = struct { var writer = string.writer(); try writer.print("ERROR: {any}\n\n", .{err}); - var debugInfo = try std.debug.getSelfDebugInfo(); - var ttyConfig: std.io.tty.Config = .no_color; + const debugInfo = try std.debug.getSelfDebugInfo(); + const ttyConfig: std.io.tty.Config = .no_color; try std.debug.writeCurrentStackTrace(writer, debugInfo, ttyConfig, null); try self.sendBody(string.items); } @@ -297,7 +297,7 @@ pub const SimpleRequest = struct { // Set a response cookie pub fn setCookie(self: *const Self, args: CookieArgs) HttpError!void { - var c: fio.http_cookie_args_s = .{ + const c: fio.http_cookie_args_s = .{ .name = util.toCharPtr(args.name), .name_len = @as(isize, @intCast(args.name.len)), .value = util.toCharPtr(args.value), @@ -414,7 +414,7 @@ pub const SimpleRequest = struct { fn _each_nextParamStr(fiobj_value: fio.FIOBJ, context: ?*anyopaque) callconv(.C) c_int { const ctx: *_parametersToOwnedStrSliceContext = @as(*_parametersToOwnedStrSliceContext, @ptrCast(@alignCast(context))); // this is thread-safe, guaranteed by fio - var fiobj_key: fio.FIOBJ = fio.fiobj_hash_key_in_loop(); + const fiobj_key: fio.FIOBJ = fio.fiobj_hash_key_in_loop(); ctx.params.append(.{ .key = util.fio2strAllocOrNot(fiobj_key, ctx.allocator, ctx.always_alloc) catch |err| { ctx.last_error = err; @@ -467,7 +467,7 @@ pub const SimpleRequest = struct { fn _each_nextParam(fiobj_value: fio.FIOBJ, context: ?*anyopaque) callconv(.C) c_int { const ctx: *_parametersToOwnedSliceContext = @as(*_parametersToOwnedSliceContext, @ptrCast(@alignCast(context))); // this is thread-safe, guaranteed by fio - var fiobj_key: fio.FIOBJ = fio.fiobj_hash_key_in_loop(); + const fiobj_key: fio.FIOBJ = fio.fiobj_hash_key_in_loop(); ctx.params.append(.{ .key = util.fio2strAllocOrNot(fiobj_key, ctx.allocator, ctx.dupe_strings) catch |err| { ctx.last_error = err; @@ -845,7 +845,7 @@ pub const SimpleHttpListener = struct { ._is_finished_request_global = false, ._user_context = undefined, }; - var zigtarget: []u8 = target[0..target_len]; + const zigtarget: []u8 = target[0..target_len]; req._is_finished = &req._is_finished_request_global; var user_context: SimpleRequest.UserContext = .{}; @@ -871,7 +871,7 @@ pub const SimpleHttpListener = struct { pfolder = pf.ptr; } - var x: fio.http_settings_s = .{ + const x: fio.http_settings_s = .{ .on_request = if (self.settings.on_request) |_| Self.theOneAndOnlyRequestCallBack else null, .on_upgrade = if (self.settings.on_upgrade) |_| Self.theOneAndOnlyUpgradeCallBack else null, .on_response = if (self.settings.on_response) |_| Self.theOneAndOnlyResponseCallBack else null, @@ -905,7 +905,7 @@ pub const SimpleHttpListener = struct { // const result = try bufPrint(buf, fmt ++ "\x00", args); // return result[0 .. result.len - 1 :0]; // } - var ret = fio.http_listen(printed_port.ptr, self.settings.interface, x); + const ret = fio.http_listen(printed_port.ptr, self.settings.interface, x); if (ret == -1) { return error.ListenError; } @@ -950,7 +950,7 @@ pub fn listen(port: [*c]const u8, interface: [*c]const u8, settings: ListenSetti pfolder_len = pf.len; pfolder = pf.ptr; } - var x: fio.http_settings_s = .{ + const x: fio.http_settings_s = .{ .on_request = settings.on_request, .on_upgrade = settings.on_upgrade, .on_response = settings.on_response, diff --git a/tools/announceybot.zig b/tools/announceybot.zig index b7c415a..071085e 100644 --- a/tools/announceybot.zig +++ b/tools/announceybot.zig @@ -182,7 +182,7 @@ fn sendToDiscordPart(allocator: std.mem.Allocator, url: []const u8, message_json fn sendToDiscord(allocator: std.mem.Allocator, url: []const u8, message: []const u8) !void { // json payload // max size: 100kB - var buf: []u8 = try allocator.alloc(u8, 100 * 1024); + const buf: []u8 = try allocator.alloc(u8, 100 * 1024); defer allocator.free(buf); var fba = std.heap.FixedBufferAllocator.init(buf); var string = std.ArrayList(u8).init(fba.allocator()); @@ -399,7 +399,7 @@ fn command_update_readme(allocator: std.mem.Allocator, tag: []const u8) !void { // we need to put the \n back in. // TODO: change this by using some "search" iterator that just // returns indices etc - var output_line = try std.fmt.allocPrint(allocator, "{s}\n", .{line}); + const output_line = try std.fmt.allocPrint(allocator, "{s}\n", .{line}); defer allocator.free(output_line); _ = try writer.write(output_line); } diff --git a/wrk/zigstd/main.zig b/wrk/zigstd/main.zig index 8c26ce9..0231718 100644 --- a/wrk/zigstd/main.zig +++ b/wrk/zigstd/main.zig @@ -4,7 +4,7 @@ pub fn main() !void { var gpa = std.heap.GeneralPurposeAllocator(.{ .thread_safe = true, }){}; - var allocator = gpa.allocator(); + const allocator = gpa.allocator(); var server = std.http.Server.init(allocator, .{ .reuse_address = true, From 34431067a9b28904ff059d83506a33a1d42edf87 Mon Sep 17 00:00:00 2001 From: Ed Yu Date: Fri, 15 Dec 2023 14:15:32 -0800 Subject: [PATCH 5/6] Change std.mem.copy to @memcpy due to zig 0.12.0 change --- examples/endpoint/users.zig | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/examples/endpoint/users.zig b/examples/endpoint/users.zig index 75c114e..2ab7a17 100644 --- a/examples/endpoint/users.zig +++ b/examples/endpoint/users.zig @@ -41,12 +41,12 @@ pub fn addByName(self: *Self, first: ?[]const u8, last: ?[]const u8) !usize { user.lastnamelen = 0; if (first) |firstname| { - std.mem.copy(u8, user.firstnamebuf[0..], firstname); + @memcpy(user.firstnamebuf[0..firstname.len], firstname); user.firstnamelen = firstname.len; } if (last) |lastname| { - std.mem.copy(u8, user.lastnamebuf[0..], lastname); + @memcpy(user.lastnamebuf[0..lastname.len], lastname); user.lastnamelen = lastname.len; } @@ -101,11 +101,11 @@ pub fn update( pUser.firstnamelen = 0; pUser.lastnamelen = 0; if (first) |firstname| { - std.mem.copy(u8, pUser.firstnamebuf[0..], firstname); + @memcpy(pUser.firstnamebuf[0..firstname.len], firstname); pUser.firstnamelen = firstname.len; } if (last) |lastname| { - std.mem.copy(u8, pUser.lastnamebuf[0..], lastname); + @memcpy(pUser.lastnamebuf[0..lastname.len], lastname); pUser.lastnamelen = lastname.len; } } From 60c910f0963e953fb0c670ad2d571e50ea592d4a Mon Sep 17 00:00:00 2001 From: Ed Yu Date: Fri, 15 Dec 2023 14:22:44 -0800 Subject: [PATCH 6/6] Update pkghash to use the new fs.dir changes --- build.zig | 4 ++-- tools/pkghash.zig | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/build.zig b/build.zig index 5e7d5c7..9eb60b4 100644 --- a/build.zig +++ b/build.zig @@ -82,7 +82,7 @@ pub fn build(b: *std.build.Builder) !void { const example_run_step = b.step(ex_run_stepname, ex_run_stepdesc); const example_step = b.step(ex_name, ex_build_desc); - var example = b.addExecutable(.{ + const example = b.addExecutable(.{ .name = ex_name, .root_source_file = .{ .path = ex_src }, .target = target, @@ -206,7 +206,7 @@ pub fn build(b: *std.build.Builder) !void { .target = target, .optimize = optimize, }); - var pkghash_step = b.step("pkghash", "Build pkghash"); + const pkghash_step = b.step("pkghash", "Build pkghash"); const pkghash_build_step = b.addInstallArtifact(pkghash_exe, .{}); pkghash_step.dependOn(&pkghash_build_step.step); all_step.dependOn(&pkghash_build_step.step); diff --git a/tools/pkghash.zig b/tools/pkghash.zig index 61d4009..805206a 100644 --- a/tools/pkghash.zig +++ b/tools/pkghash.zig @@ -266,8 +266,8 @@ pub fn cmdPkg(gpa: Allocator, arena: Allocator, args: []const []const u8) !void // computePackageHash will close the directory after completion // std.debug.print("abspath: {s}\n", .{cwd_absolute_path}); - var cwd_copy = try fs.openIterableDirAbsolute(cwd_absolute_path, .{}); - errdefer cwd_copy.dir.close(); + var cwd_copy = try fs.openDirAbsolute(cwd_absolute_path, .{}); + errdefer cwd_copy.close(); var thread_pool: ThreadPool = undefined; try thread_pool.init(.{ .allocator = gpa }); @@ -281,7 +281,7 @@ pub fn cmdPkg(gpa: Allocator, arena: Allocator, args: []const []const u8) !void }; break :blk try computePackageHashExcludingDirectories( &thread_pool, - .{ .dir = cwd_copy.dir }, + cwd_copy, excluded_directories, ); }; @@ -355,7 +355,7 @@ fn isExecutable(file: fs.File) !bool { pub fn computePackageHashExcludingDirectories( thread_pool: *ThreadPool, - pkg_dir: fs.IterableDir, + pkg_dir: fs.Dir, excluded_directories: []const []const u8, ) ![Manifest.Hash.digest_length]u8 { const gpa = thread_pool.allocator; @@ -405,7 +405,7 @@ pub fn computePackageHashExcludingDirectories( .failure = undefined, // to be populated by the worker }; wait_group.start(); - try thread_pool.spawn(workerHashFile, .{ pkg_dir.dir, hashed_file, &wait_group }); + try thread_pool.spawn(workerHashFile, .{ pkg_dir, hashed_file, &wait_group }); try all_files.append(hashed_file); }