From 964ad1c0f900f992610c7ee96c50931aaca0157b Mon Sep 17 00:00:00 2001
From: Robin Voetter <robin@voetter.nl>
Date: Sun, 12 Jul 2020 14:13:13 +0200
Subject: [PATCH] var -> anytype

---
 generator/index.zig            | 2 +-
 generator/vulkan/c-parse.zig   | 2 +-
 generator/vulkan/generator.zig | 4 ++--
 generator/vulkan/render.zig    | 4 ++--
 generator/vulkan/util.zig      | 8 ++++----
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/generator/index.zig b/generator/index.zig
index 95f32e9..aa7c63b 100644
--- a/generator/index.zig
+++ b/generator/index.zig
@@ -4,5 +4,5 @@ pub const ShaderCompileStep = @import("build-integration.zig").ShaderCompileStep
 
 test "main" {
     _ = @import("xml.zig");
-    _ = @import("c-parse.zig");
+    _ = @import("vulkan/c-parse.zig");
 }
diff --git a/generator/vulkan/c-parse.zig b/generator/vulkan/c-parse.zig
index 7b6f692..9775e54 100644
--- a/generator/vulkan/c-parse.zig
+++ b/generator/vulkan/c-parse.zig
@@ -540,7 +540,7 @@ pub fn parseVersion(xctok: *XmlCTokenizer) ![3][]const u8 {
     return version;
 }
 
-fn testTokenizer(tokenizer: var, expected_tokens: []const Token) void {
+fn testTokenizer(tokenizer: anytype, expected_tokens: []const Token) void {
     for (expected_tokens) |expected| {
         const tok = (tokenizer.next() catch unreachable).?;
         testing.expectEqual(expected.kind, tok.kind);
diff --git a/generator/vulkan/generator.zig b/generator/vulkan/generator.zig
index 02a8658..52f5050 100644
--- a/generator/vulkan/generator.zig
+++ b/generator/vulkan/generator.zig
@@ -311,7 +311,7 @@ pub const Generator = struct {
         try fixer_upper.fixup();
     }
 
-    fn render(self: *Generator, out_stream: var) !void {
+    fn render(self: *Generator, out_stream: anytype) !void {
         try renderRegistry(out_stream, &self.reg_arena.allocator, &self.registry);
     }
 };
@@ -320,7 +320,7 @@ pub const Generator = struct {
 /// and the resulting binding is written to `writer`. `allocator` will be used to allocate temporary
 /// internal datastructures - mostly via an ArenaAllocator, but sometimes a hashmap uses this allocator
 /// directly.
-pub fn generate(allocator: *Allocator, spec_xml: []const u8, writer: var) !void {
+pub fn generate(allocator: *Allocator, spec_xml: []const u8, writer: anytype) !void {
     const spec = try xml.parse(allocator, spec_xml);
     defer spec.deinit();
 
diff --git a/generator/vulkan/render.zig b/generator/vulkan/render.zig
index 51c871f..d9654e3 100644
--- a/generator/vulkan/render.zig
+++ b/generator/vulkan/render.zig
@@ -179,7 +179,7 @@ fn Renderer(comptime WriterType: type) type {
             try self.id_renderer.renderWithCase(self.writer, case, id);
         }
 
-        fn writeIdentifierFmt(self: *Self, comptime fmt: []const u8, args: var) !void {
+        fn writeIdentifierFmt(self: *Self, comptime fmt: []const u8, args: anytype) !void {
             try self.id_renderer.renderFmt(self.writer, fmt, args);
         }
 
@@ -1082,7 +1082,7 @@ fn Renderer(comptime WriterType: type) type {
     };
 }
 
-pub fn render(writer: var, allocator: *Allocator, registry: *const reg.Registry) !void {
+pub fn render(writer: anytype, allocator: *Allocator, registry: *const reg.Registry) !void {
     var renderer = Renderer(@TypeOf(writer)).init(writer, allocator, registry);
     defer renderer.deinit();
     try renderer.render();
diff --git a/generator/vulkan/util.zig b/generator/vulkan/util.zig
index 113d960..4392405 100644
--- a/generator/vulkan/util.zig
+++ b/generator/vulkan/util.zig
@@ -50,7 +50,7 @@ pub fn needZigEscape(name: []const u8) bool {
         or std.zig.Token.getKeyword(name) != null;
 }
 
-pub fn writeIdentifier(out: var, id: []const u8) !void {
+pub fn writeIdentifier(out: anytype, id: []const u8) !void {
     if (needZigEscape(id)) {
         try out.print("@\"{}\"", .{id});
     } else {
@@ -223,17 +223,17 @@ pub const IdRenderer = struct {
         }
     }
 
-    pub fn render(self: IdRenderer, out: var, id: []const u8) !void {
+    pub fn render(self: IdRenderer, out: anytype, id: []const u8) !void {
         try writeIdentifier(out, id);
     }
 
-    pub fn renderFmt(self: *IdRenderer, out: var, comptime fmt: []const u8, args: var) !void {
+    pub fn renderFmt(self: *IdRenderer, out: anytype, comptime fmt: []const u8, args: anytype) !void {
         self.text_cache.items.len = 0;
         try std.fmt.format(self.text_cache.writer(), fmt, args);
         try writeIdentifier(out, self.text_cache.items);
     }
 
-    pub fn renderWithCase(self: *IdRenderer, out: var, case_style: CaseStyle, id: []const u8) !void {
+    pub fn renderWithCase(self: *IdRenderer, out: anytype, case_style: CaseStyle, id: []const u8) !void {
         const tag = getAuthorTag(id, self.tags);
         const adjusted_id = if (tag) |name| id[0 .. id.len - name.len] else id;