Commit 5e5dee829d

Vexu <git@vexu.eu>
2020-03-15 00:02:33
remove .Cancel correct merge err set parsing
master
1 parent 5dd3c8e
Changed files (3)
lib
std
zig
ast.zig
parse.zig
render.zig
lib/std/zig/ast.zig
@@ -1591,7 +1591,6 @@ pub const Node = struct {
             Await,
             BitNot,
             BoolNot,
-            Cancel,
             OptionalType,
             Negation,
             NegationWrap,
@@ -1661,7 +1660,6 @@ pub const Node = struct {
                 Op.Await,
                 Op.BitNot,
                 Op.BoolNot,
-                Op.Cancel,
                 Op.OptionalType,
                 Op.Negation,
                 Op.NegationWrap,
lib/std/zig/parse.zig
@@ -2181,7 +2181,7 @@ fn parseMultiplyOp(arena: *Allocator, it: *TokenIterator, tree: *Tree) !?*Node {
 
     const token = nextToken(it);
     const op = switch (token.ptr.id) {
-        .PipePipe => ops{ .BoolOr = {} },
+        .PipePipe => ops{ .MergeErrorSets = {} },
         .Asterisk => ops{ .Mul = {} },
         .Slash => ops{ .Div = {} },
         .Percent => ops{ .Mod = {} },
lib/std/zig/render.zig
@@ -583,7 +583,6 @@ fn renderExpression(
                 },
 
                 .Try,
-                .Cancel,
                 .Resume,
                 => {
                     try renderToken(tree, stream, prefix_op_node.op_token, indent, start_col, Space.Space);