authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2020-05-24 10:04:09-04:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2020-05-24 10:04:09-04:00
logdd05f2be80464deb8c98adb9b621364838c17f2b
treef2ec99ec3037d93f4dd83049dd89ed6dd401c0b0
parent1c0b7ddda8bfabc9274f0d3bcb79be8eb8869f36

run zig fmt on std lib

7 files changed, 27 insertions(+), 20 deletions(-)

lib/std/io/multi_out_stream.zig+1-1
......@@ -44,7 +44,7 @@ test "MultiOutStream" {
4444 var fbs1 = io.fixedBufferStream(&buf1);
4545 var buf2: [255]u8 = undefined;
4646 var fbs2 = io.fixedBufferStream(&buf2);
47 var stream = multiOutStream(.{fbs1.outStream(), fbs2.outStream()});
47 var stream = multiOutStream(.{ fbs1.outStream(), fbs2.outStream() });
4848 try stream.outStream().print("HI", .{});
4949 testing.expectEqualSlices(u8, "HI", fbs1.getWritten());
5050 testing.expectEqualSlices(u8, "HI", fbs2.getWritten());
lib/std/json/write_stream.zig+1-1
......@@ -241,7 +241,7 @@ test "json write stream" {
241241 var w = std.json.writeStream(out, 10);
242242
243243 try w.beginObject();
244
244
245245 try w.objectField("object");
246246 try w.emitJson(try getJsonObject(&arena_allocator.allocator));
247247
lib/std/linked_list.zig+5-5
......@@ -124,11 +124,11 @@ test "basic SinglyLinkedList test" {
124124 const L = SinglyLinkedList(u32);
125125 var list = L{};
126126
127 var one = L.Node{.data = 1};
128 var two = L.Node{.data = 2};
129 var three = L.Node{.data = 3};
130 var four = L.Node{.data = 4};
131 var five = L.Node{.data = 5};
127 var one = L.Node{ .data = 1 };
128 var two = L.Node{ .data = 2 };
129 var three = L.Node{ .data = 3 };
130 var four = L.Node{ .data = 4 };
131 var five = L.Node{ .data = 5 };
132132
133133 list.prepend(&two); // {2}
134134 two.insertAfter(&five); // {2, 5}
lib/std/mem.zig+1-1
......@@ -296,7 +296,7 @@ pub const Allocator = struct {
296296 }
297297};
298298
299var failAllocator = Allocator {
299var failAllocator = Allocator{
300300 .reallocFn = failAllocatorRealloc,
301301 .shrinkFn = failAllocatorShrink,
302302};
lib/std/zig/parse.zig-1
......@@ -3387,7 +3387,6 @@ fn ParseFn(comptime T: type) type {
33873387 return fn (p: *Parser) Error!T;
33883388}
33893389
3390
33913390test "std.zig.parser" {
33923391 _ = @import("parser_test.zig");
33933392}
lib/std/zig/render.zig+10-6
......@@ -193,7 +193,12 @@ fn renderExtraNewline(tree: *ast.Tree, stream: var, start_col: *usize, node: *as
193193 return renderExtraNewlineToken(tree, stream, start_col, node.firstToken());
194194}
195195
196fn renderExtraNewlineToken(tree: *ast.Tree, stream: var, start_col: *usize, first_token: ast.TokenIndex,) @TypeOf(stream).Error!void {
196fn renderExtraNewlineToken(
197 tree: *ast.Tree,
198 stream: var,
199 start_col: *usize,
200 first_token: ast.TokenIndex,
201) @TypeOf(stream).Error!void {
197202 var prev_token = first_token;
198203 if (prev_token == 0) return;
199204 var newline_threshold: usize = 2;
......@@ -626,7 +631,7 @@ fn renderExpression(
626631 .ArrayInitializer, .ArrayInitializerDot => {
627632 var rtoken: ast.TokenIndex = undefined;
628633 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) {
630635 .ArrayInitializerDot => blk: {
631636 const casted = @fieldParentPtr(ast.Node.ArrayInitializerDot, "base", base);
632637 rtoken = casted.rtoken;
......@@ -678,7 +683,7 @@ fn renderExpression(
678683 for (exprs) |expr, i| {
679684 if (i + 1 < exprs.len) {
680685 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());
682687 if (loc.line != 0) break :blk count;
683688 count += 1;
684689 } else {
......@@ -790,7 +795,7 @@ fn renderExpression(
790795 .StructInitializer, .StructInitializerDot => {
791796 var rtoken: ast.TokenIndex = undefined;
792797 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) {
794799 .StructInitializerDot => blk: {
795800 const casted = @fieldParentPtr(ast.Node.StructInitializerDot, "base", base);
796801 rtoken = casted.rtoken;
......@@ -1036,7 +1041,6 @@ fn renderExpression(
10361041 }
10371042 return renderToken(tree, stream, suffix_op.rtoken, indent, start_col, space); // ]
10381043 },
1039
10401044 }
10411045 },
10421046
......@@ -2185,7 +2189,7 @@ fn renderParamDecl(
21852189 try renderToken(tree, stream, tree.nextToken(name_token), indent, start_col, Space.Space); // :
21862190 }
21872191 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),
21892193 .var_type, .type_expr => |node| try renderExpression(allocator, stream, tree, indent, start_col, node, space),
21902194 }
21912195}
src-self-hosted/translate_c.zig+9-5
......@@ -600,7 +600,7 @@ fn visitFnDecl(c: *Context, fn_decl: *const ZigClangFunctionDecl) Error!void {
600600 const mangled_param_name = try block_scope.makeMangledName(c, param_name);
601601
602602 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});
604604 const arg_name = try block_scope.makeMangledName(c, bare_arg_name);
605605 const node = try transCreateNodeVarDecl(c, false, false, mangled_param_name);
606606 node.eq_token = try appendToken(c, .Equal, "=");
......@@ -1440,7 +1440,12 @@ fn transCStyleCastExprClass(
14401440 return maybeSuppressResult(rp, scope, result_used, cast_node);
14411441}
14421442
1443fn transDeclStmtOne(rp: RestorePoint, scope: *Scope, decl: *const ZigClangDecl, block_scope: *Scope.Block,) TransError!*ast.Node {
1443fn transDeclStmtOne(
1444 rp: RestorePoint,
1445 scope: *Scope,
1446 decl: *const ZigClangDecl,
1447 block_scope: *Scope.Block,
1448) TransError!*ast.Node {
14441449 const c = rp.c;
14451450
14461451 switch (ZigClangDecl_getKind(decl)) {
......@@ -3259,7 +3264,6 @@ fn transCreateCompoundAssign(
32593264 // common case
32603265 // c: lhs += rhs
32613266 // zig: lhs += rhs
3262
32633267 if ((is_mod or is_div) and is_signed) {
32643268 const op_token = try appendToken(rp.c, .Equal, "=");
32653269 const op_node = try rp.c.arena.create(ast.Node.InfixOp);
......@@ -4791,7 +4795,7 @@ fn finishTransFnProto(
47914795 .comptime_token = null,
47924796 .noalias_token = null,
47934797 .name_token = null,
4794 .param_type = .{ .var_args = try appendToken(rp.c, .Ellipsis3, "...") }
4798 .param_type = .{ .var_args = try appendToken(rp.c, .Ellipsis3, "...") },
47954799 };
47964800 }
47974801
......@@ -5570,7 +5574,7 @@ fn parseCPrimaryExpr(c: *Context, it: *CTokenList.Iterator, source: []const u8,
55705574 };
55715575 return &node.base;
55725576 } 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]});
55745578 const node = try c.arena.create(ast.Node.IntegerLiteral);
55755579 node.* = .{
55765580 .token = token,