motiejus/zig
1
Fork 0
Code Releases Activity

zig fmt: fix inferred error union return types

Browse Source
This commit is contained in:
Isaac Freund
2021-02-15 13:54:48 +01:00
parent c2b4d51749
commit bbf5a4d7c5
2 changed files with 40 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

78
lib/std/zig/parser_test.zig
View File

@@ -442,23 +442,23 @@ test "zig fmt: array types last token" {
);
}
//test "zig fmt: sentinel-terminated array type" {
// try testCanonical(
// \\pub fn cStrToPrefixedFileW(s: [*:0]const u8) ![PATH_MAX_WIDE:0]u16 {
// \\ return sliceToPrefixedFileW(mem.toSliceConst(u8, s));
// \\}
// \\
// );
//}
//
//test "zig fmt: sentinel-terminated slice type" {
// try testCanonical(
// \\pub fn toSlice(self: Buffer) [:0]u8 {
// \\ return self.list.toSlice()[0..self.len()];
// \\}
// \\
// );
//}
test "zig fmt: sentinel-terminated array type" {
try testCanonical(
\\pub fn cStrToPrefixedFileW(s: [*:0]const u8) ![PATH_MAX_WIDE:0]u16 {
\\ return sliceToPrefixedFileW(mem.toSliceConst(u8, s));
\\}
\\
);
}
test "zig fmt: sentinel-terminated slice type" {
try testCanonical(
\\pub fn toSlice(self: Buffer) [:0]u8 {
\\ return self.list.toSlice()[0..self.len()];
\\}
\\
);
}
test "zig fmt: pointer-to-one with modifiers" {
try testCanonical(
@@ -2669,28 +2669,28 @@ test "zig fmt: call expression" {
// \\
// );
//}
//
//test "zig fmt: functions" {
// try testCanonical(
// \\extern fn puts(s: *const u8) c_int;
// \\extern "c" fn puts(s: *const u8) c_int;
// \\export fn puts(s: *const u8) c_int;
// \\fn puts(s: *const u8) callconv(.Inline) c_int;
// \\noinline fn puts(s: *const u8) c_int;
// \\pub extern fn puts(s: *const u8) c_int;
// \\pub extern "c" fn puts(s: *const u8) c_int;
// \\pub export fn puts(s: *const u8) c_int;
// \\pub fn puts(s: *const u8) callconv(.Inline) c_int;
// \\pub noinline fn puts(s: *const u8) c_int;
// \\pub extern fn puts(s: *const u8) align(2 + 2) c_int;
// \\pub extern "c" fn puts(s: *const u8) align(2 + 2) c_int;
// \\pub export fn puts(s: *const u8) align(2 + 2) c_int;
// \\pub fn puts(s: *const u8) align(2 + 2) callconv(.Inline) c_int;
// \\pub noinline fn puts(s: *const u8) align(2 + 2) c_int;
// \\
// );
//}
//
test "zig fmt: functions" {
try testCanonical(
\\extern fn puts(s: *const u8) c_int;
\\extern "c" fn puts(s: *const u8) c_int;
\\export fn puts(s: *const u8) c_int;
\\fn puts(s: *const u8) callconv(.Inline) c_int;
\\noinline fn puts(s: *const u8) c_int;
\\pub extern fn puts(s: *const u8) c_int;
\\pub extern "c" fn puts(s: *const u8) c_int;
\\pub export fn puts(s: *const u8) c_int;
\\pub fn puts(s: *const u8) callconv(.Inline) c_int;
\\pub noinline fn puts(s: *const u8) c_int;
\\pub extern fn puts(s: *const u8) align(2 + 2) c_int;
\\pub extern "c" fn puts(s: *const u8) align(2 + 2) c_int;
\\pub export fn puts(s: *const u8) align(2 + 2) c_int;
\\pub fn puts(s: *const u8) align(2 + 2) callconv(.Inline) c_int;
\\pub noinline fn puts(s: *const u8) align(2 + 2) c_int;
\\
);
}
//test "zig fmt: multiline string" {
// try testCanonical(
// \\test "" {

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

@@ -1250,7 +1250,7 @@ fn renderFnProto(ais: *Ais, tree: ast.Tree, fn_proto: ast.full.FnProto, space: S
const rparen = blk: {
// These may appear in any order, so we have to check the token_starts array
// to find out which is first.
var rparen: ast.TokenIndex = maybe_bang;
var rparen = if (token_tags[maybe_bang] == .bang) maybe_bang - 1 else maybe_bang;
var smallest_start = token_starts[maybe_bang];
if (fn_proto.ast.align_expr != 0) {
const tok = tree.firstToken(fn_proto.ast.align_expr) - 3;