Remove some backwards compatibility code when targeting 0.16.x #137 (#139)

The plan is to stop supporting compatibility this way (at least while
0.x) as its adds complexity I want to avoid while maintaining support
and zig isn't even 1.x yet.

The downside is cherry picks between versions may be more work but
unless its a bug fix I doubt there will be many.

Author: KurtWagner

build.zig

@@ -207,9 +207,6 @@ pub fn build(b: *std.Build) void {
             }).module("zls"),
         }},
     });
-    if (version.zig == .@"0.15" and target.result.os.tag == .windows) {
-        zlinter_lib_module.linkSystemLibrary("advapi32", .{});
-    }
 
     const zlinter_import = std.Build.Module.Import{
         .name = "zlinter",
@@ -538,9 +535,6 @@ fn buildStep(
         .optimize = options.optimize,
         .imports = &.{zlinter_import},
     });
-    if (version.zig == .@"0.15" and options.target.result.os.tag == .windows) {
-        exe_module.linkSystemLibrary("advapi32", .{});
-    }
 
     // --------------------------------------------------------------------
     // Generate dynamic rules and rules config
@@ -606,10 +600,7 @@ fn addWatchInput(
             try step.addWatchInput(file_or_dir);
             return;
         },
-        else => switch (version.zig) {
-            .@"0.14" => @panic(b.fmt("Unable to open directory '{}': {s}", .{ src_dir_path, @errorName(e) })),
-            .@"0.15", .@"0.16" => @panic(b.fmt("Unable to open directory '{f}': {t}", .{ src_dir_path, e })),
-        },
+        else => @panic(b.fmt("Unable to open directory '{f}': {t}", .{ src_dir_path, e })),
     };
     defer src_dir.close(io);
 
@@ -1039,20 +1030,12 @@ const ZlinterRun = struct {
                 std.debug.print("Writing stdin: '{s}'\n", .{build_info_zon_bytes});
 
             var stdin_file = child.stdin.?;
-            switch (version.zig) {
-                .@"0.14" => {
-                    var writer = stdin_file.writer();
-                    writer.writeInt(usize, build_info_zon_bytes.len, .little) catch @panic("stdin write failed");
-                    writer.writeAll(build_info_zon_bytes) catch @panic("stdin write failed");
-                },
-                .@"0.15", .@"0.16" => {
-                    var buffer: [1024]u8 = undefined;
-                    var writer = stdin_file.writer(io, &buffer);
-                    writer.interface.writeInt(usize, build_info_zon_bytes.len, .little) catch @panic("stdin write failed");
-                    writer.interface.writeAll(build_info_zon_bytes) catch @panic("stdin write failed");
-                    writer.interface.flush() catch @panic("Flush failed");
-                },
-            }
+
+            var buffer: [1024]u8 = undefined;
+            var writer = stdin_file.writer(io, &buffer);
+            writer.interface.writeInt(usize, build_info_zon_bytes.len, .little) catch @panic("stdin write failed");
+            writer.interface.writeAll(build_info_zon_bytes) catch @panic("stdin write failed");
+            writer.interface.flush() catch @panic("Flush failed");
         }
 
         const term = try child.wait(io);

build.zig.zon

@@ -7,8 +7,8 @@
         .zls = .{
             // Update with `zig fetch --save git+https://github.com/zigtools/zls#master`
             // IF changed THEN update .github/coverage.yml
-            .url = "git+https://github.com/zigtools/zls?ref=master#246f9387629c82a2cfd51ee1f7895d7c9db39b47",
-            .hash = "zls-0.16.0-dev-rmm5fmdBJQCoJBgNx4V7WbbtQsd33XHFSs2sqwX9IvCb",
+            .url = "git+https://github.com/zigtools/zls?ref=master#d03b99209afcae2169912986b2f4c677fca279c9",
+            .hash = "zls-0.16.0-dev-rmm5fu5GJQBnXt4idjOYx7p4104rd3Ji-daO8a-7Gx6e",
         },
     },
     .paths = .{

build_docs.zig

@@ -103,10 +103,10 @@ fn writeFileRuleConfig(content: []const u8, gpa: std.mem.Allocator, writer: anyt
             const name = tree.tokenSlice(var_decl.ast.mut_token + 1);
             if (!std.mem.eql(u8, name, "Config")) continue;
 
-            const struct_init = tree.fullContainerDecl(&struct_buffer, switch (zig_version) {
-                .@"0.14" => var_decl.ast.init_node,
-                .@"0.15", .@"0.16" => var_decl.ast.init_node.unwrap().?,
-            }).?;
+            const struct_init = tree.fullContainerDecl(
+                &struct_buffer,
+                var_decl.ast.init_node.unwrap().?,
+            ).?;
 
             for (struct_init.ast.members) |field| {
                 const container_field = tree.fullContainerField(field) orelse continue;
@@ -129,10 +129,10 @@ fn writeFileRuleConfig(content: []const u8, gpa: std.mem.Allocator, writer: anyt
                     }
                 }
 
-                const maybe_default: ?[]const u8 = switch (zig_version) {
-                    .@"0.14" => if (container_field.ast.value_expr != 0) tree.getNodeSource(container_field.ast.value_expr) else null,
-                    .@"0.15", .@"0.16" => if (container_field.ast.value_expr.unwrap()) |default_node| tree.getNodeSource(default_node) else null,
-                };
+                const maybe_default: ?[]const u8 = if (container_field.ast.value_expr.unwrap()) |default_node|
+                    tree.getNodeSource(default_node)
+                else
+                    null;
 
                 if (maybe_default) |default| {
                     try writer.writeAll("\n\n  * **Default:** `");
@@ -165,5 +165,4 @@ fn writeWithoutDuplicateWhiteSpace(content: []const u8, writer: anytype) !void {
 }
 
 const std = @import("std");
-const zig_version = @import("src/lib/version.zig").zig;
 const Ast = std.zig.Ast;

integration_tests/build.zig

@@ -20,9 +20,6 @@ pub fn build(b: *std.Build) !void {
         .target = target,
         .optimize = optimize,
     });
-    if (zlinter.version.zig == .@"0.15" and target.result.os.tag == .windows) {
-        test_runner_module.linkSystemLibrary("advapi32", .{});
-    }
 
     const test_runner_exe = b.addExecutable(.{
         .name = "integration_tests",

src/exe/run_linter.zig

@@ -311,10 +311,7 @@ fn runLinterRules(
                                 ) catch |e| {
                                     switch (e) {
                                         error.ParseZon => {
-                                            std.log.err("Failed to parse rule config: " ++ switch (zlinter.version.zig) {
-                                                .@"0.14" => "{}",
-                                                .@"0.15", .@"0.16" => "{f}",
-                                            }, .{diagnostics});
+                                            std.log.err("Failed to parse rule config: {f}", .{diagnostics});
                                         },
                                         else => {},
                                     }
@@ -541,25 +538,22 @@ fn runFixes(
         });
         defer file.close(io);
 
-        const file_content = switch (zlinter.version.zig) {
-            .@"0.14" => try file.reader().readAllAlloc(gpa, zlinter.session.max_zig_file_size_bytes),
-            .@"0.15", .@"0.16" => file_content: {
-                var file_reader_buffer: [1024]u8 = undefined;
-                var file_reader = file.readerStreaming(io, &file_reader_buffer);
+        const file_content = file_content: {
+            var file_reader_buffer: [1024]u8 = undefined;
+            var file_reader = file.readerStreaming(io, &file_reader_buffer);
 
-                var buffer: std.Io.Writer.Allocating = .init(gpa);
-                defer buffer.deinit();
+            var buffer: std.Io.Writer.Allocating = .init(gpa);
+            defer buffer.deinit();
 
-                if (file_reader.getSize()) |size| {
-                    const casted_size = std.math.cast(u32, size) orelse return error.StreamTooLong;
-                    try buffer.ensureTotalCapacity(casted_size);
-                } else |_| {
-                    // Do nothing.
-                }
+            if (file_reader.getSize()) |size| {
+                const casted_size = std.math.cast(u32, size) orelse return error.StreamTooLong;
+                try buffer.ensureTotalCapacity(casted_size);
+            } else |_| {
+                // Do nothing.
+            }
 
-                _ = try file_reader.interface.streamRemaining(&buffer.writer);
-                break :file_content try buffer.toOwnedSlice();
-            },
+            _ = try file_reader.interface.streamRemaining(&buffer.writer);
+            break :file_content try buffer.toOwnedSlice();
         };
         defer gpa.free(file_content);
 
@@ -604,22 +598,12 @@ fn runFixes(
             });
             defer new_file.close(io);
 
-            switch (zlinter.version.zig) {
-                .@"0.14" => {
-                    var writer = new_file.writer();
-                    for (output_slices.items) |output_slice| {
-                        try writer.writeAll(output_slice);
-                    }
-                },
-                .@"0.15", .@"0.16" => {
-                    var buffer: [1024]u8 = undefined;
-                    var writer = new_file.writer(io, &buffer);
-                    for (output_slices.items) |output_slice| {
-                        try writer.interface.writeAll(output_slice);
-                    }
-                    try writer.interface.flush();
-                },
+            var buffer: [1024]u8 = undefined;
+            var writer = new_file.writer(io, &buffer);
+            for (output_slices.items) |output_slice| {
+                try writer.interface.writeAll(output_slice);
             }
+            try writer.interface.flush();
         }
     }
 
@@ -648,20 +632,9 @@ fn allocAstErrorMsg(
     err: Ast.Error,
     allocator: std.mem.Allocator,
 ) ![]const u8 {
-    switch (zlinter.version.zig) {
-        .@"0.14" => {
-            var error_message = std.ArrayList(u8).empty;
-            defer error_message.deinit(allocator);
-
-            try tree.renderError(err, error_message.writer(allocator));
-            return error_message.toOwnedSlice(allocator);
-        },
-        .@"0.15", .@"0.16" => {
-            var aw = std.Io.Writer.Allocating.init(allocator);
-            try tree.renderError(err, &aw.writer);
-            return aw.toOwnedSlice();
-        },
-    }
+    var aw = std.Io.Writer.Allocating.init(allocator);
+    try tree.renderError(err, &aw.writer);
+    return aw.toOwnedSlice();
 }
 
 // TODO: Move buildExcludesIndex and buildFilterIndex to lib and write unit tests

src/lib/ast.zig

@@ -89,14 +89,8 @@ pub fn deferBlock(doc: *const session.LintDocument, node: Ast.Node.Index, alloca
     const data = shims.nodeData(tree, node);
     const exp_node =
         switch (shims.nodeTag(tree, node)) {
-            .@"errdefer" => switch (version.zig) {
-                .@"0.14" => data.rhs,
-                .@"0.15", .@"0.16" => data.opt_token_and_node[1],
-            },
-            .@"defer" => switch (version.zig) {
-                .@"0.14" => data.rhs,
-                .@"0.15", .@"0.16" => data.node,
-            },
+            .@"errdefer" => data.opt_token_and_node[1],
+            .@"defer" => data.node,
             else => return null,
         };
 
@@ -298,10 +292,7 @@ pub fn fnDecl(tree: Ast, node: Ast.Node.Index, fn_proto_buffer: *[1]Ast.Node.Ind
     switch (shims.nodeTag(tree, node)) {
         .fn_decl => {
             const data = shims.nodeData(tree, node);
-            const lhs, const rhs = switch (version.zig) {
-                .@"0.14" => .{ data.lhs, data.rhs },
-                .@"0.15", .@"0.16" => .{ data.node_and_node[0], data.node_and_node[1] },
-            };
+            const lhs, const rhs = .{ data.node_and_node[0], data.node_and_node[1] };
             return .{ .proto = tree.fullFnProto(fn_proto_buffer, lhs).?, .block = rhs };
         },
         else => return null,
@@ -378,24 +369,9 @@ pub fn fullStatement(tree: Ast, node: Ast.Node.Index) ?Statement {
     else if (tree.fullSwitchCase(node)) |switchStatement|
         .{ .switch_case = switchStatement }
     else switch (shims.nodeTag(tree, node)) {
-        .@"catch" => .{
-            .@"catch" = switch (version.zig) {
-                .@"0.14" => shims.nodeData(tree, node).rhs,
-                .@"0.15", .@"0.16" => shims.nodeData(tree, node).node_and_node[1],
-            },
-        },
-        .@"defer" => .{
-            .@"defer" = switch (version.zig) {
-                .@"0.14" => shims.nodeData(tree, node).rhs,
-                .@"0.15", .@"0.16" => shims.nodeData(tree, node).node,
-            },
-        },
-        .@"errdefer" => .{
-            .@"errdefer" = switch (version.zig) {
-                .@"0.14" => shims.nodeData(tree, node).rhs,
-                .@"0.15", .@"0.16" => shims.nodeData(tree, node).opt_token_and_node[1],
-            },
-        },
+        .@"catch" => .{ .@"catch" = shims.nodeData(tree, node).node_and_node[1] },
+        .@"defer" => .{ .@"defer" = shims.nodeData(tree, node).node },
+        .@"errdefer" => .{ .@"errdefer" = shims.nodeData(tree, node).opt_token_and_node[1] },
         else => null,
     };
 }
@@ -650,10 +626,7 @@ pub fn fnCall(
         switch (fn_expr_node_tag) {
             // e.g., `parent.*`
             .field_access => {
-                const field_node, const fn_name = switch (version.zig) {
-                    .@"0.14" => .{ fn_expr_node_data.lhs, fn_expr_node_data.rhs },
-                    .@"0.15", .@"0.16" => .{ fn_expr_node_data.node_and_token[0], fn_expr_node_data.node_and_token[1] },
-                };
+                const field_node, const fn_name = .{ fn_expr_node_data.node_and_token[0], fn_expr_node_data.node_and_token[1] };
                 std.debug.assert(shims.tokenTag(tree, fn_name) == .identifier);
 
                 const field_node_tag = shims.nodeTag(tree, field_node);
@@ -885,7 +858,6 @@ const session = @import("session.zig");
 const shims = @import("shims.zig");
 const std = @import("std");
 const testing = @import("testing.zig");
-const version = @import("version.zig");
 const zls = @import("zls");
 const NodeIndexShim = shims.NodeIndexShim;
 const Ast = std.zig.Ast;

src/lib/explorer.zig

@@ -29,10 +29,7 @@ pub fn jsonTree(
     );
 
     if (tree.errors.len == 0) {
-        if (switch (version.zig) {
-            .@"0.14" => tree.render(arena),
-            .@"0.15", .@"0.16" => tree.renderAlloc(arena),
-        }) |rendering| {
+        if (tree.renderAlloc(arena)) |rendering| {
             try root_json_object.put(
                 "render",
                 .{ .string = rendering },
@@ -140,24 +137,9 @@ fn errorsToJson(tree: Ast, arena: std.mem.Allocator) !std.json.Array {
         try json_error.put("token_is_prev", .{ .bool = e.token_is_prev });
         try json_error.put("token", .{ .integer = e.token });
 
-        switch (version.zig) {
-            .@"0.14" => {
-                var render_backing = std.ArrayList(u8).empty;
-                // zlinter-disable-next-line no_deprecated - Upgraded in 0.15
-                try tree.renderError(e, render_backing.writer(arena));
-                try json_error.put("message", .{ .string = try render_backing.toOwnedSlice(arena) });
-            },
-            .@"0.15" => {
-                var aw = std.Io.Writer.Allocating.init(arena);
-                try tree.renderError(e, &aw.writer);
-                try json_error.put("message", .{ .string = try aw.toOwnedSlice() });
-            },
-            .@"0.16" => {
-                var aw = std.Io.Writer.Allocating.init(arena);
-                try tree.renderError(e, &aw.writer);
-                try json_error.put("message", .{ .string = try aw.toOwnedSlice() });
-            },
-        }
+        var aw = std.Io.Writer.Allocating.init(arena);
+        try tree.renderError(e, &aw.writer);
+        try json_error.put("message", .{ .string = try aw.toOwnedSlice() });
 
         try json_errors.append(.{ .object = json_error });
     }
@@ -197,7 +179,6 @@ fn tokensToJson(tree: Ast, arena: std.mem.Allocator) !std.json.Array {
 const ast = @import("ast.zig");
 const shims = @import("shims.zig");
 const std = @import("std");
-const version = @import("version.zig");
 const NodeIndexShim = shims.NodeIndexShim;
 const Ast = std.zig.Ast;
 const zls = @import("zls");