authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2021-09-01 13:10:51-07:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2021-09-01 17:54:07-07:00
log21171fd71b6b3c69a404176e8fe4620b9768d5a6
treea4afc7f67eefad9b3af9de5ed46f451716b1fd4e
parentbbf4c25e2dbe1dc2f165d8c978e5a5ed39be2cfc

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

This fixes a merge conflict when rebasing against master branch.

1 files changed, 2 insertions(+), 2 deletions(-)

src/AstGen.zig+2-2
......@@ -7704,8 +7704,8 @@ fn saturatingArithmetic(
77047704 gz: *GenZir,
77057705 scope: *Scope,
77067706 rl: ResultLoc,
7707 node: ast.Node.Index,
7708 params: []const ast.Node.Index,
7707 node: Ast.Node.Index,
7708 params: []const Ast.Node.Index,
77097709 tag: Zir.Inst.Extended,
77107710) InnerError!Zir.Inst.Ref {
77117711 const lhs = try expr(gz, scope, .none, params[0]);