Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix compatibility with latest zig version #2172

Merged
merged 3 commits into from
Feb 6, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions build.zig
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ const builtin = @import("builtin");
const zls_version: std.SemanticVersion = .{ .major = 0, .minor = 14, .patch = 0, .pre = "dev" };

/// Specify the minimum Zig version that is required to compile and test ZLS:
/// std.builtin.Type renames, and make it easier to modify std.builtin
/// compiler,std: implement ZON support
///
/// If you do not use Nix, a ZLS maintainer can take care of this.
/// Whenever this version is increased, run the following command:
Expand All @@ -15,7 +15,7 @@ const zls_version: std.SemanticVersion = .{ .major = 0, .minor = 14, .patch = 0,
/// ```
///
/// Also update the `minimum_zig_version` in `build.zig.zon`.
const minimum_build_zig_version = "0.14.0-dev.2801+4d8c24c6c";
const minimum_build_zig_version = "0.14.0-dev.3042+317722b37";

/// Specify the minimum Zig version that is required to run ZLS:
/// std.Build: add new functions to create artifacts/Step.Compile from existing module
Expand Down
2 changes: 1 addition & 1 deletion build.zig.zon
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
.version = "0.14.0-dev",
// Must be kept in line with the `minimum_build_zig_version` in `build.zig`.
// Should be a Zig version that is downloadable from https://ziglang.org/download/ or a mirror.
.minimum_zig_version = "0.14.0-dev.2802+257054a14",
.minimum_zig_version = "0.14.0-dev.3046+08d661fcf",
// If you do not use Nix, a ZLS maintainer can take care of this.
// Whenever the dependencies are updated, run the following command:
// ```bash
Expand Down
12 changes: 6 additions & 6 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/DocumentStore.zig
Original file line number Diff line number Diff line change
Expand Up @@ -486,7 +486,7 @@ pub const Handle = struct {
const tracy_zone_inner = tracy.traceNamed(@src(), "ZonGen.generate");
defer tracy_zone_inner.end();

var zoir = try std.zig.ZonGen.generate(self.impl.allocator, self.tree);
var zoir = try std.zig.ZonGen.generate(self.impl.allocator, self.tree, .{});
errdefer zoir.deinit(self.impl.allocator);

self.impl.zoir = zoir;
Expand Down