From 21171fd71b6b3c69a404176e8fe4620b9768d5a6 Mon Sep 17 00:00:00 2001 From: Andrew Kelley Date: Wed, 1 Sep 2021 13:10:51 -0700 Subject: [PATCH] AstGen: update std.zig.{ast,Ast} This fixes a merge conflict when rebasing against master branch. --- src/AstGen.zig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/AstGen.zig b/src/AstGen.zig index 849dae613f643039ca3e0c0463148fb138ee6506..2521984a94f4120bd9ecb422d6ccfb8f26a09070 100644 --- a/src/AstGen.zig +++ b/src/AstGen.zig @@ -7704,8 +7704,8 @@ fn saturatingArithmetic( gz: *GenZir, scope: *Scope, rl: ResultLoc, - node: ast.Node.Index, - params: []const ast.Node.Index, + node: Ast.Node.Index, + params: []const Ast.Node.Index, tag: Zir.Inst.Extended, ) InnerError!Zir.Inst.Ref { const lhs = try expr(gz, scope, .none, params[0]); -- 2.54.0