| author |  Andrew Kelley <andrew@ziglang.org> 2020-05-24 10:04:09-04:00 |
| committer | Andrew Kelley <andrew@ziglang.org> 2020-05-24 10:04:09-04:00 |
| log | dd05f2be80464deb8c98adb9b621364838c17f2b |
| tree | f2ec99ec3037d93f4dd83049dd89ed6dd401c0b0 |
| parent | 1c0b7ddda8bfabc9274f0d3bcb79be8eb8869f36 |
run zig fmt on std lib
7 files changed, 27 insertions(+), 20 deletions(-)
src-self-hosted
lib/std/io/multi_out_stream.zig+1-1
| ... | @@ -44,7 +44,7 @@ test "MultiOutStream" { | ... | @@ -44,7 +44,7 @@ test "MultiOutStream" { |
| 44 | var fbs1 = io.fixedBufferStream(&buf1); | 44 | var fbs1 = io.fixedBufferStream(&buf1); |
| 45 | var buf2: [255]u8 = undefined; | 45 | var buf2: [255]u8 = undefined; |
| 46 | var fbs2 = io.fixedBufferStream(&buf2); | 46 | var fbs2 = io.fixedBufferStream(&buf2); |
| 47 | var stream = multiOutStream(.{fbs1.outStream(), fbs2.outStream()}); | 47 | var stream = multiOutStream(.{ fbs1.outStream(), fbs2.outStream() }); |
| 48 | try stream.outStream().print("HI", .{}); | 48 | try stream.outStream().print("HI", .{}); |
| 49 | testing.expectEqualSlices(u8, "HI", fbs1.getWritten()); | 49 | testing.expectEqualSlices(u8, "HI", fbs1.getWritten()); |
| 50 | testing.expectEqualSlices(u8, "HI", fbs2.getWritten()); | 50 | testing.expectEqualSlices(u8, "HI", fbs2.getWritten()); |
lib/std/json/write_stream.zig+1-1
| ... | @@ -241,7 +241,7 @@ test "json write stream" { | ... | @@ -241,7 +241,7 @@ test "json write stream" { |
| 241 | var w = std.json.writeStream(out, 10); | 241 | var w = std.json.writeStream(out, 10); |
| 242 | 242 | ||
| 243 | try w.beginObject(); | 243 | try w.beginObject(); |
| 244 | 244 | ||
| 245 | try w.objectField("object"); | 245 | try w.objectField("object"); |
| 246 | try w.emitJson(try getJsonObject(&arena_allocator.allocator)); | 246 | try w.emitJson(try getJsonObject(&arena_allocator.allocator)); |
| 247 | 247 |
lib/std/linked_list.zig+5-5
| ... | @@ -124,11 +124,11 @@ test "basic SinglyLinkedList test" { | ... | @@ -124,11 +124,11 @@ test "basic SinglyLinkedList test" { |
| 124 | const L = SinglyLinkedList(u32); | 124 | const L = SinglyLinkedList(u32); |
| 125 | var list = L{}; | 125 | var list = L{}; |
| 126 | 126 | ||
| 127 | var one = L.Node{.data = 1}; | 127 | var one = L.Node{ .data = 1 }; |
| 128 | var two = L.Node{.data = 2}; | 128 | var two = L.Node{ .data = 2 }; |
| 129 | var three = L.Node{.data = 3}; | 129 | var three = L.Node{ .data = 3 }; |
| 130 | var four = L.Node{.data = 4}; | 130 | var four = L.Node{ .data = 4 }; |
| 131 | var five = L.Node{.data = 5}; | 131 | var five = L.Node{ .data = 5 }; |
| 132 | 132 | ||
| 133 | list.prepend(&two); // {2} | 133 | list.prepend(&two); // {2} |
| 134 | two.insertAfter(&five); // {2, 5} | 134 | two.insertAfter(&five); // {2, 5} |
lib/std/mem.zig+1-1
| ... | @@ -296,7 +296,7 @@ pub const Allocator = struct { | ... | @@ -296,7 +296,7 @@ pub const Allocator = struct { |
| 296 | } | 296 | } |
| 297 | }; | 297 | }; |
| 298 | 298 | ||
| 299 | var failAllocator = Allocator { | 299 | var failAllocator = Allocator{ |
| 300 | .reallocFn = failAllocatorRealloc, | 300 | .reallocFn = failAllocatorRealloc, |
| 301 | .shrinkFn = failAllocatorShrink, | 301 | .shrinkFn = failAllocatorShrink, |
| 302 | }; | 302 | }; |
lib/std/zig/parse.zig-1
| ... | @@ -3387,7 +3387,6 @@ fn ParseFn(comptime T: type) type { | ... | @@ -3387,7 +3387,6 @@ fn ParseFn(comptime T: type) type { |
| 3387 | return fn (p: *Parser) Error!T; | 3387 | return fn (p: *Parser) Error!T; |
| 3388 | } | 3388 | } |
| 3389 | 3389 | ||
| 3390 | |||
| 3391 | test "std.zig.parser" { | 3390 | test "std.zig.parser" { |
| 3392 | _ = @import("parser_test.zig"); | 3391 | _ = @import("parser_test.zig"); |
| 3393 | } | 3392 | } |
lib/std/zig/render.zig+10-6
| ... | @@ -193,7 +193,12 @@ fn renderExtraNewline(tree: *ast.Tree, stream: var, start_col: *usize, node: *as | ... | @@ -193,7 +193,12 @@ fn renderExtraNewline(tree: *ast.Tree, stream: var, start_col: *usize, node: *as |
| 193 | return renderExtraNewlineToken(tree, stream, start_col, node.firstToken()); | 193 | return renderExtraNewlineToken(tree, stream, start_col, node.firstToken()); |
| 194 | } | 194 | } |
| 195 | 195 | ||
| 196 | fn renderExtraNewlineToken(tree: *ast.Tree, stream: var, start_col: *usize, first_token: ast.TokenIndex,) @TypeOf(stream).Error!void { | 196 | fn renderExtraNewlineToken( |
| 197 | tree: *ast.Tree, | ||
| 198 | stream: var, | ||
| 199 | start_col: *usize, | ||
| 200 | first_token: ast.TokenIndex, | ||
| 201 | ) @TypeOf(stream).Error!void { | ||
| 197 | var prev_token = first_token; | 202 | var prev_token = first_token; |
| 198 | if (prev_token == 0) return; | 203 | if (prev_token == 0) return; |
| 199 | var newline_threshold: usize = 2; | 204 | var newline_threshold: usize = 2; |
| ... | @@ -626,7 +631,7 @@ fn renderExpression( | ... | @@ -626,7 +631,7 @@ fn renderExpression( |
| 626 | .ArrayInitializer, .ArrayInitializerDot => { | 631 | .ArrayInitializer, .ArrayInitializerDot => { |
| 627 | var rtoken: ast.TokenIndex = undefined; | 632 | var rtoken: ast.TokenIndex = undefined; |
| 628 | var exprs: []*ast.Node = undefined; | 633 | var exprs: []*ast.Node = undefined; |
| 629 | const lhs: union(enum) {dot: ast.TokenIndex, node: *ast.Node } = switch (base.id){ | 634 | const lhs: union(enum) { dot: ast.TokenIndex, node: *ast.Node } = switch (base.id) { |
| 630 | .ArrayInitializerDot => blk: { | 635 | .ArrayInitializerDot => blk: { |
| 631 | const casted = @fieldParentPtr(ast.Node.ArrayInitializerDot, "base", base); | 636 | const casted = @fieldParentPtr(ast.Node.ArrayInitializerDot, "base", base); |
| 632 | rtoken = casted.rtoken; | 637 | rtoken = casted.rtoken; |
| ... | @@ -678,7 +683,7 @@ fn renderExpression( | ... | @@ -678,7 +683,7 @@ fn renderExpression( |
| 678 | for (exprs) |expr, i| { | 683 | for (exprs) |expr, i| { |
| 679 | if (i + 1 < exprs.len) { | 684 | if (i + 1 < exprs.len) { |
| 680 | const expr_last_token = expr.lastToken() + 1; | 685 | const expr_last_token = expr.lastToken() + 1; |
| 681 | const loc = tree.tokenLocation(tree.token_locs[expr_last_token].end, exprs[i+1].firstToken()); | 686 | const loc = tree.tokenLocation(tree.token_locs[expr_last_token].end, exprs[i + 1].firstToken()); |
| 682 | if (loc.line != 0) break :blk count; | 687 | if (loc.line != 0) break :blk count; |
| 683 | count += 1; | 688 | count += 1; |
| 684 | } else { | 689 | } else { |
| ... | @@ -790,7 +795,7 @@ fn renderExpression( | ... | @@ -790,7 +795,7 @@ fn renderExpression( |
| 790 | .StructInitializer, .StructInitializerDot => { | 795 | .StructInitializer, .StructInitializerDot => { |
| 791 | var rtoken: ast.TokenIndex = undefined; | 796 | var rtoken: ast.TokenIndex = undefined; |
| 792 | var field_inits: []*ast.Node = undefined; | 797 | var field_inits: []*ast.Node = undefined; |
| 793 | const lhs: union(enum) {dot: ast.TokenIndex, node: *ast.Node } = switch (base.id){ | 798 | const lhs: union(enum) { dot: ast.TokenIndex, node: *ast.Node } = switch (base.id) { |
| 794 | .StructInitializerDot => blk: { | 799 | .StructInitializerDot => blk: { |
| 795 | const casted = @fieldParentPtr(ast.Node.StructInitializerDot, "base", base); | 800 | const casted = @fieldParentPtr(ast.Node.StructInitializerDot, "base", base); |
| 796 | rtoken = casted.rtoken; | 801 | rtoken = casted.rtoken; |
| ... | @@ -1036,7 +1041,6 @@ fn renderExpression( | ... | @@ -1036,7 +1041,6 @@ fn renderExpression( |
| 1036 | } | 1041 | } |
| 1037 | return renderToken(tree, stream, suffix_op.rtoken, indent, start_col, space); // ] | 1042 | return renderToken(tree, stream, suffix_op.rtoken, indent, start_col, space); // ] |
| 1038 | }, | 1043 | }, |
| 1039 | |||
| 1040 | } | 1044 | } |
| 1041 | }, | 1045 | }, |
| 1042 | 1046 | ||
| ... | @@ -2185,7 +2189,7 @@ fn renderParamDecl( | ... | @@ -2185,7 +2189,7 @@ fn renderParamDecl( |
| 2185 | try renderToken(tree, stream, tree.nextToken(name_token), indent, start_col, Space.Space); // : | 2189 | try renderToken(tree, stream, tree.nextToken(name_token), indent, start_col, Space.Space); // : |
| 2186 | } | 2190 | } |
| 2187 | switch (param_decl.param_type) { | 2191 | switch (param_decl.param_type) { |
| 2188 | .var_args => |token| try renderToken(tree, stream, token, indent, start_col, space), | 2192 | .var_args => |token| try renderToken(tree, stream, token, indent, start_col, space), |
| 2189 | .var_type, .type_expr => |node| try renderExpression(allocator, stream, tree, indent, start_col, node, space), | 2193 | .var_type, .type_expr => |node| try renderExpression(allocator, stream, tree, indent, start_col, node, space), |
| 2190 | } | 2194 | } |
| 2191 | } | 2195 | } |
src-self-hosted/translate_c.zig+9-5
| ... | @@ -600,7 +600,7 @@ fn visitFnDecl(c: *Context, fn_decl: *const ZigClangFunctionDecl) Error!void { | ... | @@ -600,7 +600,7 @@ fn visitFnDecl(c: *Context, fn_decl: *const ZigClangFunctionDecl) Error!void { |
| 600 | const mangled_param_name = try block_scope.makeMangledName(c, param_name); | 600 | const mangled_param_name = try block_scope.makeMangledName(c, param_name); |
| 601 | 601 | ||
| 602 | if (!is_const) { | 602 | if (!is_const) { |
| 603 | const bare_arg_name = try std.fmt.allocPrint(c.arena, "arg_{}", .{ mangled_param_name }); | 603 | const bare_arg_name = try std.fmt.allocPrint(c.arena, "arg_{}", .{mangled_param_name}); |
| 604 | const arg_name = try block_scope.makeMangledName(c, bare_arg_name); | 604 | const arg_name = try block_scope.makeMangledName(c, bare_arg_name); |
| 605 | const node = try transCreateNodeVarDecl(c, false, false, mangled_param_name); | 605 | const node = try transCreateNodeVarDecl(c, false, false, mangled_param_name); |
| 606 | node.eq_token = try appendToken(c, .Equal, "="); | 606 | node.eq_token = try appendToken(c, .Equal, "="); |
| ... | @@ -1440,7 +1440,12 @@ fn transCStyleCastExprClass( | ... | @@ -1440,7 +1440,12 @@ fn transCStyleCastExprClass( |
| 1440 | return maybeSuppressResult(rp, scope, result_used, cast_node); | 1440 | return maybeSuppressResult(rp, scope, result_used, cast_node); |
| 1441 | } | 1441 | } |
| 1442 | 1442 | ||
| 1443 | fn transDeclStmtOne(rp: RestorePoint, scope: *Scope, decl: *const ZigClangDecl, block_scope: *Scope.Block,) TransError!*ast.Node { | 1443 | fn transDeclStmtOne( |
| 1444 | rp: RestorePoint, | ||
| 1445 | scope: *Scope, | ||
| 1446 | decl: *const ZigClangDecl, | ||
| 1447 | block_scope: *Scope.Block, | ||
| 1448 | ) TransError!*ast.Node { | ||
| 1444 | const c = rp.c; | 1449 | const c = rp.c; |
| 1445 | 1450 | ||
| 1446 | switch (ZigClangDecl_getKind(decl)) { | 1451 | switch (ZigClangDecl_getKind(decl)) { |
| ... | @@ -3259,7 +3264,6 @@ fn transCreateCompoundAssign( | ... | @@ -3259,7 +3264,6 @@ fn transCreateCompoundAssign( |
| 3259 | // common case | 3264 | // common case |
| 3260 | // c: lhs += rhs | 3265 | // c: lhs += rhs |
| 3261 | // zig: lhs += rhs | 3266 | // zig: lhs += rhs |
| 3262 | |||
| 3263 | if ((is_mod or is_div) and is_signed) { | 3267 | if ((is_mod or is_div) and is_signed) { |
| 3264 | const op_token = try appendToken(rp.c, .Equal, "="); | 3268 | const op_token = try appendToken(rp.c, .Equal, "="); |
| 3265 | const op_node = try rp.c.arena.create(ast.Node.InfixOp); | 3269 | const op_node = try rp.c.arena.create(ast.Node.InfixOp); |
| ... | @@ -4791,7 +4795,7 @@ fn finishTransFnProto( | ... | @@ -4791,7 +4795,7 @@ fn finishTransFnProto( |
| 4791 | .comptime_token = null, | 4795 | .comptime_token = null, |
| 4792 | .noalias_token = null, | 4796 | .noalias_token = null, |
| 4793 | .name_token = null, | 4797 | .name_token = null, |
| 4794 | .param_type = .{ .var_args = try appendToken(rp.c, .Ellipsis3, "...") } | 4798 | .param_type = .{ .var_args = try appendToken(rp.c, .Ellipsis3, "...") }, |
| 4795 | }; | 4799 | }; |
| 4796 | } | 4800 | } |
| 4797 | 4801 | ||
| ... | @@ -5570,7 +5574,7 @@ fn parseCPrimaryExpr(c: *Context, it: *CTokenList.Iterator, source: []const u8, | ... | @@ -5570,7 +5574,7 @@ fn parseCPrimaryExpr(c: *Context, it: *CTokenList.Iterator, source: []const u8, |
| 5570 | }; | 5574 | }; |
| 5571 | return &node.base; | 5575 | return &node.base; |
| 5572 | } else { | 5576 | } else { |
| 5573 | const token = try appendTokenFmt(c, .IntegerLiteral, "0x{x}", .{source[tok.start+1..tok.end-1]}); | 5577 | const token = try appendTokenFmt(c, .IntegerLiteral, "0x{x}", .{source[tok.start + 1 .. tok.end - 1]}); |
| 5574 | const node = try c.arena.create(ast.Node.IntegerLiteral); | 5578 | const node = try c.arena.create(ast.Node.IntegerLiteral); |
| 5575 | node.* = .{ | 5579 | node.* = .{ |
| 5576 | .token = token, | 5580 | .token = token, |