Skip to content

Commit bf6ceab

Browse files
authored
Merge pull request #2643 from zigtools/techatrix/update-zig
update to Zig `0.16.0-dev.2736+3b515fbed`
2 parents 57da2a2 + 87c552f commit bf6ceab

7 files changed

Lines changed: 19 additions & 17 deletions

File tree

.github/workflows/prepare_release_payload.zig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ pub fn main() !void {
1313
const arena = arena_allocator.allocator();
1414

1515
var threaded: std.Io.Threaded = .init_single_threaded;
16-
const io = threaded.ioBasic();
16+
const io = threaded.io();
1717

1818
const metadata_source = try std.Io.Dir.cwd().readFileAlloc(io, "zig-out/release.json", arena, .limited(std.math.maxInt(u32)));
1919
const artifacts_dir = try std.Io.Dir.cwd().openDir(io, "zig-out/artifacts", .{ .iterate = true });

build.zig

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ const zls_version = std.SemanticVersion.parse(@import("build.zig.zon").version)
66
const minimum_build_zig_version = @import("build.zig.zon").minimum_zig_version;
77

88
/// Specify the minimum Zig version that is usable with ZLS:
9-
/// rework fuzz testing to be smith based
9+
/// std.Io: move netReceive to become an Operation
1010
///
1111
/// A breaking change to the Zig Build System should be handled by updating ZLS's build runner (see src\build_runner)
12-
const minimum_runtime_zig_version = "0.16.0-dev.2669+e0173c2ce";
12+
const minimum_runtime_zig_version = "0.16.0-dev.2736+3b515fbed";
1313

1414
const release_targets = [_]std.Target.Query{
1515
.{ .cpu_arch = .aarch64, .os_tag = .linux },

build.zig.zon

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
// nix flake update --commit-lock-file
1111
// ```
1212
// If you do not use Nix, a ZLS maintainer can take care of this.
13-
.minimum_zig_version = "0.16.0-dev.2676+4e2cec265",
13+
.minimum_zig_version = "0.16.0-dev.2736+3b515fbed",
1414
// If you do not use Nix, a ZLS maintainer can take care of this.
1515
// Whenever the dependencies are updated, run the following command:
1616
// ```bash
@@ -27,8 +27,8 @@
2727
.hash = "diffz-0.0.1-G2tlIYrNAQAQx3cuIp7EVs0xvxbv9DCPf4YuHmvubsrZ",
2828
},
2929
.lsp_kit = .{
30-
.url = "https://github.com/zigtools/lsp-kit/archive/7b03f0b6801babffe76608cf3db59793902a21d6.tar.gz",
31-
.hash = "lsp_kit-0.1.0-bi_PLw8zDABvCWe2rD4Aqb9gx0sRXBKO0a7M0vg3AbR3",
30+
.url = "git+https://github.com/zigtools/lsp-kit.git#98d6bed6e42a0866e1e2ba0867673d9f57ca6687",
31+
.hash = "lsp_kit-0.1.0-bi_PLwozDAApVpvVJHz80NPklig5biWlZCkyxjFbOtiD",
3232
},
3333
.tracy = .{
3434
.url = "https://github.com/wolfpld/tracy/archive/refs/tags/v0.13.1.tar.gz",

deps.nix

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@ linkFarm "zig-packages" [
1818
};
1919
}
2020
{
21-
name = "lsp_kit-0.1.0-bi_PLw8zDABvCWe2rD4Aqb9gx0sRXBKO0a7M0vg3AbR3";
21+
name = "lsp_kit-0.1.0-bi_PLwozDAApVpvVJHz80NPklig5biWlZCkyxjFbOtiD";
2222
path = fetchzip {
23-
url = "https://github.com/zigtools/lsp-kit/archive/7b03f0b6801babffe76608cf3db59793902a21d6.tar.gz";
24-
hash = "sha256-CjWrp8fERKS5VldRvYtDFk1g4heIkX4YrpLw/eC12Q4=";
23+
url = "https://github.com/zigtools/lsp-kit/archive/98d6bed6e42a0866e1e2ba0867673d9f57ca6687.tar.gz";
24+
hash = "sha256-/p/AknpFGicfOhpsvyqCNHxeVNVBoiXWh6ctKTwStCM=";
2525
};
2626
}
2727
# workaround: https://codeberg.org/ziglang/zig/issues/31162

flake.lock

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/build_runner/build_runner.zig

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ pub const dependencies = @import("@dependencies");
4141
pub const std_options: std.Options = .{
4242
.side_channels_mitigations = .none,
4343
.http_disable_tls = true,
44+
.networking = false,
4445
};
4546

4647
pub fn main(init: process.Init.Minimal) !void {
@@ -55,7 +56,7 @@ pub fn main(init: process.Init.Minimal) !void {
5556
.argv0 = .init(init.args),
5657
});
5758
defer threaded.deinit();
58-
const io = threaded.ioBasic();
59+
const io = threaded.io();
5960

6061
// ...but we'll back our arena by `std.heap.page_allocator` for efficiency.
6162
var arena_instance: std.heap.ArenaAllocator = .init(std.heap.page_allocator);

src/main.zig

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ pub const std_options: std.Options = .{
3737
// value in logFn itself
3838
.log_level = .debug,
3939
.logFn = logFn,
40+
.networking = false,
4041
};
4142

4243
/// Log messages with the LSP 'window/logMessage' message.
@@ -540,7 +541,7 @@ pub fn main(init: std.process.Init.Minimal) !u8 {
540541
.argv0 = .init(init.args),
541542
});
542543
defer threaded.deinit();
543-
const io = threaded.ioBasic();
544+
const io = threaded.io();
544545

545546
var environ_map = try init.environ.createMap(allocator);
546547
defer environ_map.deinit();

0 commit comments

Comments
 (0)