authorgravatar for git@vexu.euVeikka Tuominen <git@vexu.eu> 2020-03-15 01:02:33+02:00
committergravatar for git@vexu.euVeikka Tuominen <git@vexu.eu> 2020-03-15 01:02:33+02:00
log5e5dee829dd0098e00821d2717841950957ebb96
tree2f27815cbbd8a62992928ae27a4dbcef65568e4a
parent5dd3c8eed65c020a5c5672ee595b16120b3dc431
signaturelock-open Commit is signed but in an unrecognized format.

remove .Cancel correct merge err set parsing

3 files changed, 1 insertions(+), 4 deletions(-)

lib/std/zig/ast.zig-2
......@@ -1591,7 +1591,6 @@ pub const Node = struct {
15911591 Await,
15921592 BitNot,
15931593 BoolNot,
1594 Cancel,
15951594 OptionalType,
15961595 Negation,
15971596 NegationWrap,
......@@ -1661,7 +1660,6 @@ pub const Node = struct {
16611660 Op.Await,
16621661 Op.BitNot,
16631662 Op.BoolNot,
1664 Op.Cancel,
16651663 Op.OptionalType,
16661664 Op.Negation,
16671665 Op.NegationWrap,
lib/std/zig/parse.zig+1-1
......@@ -2181,7 +2181,7 @@ fn parseMultiplyOp(arena: *Allocator, it: *TokenIterator, tree: *Tree) !?*Node {
21812181
21822182 const token = nextToken(it);
21832183 const op = switch (token.ptr.id) {
2184 .PipePipe => ops{ .BoolOr = {} },
2184 .PipePipe => ops{ .MergeErrorSets = {} },
21852185 .Asterisk => ops{ .Mul = {} },
21862186 .Slash => ops{ .Div = {} },
21872187 .Percent => ops{ .Mod = {} },
lib/std/zig/render.zig-1
......@@ -583,7 +583,6 @@ fn renderExpression(
583583 },
584584
585585 .Try,
586 .Cancel,
587586 .Resume,
588587 => {
589588 try renderToken(tree, stream, prefix_op_node.op_token, indent, start_col, Space.Space);