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.

Sign up for GitHub

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

transition from tres to std.json #1321

Merged
merged 2 commits into from
Jul 13, 2023
Merged

transition from tres to std.json #1321

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
defac32
remove dependency on tres
Techatrix Jul 13, 2023
ba74e05
work around zig bug https://github.com/ziglang/zig/issues/16392
Techatrix Jul 13, 2023
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
6 changes: 0 additions & 6 deletions build.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,9 +83,6 @@ pub fn build(b: *std.build.Builder) !void {
const known_folders_module = b.dependency("known_folders", .{}).module("known-folders");
exe.addModule("known-folders", known_folders_module);

const tres_module = b.dependency("tres", .{}).module("tres");
exe.addModule("tres", tres_module);

const diffz_module = b.dependency("diffz", .{}).module("diffz");
exe.addModule("diffz", diffz_module);

Expand Down Expand Up @@ -121,7 +118,6 @@ pub fn build(b: *std.build.Builder) !void {
.source_file = .{ .path = "src/zls.zig" },
.dependencies = &.{
.{ .name = "known-folders", .module = known_folders_module },
.{ .name = "tres", .module = tres_module },
.{ .name = "diffz", .module = diffz_module },
.{ .name = "binned_allocator", .module = binned_allocator_module },
.{ .name = "build_options", .module = build_options_module },
Expand All @@ -132,7 +128,6 @@ pub fn build(b: *std.build.Builder) !void {
.name = "zls_gen",
.root_source_file = .{ .path = "src/config_gen/config_gen.zig" },
});
gen_exe.addModule("tres", tres_module);

const gen_cmd = b.addRunArtifact(gen_exe);
gen_cmd.addArgs(&.{
Expand All @@ -157,7 +152,6 @@ pub fn build(b: *std.build.Builder) !void {
});

tests.addModule("zls", zls_module);
tests.addModule("tres", tres_module);
tests.addModule("diffz", diffz_module);
tests.addModule("binned_allocator", binned_allocator_module);
test_step.dependOn(&b.addRunArtifact(tests).step);
Expand Down
4 changes: 0 additions & 4 deletions build.zig.zon
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,6 @@
.url = "https://github.com/ziglibs/known-folders/archive/d070896807cbbd2847d24d561438994504b929dd.tar.gz",
.hash = "122001a81a0ba2faca0271d53c50e8069721fe66a19d71dd8498e61fa26d7ca6f558",
},
.tres = .{
.url = "https://github.com/ziglibs/tres/archive/9ca9cd547d10d30984565399dec92068fefd7ad2.tar.gz",
.hash = "122026823fb890736435cb5ddbfdf5691d4b9d4759ab1147f245beced0abec17c483",
},
.diffz = .{
.url = "https://github.com/ziglibs/diffz/archive/90353d401c59e2ca5ed0abe5444c29ad3d7489aa.tar.gz",
.hash = "122089a8247a693cad53beb161bde6c30f71376cd4298798d45b32740c3581405864",
Expand Down
2 changes: 0 additions & 2 deletions src/Config.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,6 @@ semantic_tokens: enum {
none,
partial,
full,

pub const tres_string_enum = true;
} = .full,

/// Enables inlay hint support when the client also supports it
Expand Down
Loading