mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2026-01-10 01:15:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

run zig fmt on std lib

Browse Source
This commit is contained in:
Andrew Kelley 2020-05-24 10:04:09 -04:00
parent 1c0b7ddda8
commit dd05f2be80
7 changed files with 27 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/std/io/multi_out_stream.zig
View File

@ -44,7 +44,7 @@ test "MultiOutStream" {
var fbs1 = io.fixedBufferStream(&buf1);
var buf2: [255]u8 = undefined;
var fbs2 = io.fixedBufferStream(&buf2);
var stream = multiOutStream(.{fbs1.outStream(), fbs2.outStream()});
var stream = multiOutStream(.{ fbs1.outStream(), fbs2.outStream() });
try stream.outStream().print("HI", .{});
testing.expectEqualSlices(u8, "HI", fbs1.getWritten());
testing.expectEqualSlices(u8, "HI", fbs2.getWritten());

2
lib/std/json/write_stream.zig
View File

@ -241,7 +241,7 @@ test "json write stream" {
var w = std.json.writeStream(out, 10);
try w.beginObject();
try w.objectField("object");
try w.emitJson(try getJsonObject(&arena_allocator.allocator));

10
lib/std/linked_list.zig
View File

@ -124,11 +124,11 @@ test "basic SinglyLinkedList test" {
const L = SinglyLinkedList(u32);
var list = L{};
var one = L.Node{.data = 1};
var two = L.Node{.data = 2};
var three = L.Node{.data = 3};
var four = L.Node{.data = 4};
var five = L.Node{.data = 5};
var one = L.Node{ .data = 1 };
var two = L.Node{ .data = 2 };
var three = L.Node{ .data = 3 };
var four = L.Node{ .data = 4 };
var five = L.Node{ .data = 5 };
list.prepend(&two); // {2}
two.insertAfter(&five); // {2, 5}

2
lib/std/mem.zig
View File

@ -296,7 +296,7 @@ pub const Allocator = struct {
}
};
var failAllocator = Allocator {
var failAllocator = Allocator{
.reallocFn = failAllocatorRealloc,
.shrinkFn = failAllocatorShrink,
};

1
lib/std/zig/parse.zig
View File

@ -3387,7 +3387,6 @@ fn ParseFn(comptime T: type) type {
return fn (p: *Parser) Error!T;
}
test "std.zig.parser" {
_ = @import("parser_test.zig");
}

16
lib/std/zig/render.zig
View File

@ -193,7 +193,12 @@ fn renderExtraNewline(tree: *ast.Tree, stream: var, start_col: *usize, node: *as
return renderExtraNewlineToken(tree, stream, start_col, node.firstToken());
}
fn renderExtraNewlineToken(tree: *ast.Tree, stream: var, start_col: *usize, first_token: ast.TokenIndex,) @TypeOf(stream).Error!void {
fn renderExtraNewlineToken(
tree: *ast.Tree,
stream: var,
start_col: *usize,
first_token: ast.TokenIndex,
) @TypeOf(stream).Error!void {
var prev_token = first_token;
if (prev_token == 0) return;
var newline_threshold: usize = 2;
@ -626,7 +631,7 @@ fn renderExpression(
.ArrayInitializer, .ArrayInitializerDot => {
var rtoken: ast.TokenIndex = undefined;
var exprs: []*ast.Node = undefined;
const lhs: union(enum) {dot: ast.TokenIndex, node: *ast.Node } = switch (base.id){
const lhs: union(enum) { dot: ast.TokenIndex, node: *ast.Node } = switch (base.id) {
.ArrayInitializerDot => blk: {
const casted = @fieldParentPtr(ast.Node.ArrayInitializerDot, "base", base);
rtoken = casted.rtoken;
@ -678,7 +683,7 @@ fn renderExpression(
for (exprs) |expr, i| {
if (i + 1 < exprs.len) {
const expr_last_token = expr.lastToken() + 1;
const loc = tree.tokenLocation(tree.token_locs[expr_last_token].end, exprs[i+1].firstToken());
const loc = tree.tokenLocation(tree.token_locs[expr_last_token].end, exprs[i + 1].firstToken());
if (loc.line != 0) break :blk count;
count += 1;
} else {
@ -790,7 +795,7 @@ fn renderExpression(
.StructInitializer, .StructInitializerDot => {
var rtoken: ast.TokenIndex = undefined;
var field_inits: []*ast.Node = undefined;
const lhs: union(enum) {dot: ast.TokenIndex, node: *ast.Node } = switch (base.id){
const lhs: union(enum) { dot: ast.TokenIndex, node: *ast.Node } = switch (base.id) {
.StructInitializerDot => blk: {
const casted = @fieldParentPtr(ast.Node.StructInitializerDot, "base", base);
rtoken = casted.rtoken;
@ -1036,7 +1041,6 @@ fn renderExpression(
}
return renderToken(tree, stream, suffix_op.rtoken, indent, start_col, space); // ]
},
}
},
@ -2185,7 +2189,7 @@ fn renderParamDecl(
try renderToken(tree, stream, tree.nextToken(name_token), indent, start_col, Space.Space); // :
}
switch (param_decl.param_type) {
.var_args => |token| try renderToken(tree, stream, token, indent, start_col, space),
.var_args => |token| try renderToken(tree, stream, token, indent, start_col, space),
.var_type, .type_expr => |node| try renderExpression(allocator, stream, tree, indent, start_col, node, space),
}
}

14
src-self-hosted/translate_c.zig
View File

@ -600,7 +600,7 @@ fn visitFnDecl(c: *Context, fn_decl: *const ZigClangFunctionDecl) Error!void {
const mangled_param_name = try block_scope.makeMangledName(c, param_name);
if (!is_const) {
const bare_arg_name = try std.fmt.allocPrint(c.arena, "arg_{}", .{ mangled_param_name });
const bare_arg_name = try std.fmt.allocPrint(c.arena, "arg_{}", .{mangled_param_name});
const arg_name = try block_scope.makeMangledName(c, bare_arg_name);
const node = try transCreateNodeVarDecl(c, false, false, mangled_param_name);
node.eq_token = try appendToken(c, .Equal, "=");
@ -1440,7 +1440,12 @@ fn transCStyleCastExprClass(
return maybeSuppressResult(rp, scope, result_used, cast_node);
}
fn transDeclStmtOne(rp: RestorePoint, scope: *Scope, decl: *const ZigClangDecl, block_scope: *Scope.Block,) TransError!*ast.Node {
fn transDeclStmtOne(
rp: RestorePoint,
scope: *Scope,
decl: *const ZigClangDecl,
block_scope: *Scope.Block,
) TransError!*ast.Node {
const c = rp.c;
switch (ZigClangDecl_getKind(decl)) {
@ -3259,7 +3264,6 @@ fn transCreateCompoundAssign(
// common case
// c: lhs += rhs
// zig: lhs += rhs
if ((is_mod or is_div) and is_signed) {
const op_token = try appendToken(rp.c, .Equal, "=");
const op_node = try rp.c.arena.create(ast.Node.InfixOp);
@ -4791,7 +4795,7 @@ fn finishTransFnProto(
.comptime_token = null,
.noalias_token = null,
.name_token = null,
.param_type = .{ .var_args = try appendToken(rp.c, .Ellipsis3, "...") }
.param_type = .{ .var_args = try appendToken(rp.c, .Ellipsis3, "...") },
};
}
@ -5570,7 +5574,7 @@ fn parseCPrimaryExpr(c: *Context, it: *CTokenList.Iterator, source: []const u8,
};
return &node.base;
} else {
const token = try appendTokenFmt(c, .IntegerLiteral, "0x{x}", .{source[tok.start+1..tok.end-1]});
const token = try appendTokenFmt(c, .IntegerLiteral, "0x{x}", .{source[tok.start + 1 .. tok.end - 1]});
const node = try c.arena.create(ast.Node.IntegerLiteral);
node.* = .{
.token = token,