From a886ecddd98b5fd1134b9007a1d62e598a69b549 Mon Sep 17 00:00:00 2001 From: Alexandros Naskos Date: Mon, 15 Feb 2021 12:04:22 +0200 Subject: [PATCH] Fixed for zig master --- src/requests.zig | 2 +- src/semantic_tokens.zig | 15 ++++++++++++--- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/src/requests.zig b/src/requests.zig index 47e83fe..80a2e42 100644 --- a/src/requests.zig +++ b/src/requests.zig @@ -23,7 +23,7 @@ fn Transform(comptime Original: type, comptime transform_fn: anytype) type { }; } -inline fn fromDynamicTreeInternal(arena: *std.heap.ArenaAllocator, value: std.json.Value, out: anytype) error{ MalformedJson, OutOfMemory }!void { +fn fromDynamicTreeInternal(arena: *std.heap.ArenaAllocator, value: std.json.Value, out: anytype) error{ MalformedJson, OutOfMemory }!void { const T = comptime std.meta.Child(@TypeOf(out)); if (comptime std.meta.trait.is(.Struct)(T)) { diff --git a/src/semantic_tokens.zig b/src/semantic_tokens.zig index cfcffc3..85f6bef 100644 --- a/src/semantic_tokens.zig +++ b/src/semantic_tokens.zig @@ -43,7 +43,7 @@ pub const TokenModifiers = packed struct { return res; } - inline fn set(self: *TokenModifiers, comptime field: []const u8) void { + fn set(self: *TokenModifiers, comptime field: []const u8) callconv(.Inline) void { @field(self, field) = true; } }; @@ -88,11 +88,20 @@ const Builder = struct { } }; -inline fn writeToken(builder: *Builder, token_idx: ?ast.TokenIndex, tok_type: TokenType) !void { +fn writeToken( + builder: *Builder, + token_idx: ?ast.TokenIndex, + tok_type: TokenType, +) callconv(.Inline) !void { return try writeTokenMod(builder, token_idx, tok_type, .{}); } -inline fn writeTokenMod(builder: *Builder, token_idx: ?ast.TokenIndex, tok_type: TokenType, tok_mod: TokenModifiers) !void { +fn writeTokenMod( + builder: *Builder, + token_idx: ?ast.TokenIndex, + tok_type: TokenType, + tok_mod: TokenModifiers, +) callconv(.Inline) !void { if (token_idx) |ti| { try builder.add(ti, tok_type, tok_mod); }