1
0
Fork 0
mirror of https://github.com/zigzap/zap.git synced 2025-10-20 23:24:09 +00:00

Merge pull request #27 from edyu/master

Revert Context changes in middleware_with_endpoint by fixing middlewa…
This commit is contained in:
Rene Schallner 2023-06-23 07:45:00 +02:00 committed by GitHub
commit 91de9aec99
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions

View file

@ -20,10 +20,10 @@ const SharedAllocator = struct {
};
// create a combined context struct
const Context = struct {
user: ?UserMiddleWare.User = null,
session: ?SessionMiddleWare.Session = null,
};
const Context = zap.Middleware.MixContexts(.{
.{ .name = "?user", .type = UserMiddleWare.User },
.{ .name = "?session", .type = SessionMiddleWare.Session },
});
// we create a Handler type based on our Context
const Handler = zap.Middleware.Handler(Context);

View file

@ -22,7 +22,7 @@ pub fn MixContexts(comptime context_tuple: anytype) type {
fields[i] = .{
.name = fieldName,
.type = fieldType,
.default_value = if (isOptional) &null else null,
.default_value = if (isOptional) &@as(fieldType, null) else null,
.is_comptime = false,
.alignment = 0,
};