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
signature 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 {...@@ -1591,7 +1591,6 @@ pub const Node = struct {
1591 Await,1591 Await,
1592 BitNot,1592 BitNot,
1593 BoolNot,1593 BoolNot,
1594 Cancel,
1595 OptionalType,1594 OptionalType,
1596 Negation,1595 Negation,
1597 NegationWrap,1596 NegationWrap,
...@@ -1661,7 +1660,6 @@ pub const Node = struct {...@@ -1661,7 +1660,6 @@ pub const Node = struct {
1661 Op.Await,1660 Op.Await,
1662 Op.BitNot,1661 Op.BitNot,
1663 Op.BoolNot,1662 Op.BoolNot,
1664 Op.Cancel,
1665 Op.OptionalType,1663 Op.OptionalType,
1666 Op.Negation,1664 Op.Negation,
1667 Op.NegationWrap,1665 Op.NegationWrap,
lib/std/zig/parse.zig+1-1
...@@ -2181,7 +2181,7 @@ fn parseMultiplyOp(arena: *Allocator, it: *TokenIterator, tree: *Tree) !?*Node {...@@ -2181,7 +2181,7 @@ fn parseMultiplyOp(arena: *Allocator, it: *TokenIterator, tree: *Tree) !?*Node {
21812181
2182 const token = nextToken(it);2182 const token = nextToken(it);
2183 const op = switch (token.ptr.id) {2183 const op = switch (token.ptr.id) {
2184 .PipePipe => ops{ .BoolOr = {} },2184 .PipePipe => ops{ .MergeErrorSets = {} },
2185 .Asterisk => ops{ .Mul = {} },2185 .Asterisk => ops{ .Mul = {} },
2186 .Slash => ops{ .Div = {} },2186 .Slash => ops{ .Div = {} },
2187 .Percent => ops{ .Mod = {} },2187 .Percent => ops{ .Mod = {} },
lib/std/zig/render.zig-1
...@@ -583,7 +583,6 @@ fn renderExpression(...@@ -583,7 +583,6 @@ fn renderExpression(
583 },583 },
584584
585 .Try,585 .Try,
586 .Cancel,
587 .Resume,586 .Resume,
588 => {587 => {
589 try renderToken(tree, stream, prefix_op_node.op_token, indent, start_col, Space.Space);588 try renderToken(tree, stream, prefix_op_node.op_token, indent, start_col, Space.Space);