From e2f17868a57e08c5d3ea56556bd87c56e949d3d7 Mon Sep 17 00:00:00 2001 From: Techatrix Date: Tue, 14 Apr 2026 20:36:10 +0200 Subject: [PATCH 1/3] update usage of array hash map --- examples/hello_server.zig | 2 +- src/codegen/codegen.zig | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/examples/hello_server.zig b/examples/hello_server.zig index 672875a..22ffc8c 100644 --- a/examples/hello_server.zig +++ b/examples/hello_server.zig @@ -42,7 +42,7 @@ pub fn main(init: std.process.Init) !void { const transport: *lsp.Transport = &stdio_transport.transport; // keep track of opened documents - var documents: std.StringArrayHashMapUnmanaged([]const u8) = .empty; + var documents: std.array_hash_map.String([]const u8) = .empty; defer { for (documents.keys()) |uri| gpa.free(uri); for (documents.values()) |source| gpa.free(source); diff --git a/src/codegen/codegen.zig b/src/codegen/codegen.zig index 2de8b17..a726630 100644 --- a/src/codegen/codegen.zig +++ b/src/codegen/codegen.zig @@ -207,11 +207,11 @@ const Symbol = union(enum) { }; const SymbolTree = struct { - root: std.StringArrayHashMapUnmanaged(Node) = .empty, + root: std.array_hash_map.String(Node) = .empty, const Node = struct { symbol: Symbol, - children: std.StringArrayHashMapUnmanaged(Node) = .empty, + children: std.array_hash_map.String(Node) = .empty, fn deinit( node: *Node, @@ -258,7 +258,7 @@ const SymbolTree = struct { fn dumpNode( l: *@This(), - children: std.StringArrayHashMapUnmanaged(Node), + children: std.array_hash_map.String(Node), writer: *std.Io.Writer, ) error{WriteFailed}!void { for (children.keys(), children.values(), 0..) |name, child_node, i| { @@ -292,7 +292,7 @@ const Renderer = struct { const Scope = struct { name: ?[]const u8, - symbols: std.StringArrayHashMapUnmanaged(SymbolTree.Node), + symbols: std.array_hash_map.String(SymbolTree.Node), }; fn renderNode(r: *Renderer, node: *const SymbolTree.Node, name: []const u8) error{WriteFailed}!void { @@ -461,7 +461,7 @@ const Renderer = struct { fn renderType( r: *Renderer, ty: MetaModel.Type, - children: std.StringArrayHashMapUnmanaged(SymbolTree.Node), + children: std.array_hash_map.String(SymbolTree.Node), ) error{WriteFailed}!void { switch (ty) { .@"and", .@"or" => {}, @@ -653,7 +653,7 @@ const Renderer = struct { const FormatType = struct { r: *Renderer, ty: MetaModel.Type, - children: std.StringArrayHashMapUnmanaged(SymbolTree.Node) = .empty, + children: std.array_hash_map.String(SymbolTree.Node) = .empty, pub fn format( ctx: FormatType, @@ -798,7 +798,7 @@ fn constructSymbolTree( arena: std.mem.Allocator, meta_model: *const MetaModel, ) error{OutOfMemory}!SymbolTree { - var symbols: std.StringArrayHashMapUnmanaged(Symbol) = .empty; + var symbols: std.array_hash_map.String(Symbol) = .empty; defer symbols.deinit(gpa); try symbols.ensureTotalCapacity( @@ -1015,7 +1015,7 @@ fn renderMetaModel(gpa: std.mem.Allocator, meta_model: *MetaModel) error{ OutOfM } { - var original_symbol_names: std.StringArrayHashMapUnmanaged(void) = .empty; + var original_symbol_names: std.array_hash_map.String(void) = .empty; defer original_symbol_names.deinit(gpa); try original_symbol_names.ensureTotalCapacity(gpa, meta_model.structures.len + meta_model.enumerations.len + meta_model.typeAliases.len); for (meta_model.structures) |structure| original_symbol_names.putAssumeCapacityNoClobber(structure.name, {}); From c9be22de9b5b304f20718228e1ff47115dfd9358 Mon Sep 17 00:00:00 2001 From: Techatrix Date: Tue, 14 Apr 2026 20:27:38 +0200 Subject: [PATCH 2/3] update .gitignore --- .gitignore | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 44dd9fa..36addef 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,3 @@ .zig-cache zig-out - -zig-cache +zig-pkg From 89d58a34b24ee1860b4944efcc700465eb4ff63b Mon Sep 17 00:00:00 2001 From: Techatrix Date: Tue, 14 Apr 2026 20:33:12 +0200 Subject: [PATCH 3/3] update to zig `0.16.0` --- .github/workflows/gh-pages.yml | 2 +- .github/workflows/main.yml | 2 +- README.md | 2 +- build.zig.zon | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/gh-pages.yml b/.github/workflows/gh-pages.yml index 6bd5281..3379b4e 100644 --- a/.github/workflows/gh-pages.yml +++ b/.github/workflows/gh-pages.yml @@ -32,7 +32,7 @@ jobs: - name: Setup Zig uses: mlugg/setup-zig@v2 with: - version: master + version: 0.16.0 - name: Generate Documentation run: zig build docs --summary all diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 23b2d1d..d952da8 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -23,7 +23,7 @@ jobs: - name: Setup Zig uses: mlugg/setup-zig@v2 with: - version: master + version: 0.16.0 - name: Setup kcov if: github.repository_owner == 'zigtools' && matrix.os == 'ubuntu-22.04' diff --git a/README.md b/README.md index 79802a0..0f3f249 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ Provides the necessary building blocks to develop Language Server Protocol imple # Installation > [!NOTE] -> The default branch requires Zig `0.16.0-dev.2736+3b515fbed` or later. Checkout the `0.15.x` branch when using Zig 0.15 +> The default branch requires Zig `0.16.0` or later. ```bash # Initialize a `zig build` project if you haven't already diff --git a/build.zig.zon b/build.zig.zon index 4f16397..c4e1424 100644 --- a/build.zig.zon +++ b/build.zig.zon @@ -1,7 +1,7 @@ .{ .name = .lsp_kit, .version = "0.1.0", - .minimum_zig_version = "0.16.0-dev.2736+3b515fbed", + .minimum_zig_version = "0.16.0", .dependencies = .{}, .paths = .{ "build.zig",