authorgravatar for lachlan@lakebythewoods.xyzLachlan Easton <lachlan@lakebythewoods.xyz> 2020-09-01 21:59:27+10:00
committergravatar for lachlan@lakebythewoods.xyzLachlan Easton <lachlan@lakebythewoods.xyz> 2020-09-01 21:59:27+10:00
log7841c9b7d105a62ccb55f4f6589d5ff31194a013
treef7c975ae11f17fa7ab6bfa24f2d1a4b6cf98000f
parent671b3abe5d6661a8bca452a0a16dea7ae3d0e516

zig fmt: Fix merge errors

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

lib/std/zig/render.zig+5-5
...@@ -1425,7 +1425,7 @@ fn renderExpression(...@@ -1425,7 +1425,7 @@ fn renderExpression(
14251425
1426 // TODO remove after 0.7.0 release1426 // TODO remove after 0.7.0 release
1427 if (mem.eql(u8, tree.tokenSlice(builtin_call.builtin_token), "@OpaqueType"))1427 if (mem.eql(u8, tree.tokenSlice(builtin_call.builtin_token), "@OpaqueType"))
1428 return stream.writeAll("@Type(.Opaque)");1428 return stream.writer().writeAll("@Type(.Opaque)");
14291429
1430 try renderToken(tree, stream, builtin_call.builtin_token, Space.None); // @name1430 try renderToken(tree, stream, builtin_call.builtin_token, Space.None); // @name
14311431
...@@ -2184,11 +2184,11 @@ fn renderVarDecl(...@@ -2184,11 +2184,11 @@ fn renderVarDecl(
2184 Space.None;2184 Space.None;
2185 try renderToken(tree, stream, var_decl.name_token, name_space);2185 try renderToken(tree, stream, var_decl.name_token, name_space);
21862186
2187 if (var_decl.getTrailer("type_node")) |type_node| {2187 if (var_decl.getTypeNode()) |type_node| {
2188 try renderToken(tree, stream, tree.nextToken(var_decl.name_token), Space.Space);2188 try renderToken(tree, stream, tree.nextToken(var_decl.name_token), Space.Space);
2189 const s = if (var_decl.getTrailer("align_node") != null or2189 const s = if (var_decl.getAlignNode() != null or
2190 var_decl.getTrailer("section_node") != null or2190 var_decl.getSectionNode() != null or
2191 var_decl.getTrailer("init_node") != null) Space.Space else Space.None;2191 var_decl.getInitNode() != null) Space.Space else Space.None;
2192 try renderExpression(allocator, stream, tree, type_node, s);2192 try renderExpression(allocator, stream, tree, type_node, s);
2193 }2193 }
21942194