From 43b69939424235e66f823bba1223ccbfcebbf6b2 Mon Sep 17 00:00:00 2001 From: dweiller <4678790+dweiller@users.noreply.github.com> Date: Fri, 5 Apr 2024 15:13:44 +1100 Subject: [PATCH] update for @fieldParentPointer RLS change --- examples/endpoint/userweb.zig | 8 ++++---- examples/middleware/middleware.zig | 6 +++--- .../middleware_with_endpoint.zig | 6 +++--- src/endpoint.zig | 12 ++++++------ src/middleware.zig | 2 +- src/zap.zig | 2 +- 6 files changed, 18 insertions(+), 18 deletions(-) diff --git a/examples/endpoint/userweb.zig b/examples/endpoint/userweb.zig index be6c06b2..495a5867 100644 --- a/examples/endpoint/userweb.zig +++ b/examples/endpoint/userweb.zig @@ -54,7 +54,7 @@ fn userIdFromPath(self: *Self, path: []const u8) ?usize { } fn getUser(e: *zap.Endpoint, r: zap.Request) void { - const self = @fieldParentPtr(Self, "ep", e); + const self: *Self = @fieldParentPtr("ep", e); if (r.path) |path| { // /users if (path.len == e.settings.path.len) { @@ -81,7 +81,7 @@ fn listUsers(self: *Self, r: zap.Request) void { } fn postUser(e: *zap.Endpoint, r: zap.Request) void { - const self = @fieldParentPtr(Self, "ep", e); + const self: *Self = @fieldParentPtr("ep", e); if (r.body) |body| { const maybe_user: ?std.json.Parsed(User) = std.json.parseFromSlice(User, self.alloc, body, .{}) catch null; if (maybe_user) |u| { @@ -100,7 +100,7 @@ fn postUser(e: *zap.Endpoint, r: zap.Request) void { } fn putUser(e: *zap.Endpoint, r: zap.Request) void { - const self = @fieldParentPtr(Self, "ep", e); + const self: *Self = @fieldParentPtr("ep", e); if (r.path) |path| { if (self.userIdFromPath(path)) |id| { if (self._users.get(id)) |_| { @@ -126,7 +126,7 @@ fn putUser(e: *zap.Endpoint, r: zap.Request) void { } fn deleteUser(e: *zap.Endpoint, r: zap.Request) void { - const self = @fieldParentPtr(Self, "ep", e); + const self: *Self = @fieldParentPtr("ep", e); if (r.path) |path| { if (self.userIdFromPath(path)) |id| { var jsonbuf: [128]u8 = undefined; diff --git a/examples/middleware/middleware.zig b/examples/middleware/middleware.zig index 189e6f27..776a930d 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.Request, context: *Context) bool { // this is how we would get our self pointer - const self = @fieldParentPtr(Self, "handler", handler); + const self: *Self = @fieldParentPtr("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.Request, context: *Context) bool { // this is how we would get our self pointer - const self = @fieldParentPtr(Self, "handler", handler); + const self: *Self = @fieldParentPtr("handler", handler); _ = self; context.session = Session{ @@ -151,7 +151,7 @@ const HtmlMiddleWare = struct { pub fn onRequest(handler: *Handler, r: zap.Request, context: *Context) bool { // this is how we would get our self pointer - const self = @fieldParentPtr(Self, "handler", handler); + const self: *Self = @fieldParentPtr("handler", handler); _ = self; std.debug.print("\n\nHtmlMiddleware: handling request with context: {any}\n\n", .{context}); diff --git a/examples/middleware_with_endpoint/middleware_with_endpoint.zig b/examples/middleware_with_endpoint/middleware_with_endpoint.zig index 60b48e52..543600c7 100644 --- a/examples/middleware_with_endpoint/middleware_with_endpoint.zig +++ b/examples/middleware_with_endpoint/middleware_with_endpoint.zig @@ -60,7 +60,7 @@ const UserMiddleWare = struct { pub fn onRequest(handler: *Handler, r: zap.Request, context: *Context) bool { // this is how we would get our self pointer - const self = @fieldParentPtr(Self, "handler", handler); + const self: *Self = @fieldParentPtr("handler", handler); _ = self; // do our work: fill in the user field of the context @@ -105,7 +105,7 @@ const SessionMiddleWare = struct { // note that the first parameter is of type *Handler, not *Self !!! pub fn onRequest(handler: *Handler, r: zap.Request, context: *Context) bool { // this is how we would get our self pointer - const self = @fieldParentPtr(Self, "handler", handler); + const self: *Self = @fieldParentPtr("handler", handler); _ = self; context.session = Session{ @@ -155,7 +155,7 @@ const HtmlEndpoint = struct { } pub fn get(ep: *zap.Endpoint, r: zap.Request) void { - const self = @fieldParentPtr(Self, "ep", ep); + const self: *Self = @fieldParentPtr("ep", ep); _ = self; var buf: [1024]u8 = undefined; diff --git a/src/endpoint.zig b/src/endpoint.zig index c4ba86bf..07cecc95 100644 --- a/src/endpoint.zig +++ b/src/endpoint.zig @@ -112,7 +112,7 @@ pub fn Authenticating(comptime Authenticator: type) type { /// GET: here, the auth_endpoint will be passed in as endpoint. /// Authenticates GET requests using the Authenticator. pub fn get(e: *Endpoint, r: zap.Request) void { - const authEp: *Self = @fieldParentPtr(Self, "auth_endpoint", e); + const authEp: *Self = @fieldParentPtr("auth_endpoint", e); switch (authEp.authenticator.authenticateRequest(&r)) { .AuthFailed => { if (e.settings.unauthorized) |unauthorized| { @@ -132,7 +132,7 @@ pub fn Authenticating(comptime Authenticator: type) type { /// POST: here, the auth_endpoint will be passed in as endpoint. /// Authenticates POST requests using the Authenticator. pub fn post(e: *Endpoint, r: zap.Request) void { - const authEp: *Self = @fieldParentPtr(Self, "auth_endpoint", e); + const authEp: *Self = @fieldParentPtr("auth_endpoint", e); switch (authEp.authenticator.authenticateRequest(&r)) { .AuthFailed => { if (e.settings.unauthorized) |unauthorized| { @@ -152,7 +152,7 @@ pub fn Authenticating(comptime Authenticator: type) type { /// PUT: here, the auth_endpoint will be passed in as endpoint. /// Authenticates PUT requests using the Authenticator. pub fn put(e: *Endpoint, r: zap.Request) void { - const authEp: *Self = @fieldParentPtr(Self, "auth_endpoint", e); + const authEp: *Self = @fieldParentPtr("auth_endpoint", e); switch (authEp.authenticator.authenticateRequest(&r)) { .AuthFailed => { if (e.settings.unauthorized) |unauthorized| { @@ -172,7 +172,7 @@ pub fn Authenticating(comptime Authenticator: type) type { /// DELETE: here, the auth_endpoint will be passed in as endpoint. /// Authenticates DELETE requests using the Authenticator. pub fn delete(e: *Endpoint, r: zap.Request) void { - const authEp: *Self = @fieldParentPtr(Self, "auth_endpoint", e); + const authEp: *Self = @fieldParentPtr("auth_endpoint", e); switch (authEp.authenticator.authenticateRequest(&r)) { .AuthFailed => { if (e.settings.unauthorized) |unauthorized| { @@ -192,7 +192,7 @@ pub fn Authenticating(comptime Authenticator: type) type { /// PATCH: here, the auth_endpoint will be passed in as endpoint. /// Authenticates PATCH requests using the Authenticator. pub fn patch(e: *Endpoint, r: zap.Request) void { - const authEp: *Self = @fieldParentPtr(Self, "auth_endpoint", e); + const authEp: *Self = @fieldParentPtr("auth_endpoint", e); switch (authEp.authenticator.authenticateRequest(&r)) { .AuthFailed => { if (e.settings.unauthorized) |unauthorized| { @@ -212,7 +212,7 @@ pub fn Authenticating(comptime Authenticator: type) type { /// OPTIONS: here, the auth_endpoint will be passed in as endpoint. /// Authenticates OPTIONS requests using the Authenticator. pub fn options(e: *Endpoint, r: zap.Request) void { - const authEp: *Self = @fieldParentPtr(Self, "auth_endpoint", e); + const authEp: *Self = @fieldParentPtr("auth_endpoint", e); switch (authEp.authenticator.authenticateRequest(&r)) { .AuthFailed => { if (e.settings.unauthorized) |unauthorized| { diff --git a/src/middleware.zig b/src/middleware.zig index 8862c1ce..91b3da36 100644 --- a/src/middleware.zig +++ b/src/middleware.zig @@ -82,7 +82,7 @@ pub fn EndpointHandler(comptime HandlerType: anytype, comptime ContextType: anyt /// If `breakOnFinish` is `true`, the handler will stop handing requests down the chain if /// the endpoint processed the request. pub fn onRequest(handler: *HandlerType, r: zap.Request, context: *ContextType) bool { - var self = @fieldParentPtr(Self, "handler", handler); + const self: *Self = @fieldParentPtr("handler", handler); r.setUserContext(context); self.endpoint.onRequest(r); diff --git a/src/zap.zig b/src/zap.zig index 0414d68c..b8ab2895 100644 --- a/src/zap.zig +++ b/src/zap.zig @@ -43,7 +43,7 @@ pub const Tls = @import("tls.zig"); /// } /// /// fn get(e: *zap.Endpoint, r: zap.Request) void { -/// const self: *StopEndpoint = @fieldParentPtr(StopEndpoint, "ep", e); +/// const self: *StopEndpoint = @fieldParentPtr("ep", e); /// _ = self; /// _ = r; /// zap.stop();