zig

commit 21171fd71b6b3c69a404176e8fe4620b9768d5a6 (tree)
parent bbf4c25e2dbe1dc2f165d8c978e5a5ed39be2cfc
Author: Andrew Kelley <andrew@ziglang.org>
Date:   Wed,  1 Sep 2021 13:10:51 -0700

AstGen: update std.zig.{ast,Ast}

This fixes a merge conflict when rebasing against master branch.

Diffstat:
M
src/AstGen.zig
 | 
4
++--

1 file changed, 2 insertions(+), 2 deletions(-)
diff --git 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]);