Merge remote-tracking branch 'origin/master' into ast-memory-layout

Conflicts:
 * lib/std/zig/ast.zig
 * lib/std/zig/parse.zig
 * lib/std/zig/parser_test.zig
 * lib/std/zig/render.zig
 * src/Module.zig
 * src/zir.zig

I resolved some of the conflicts by reverting a small portion of
@tadeokondrak's stage2 logic here regarding `callconv(.Inline)`.
It will need to get reworked as part of this branch.

1 files changed, 2 insertions, 2 deletions

diff --git a/src/DepTokenizer.zig b/src/DepTokenizer.zig
index b246a22bd0..0bd2999719 100644
--- a/src/DepTokenizer.zig
+++ b/src/DepTokenizer.zig
@@ -266,11 +266,11 @@ pub fn next(self: *Tokenizer) ?Token {
     unreachable;
 }
 
-fn errorPosition(comptime id: @TagType(Token), index: usize, bytes: []const u8) Token {
+fn errorPosition(comptime id: std.meta.Tag(Token), index: usize, bytes: []const u8) Token {
     return @unionInit(Token, @tagName(id), .{ .index = index, .bytes = bytes });
 }
 
-fn errorIllegalChar(comptime id: @TagType(Token), index: usize, char: u8) Token {
+fn errorIllegalChar(comptime id: std.meta.Tag(Token), index: usize, char: u8) Token {
     return @unionInit(Token, @tagName(id), .{ .index = index, .char = char });
 }