Merge pull request #720 from zig-lang/require-return-type

syntax: functions require return type. remove `->`

1 files changed, 405 insertions, 405 deletions

diff --git a/test/compile_errors.zig b/test/compile_errors.zig
index b98b88468c..cc28f29f26 100644
--- a/test/compile_errors.zig
+++ b/test/compile_errors.zig
@@ -1,9 +1,9 @@
 const tests = @import("tests.zig");
 
-pub fn addCases(cases: &tests.CompileErrorContext) {
+pub fn addCases(cases: &tests.CompileErrorContext) void {
     cases.add("function with non-extern enum parameter",
         \\const Foo = enum { A, B, C };
-        \\export fn entry(foo: Foo) { }
+        \\export fn entry(foo: Foo) void { }
     , ".tmp_source.zig:2:22: error: parameter of type 'Foo' not allowed in function with calling convention 'ccc'");
 
     cases.add("function with non-extern struct parameter",
@@ -12,7 +12,7 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
         \\    B: f32,
         \\    C: bool,
         \\};
-        \\export fn entry(foo: Foo) { }
+        \\export fn entry(foo: Foo) void { }
     , ".tmp_source.zig:6:22: error: parameter of type 'Foo' not allowed in function with calling convention 'ccc'");
 
     cases.add("function with non-extern union parameter",
@@ -21,13 +21,13 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
         \\    B: f32,
         \\    C: bool,
         \\};
-        \\export fn entry(foo: Foo) { }
+        \\export fn entry(foo: Foo) void { }
     , ".tmp_source.zig:6:22: error: parameter of type 'Foo' not allowed in function with calling convention 'ccc'");
 
     cases.add("switch on enum with 1 field with no prongs",
         \\const Foo = enum { M };
         \\
-        \\export fn entry() {
+        \\export fn entry() void {
         \\    var f = Foo.M;
         \\    switch (f) {}
         \\}
@@ -40,7 +40,7 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
     , ".tmp_source.zig:2:18: error: shift by negative value -1");
 
     cases.add("@panic called at compile time",
-        \\export fn entry() {
+        \\export fn entry() void {
         \\    comptime {
         \\        @panic("aoeu");
         \\    }
@@ -48,16 +48,16 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
     , ".tmp_source.zig:3:9: error: encountered @panic at compile-time");
 
     cases.add("wrong return type for main",
-        \\pub fn main() -> f32 { }
+        \\pub fn main() f32 { }
     , "error: expected return type of main to be 'u8', 'noreturn', 'void', or '%void'");
 
     cases.add("double ?? on main return value",
-        \\pub fn main() -> ??void {
+        \\pub fn main() ??void {
         \\}
     , "error: expected return type of main to be 'u8', 'noreturn', 'void', or '%void'");
 
     cases.add("bad identifier in function with struct defined inside function which references local const",
-        \\export fn entry() {
+        \\export fn entry() void {
         \\    const BlockKind = u32;
         \\
         \\    const Block = struct {
@@ -69,7 +69,7 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
     , ".tmp_source.zig:8:5: error: use of undeclared identifier 'bogus'");
 
     cases.add("labeled break not found",
-        \\export fn entry() {
+        \\export fn entry() void {
         \\    blah: while (true) {
         \\        while (true) {
         \\            break :outer;
@@ -79,7 +79,7 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
     , ".tmp_source.zig:4:13: error: label not found: 'outer'");
 
     cases.add("labeled continue not found",
-        \\export fn entry() {
+        \\export fn entry() void {
         \\    var i: usize = 0;
         \\    blah: while (i < 10) : (i += 1) {
         \\        while (true) {
@@ -90,17 +90,17 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
     , ".tmp_source.zig:5:13: error: labeled loop not found: 'outer'");
 
     cases.add("attempt to use 0 bit type in extern fn",
-        \\extern fn foo(ptr: extern fn(&void));
+        \\extern fn foo(ptr: extern fn(&void) void) void;
         \\
-        \\export fn entry() {
+        \\export fn entry() void {
         \\    foo(bar);
         \\}
         \\
-        \\extern fn bar(x: &void) { }
+        \\extern fn bar(x: &void) void { }
     , ".tmp_source.zig:7:18: error: parameter of type '&void' has 0 bits; not allowed in function with calling convention 'ccc'");
 
     cases.add("implicit semicolon - block statement",
-        \\export fn entry() {
+        \\export fn entry() void {
         \\    {}
         \\    var good = {};
         \\    ({})
@@ -109,7 +109,7 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
     , ".tmp_source.zig:5:5: error: expected token ';', found 'var'");
 
     cases.add("implicit semicolon - block expr",
-        \\export fn entry() {
+        \\export fn entry() void {
         \\    _ = {};
         \\    var good = {};
         \\    _ = {}
@@ -118,7 +118,7 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
     , ".tmp_source.zig:5:5: error: expected token ';', found 'var'");
 
     cases.add("implicit semicolon - comptime statement",
-        \\export fn entry() {
+        \\export fn entry() void {
         \\    comptime {}
         \\    var good = {};
         \\    comptime ({})
@@ -127,7 +127,7 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
     , ".tmp_source.zig:5:5: error: expected token ';', found 'var'");
 
     cases.add("implicit semicolon - comptime expression",
-        \\export fn entry() {
+        \\export fn entry() void {
         \\    _ = comptime {};
         \\    var good = {};
         \\    _ = comptime {}
@@ -136,7 +136,7 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
     , ".tmp_source.zig:5:5: error: expected token ';', found 'var'");
 
     cases.add("implicit semicolon - defer",
-        \\export fn entry() {
+        \\export fn entry() void {
         \\    defer {}
         \\    var good = {};
         \\    defer ({})
@@ -145,7 +145,7 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
     , ".tmp_source.zig:5:5: error: expected token ';', found 'var'");
 
     cases.add("implicit semicolon - if statement",
-        \\export fn entry() {
+        \\export fn entry() void {
         \\    if(true) {}
         \\    var good = {};
         \\    if(true) ({})
@@ -154,7 +154,7 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
     , ".tmp_source.zig:5:5: error: expected token ';', found 'var'");
 
     cases.add("implicit semicolon - if expression",
-        \\export fn entry() {
+        \\export fn entry() void {
         \\    _ = if(true) {};
         \\    var good = {};
         \\    _ = if(true) {}
@@ -163,7 +163,7 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
     , ".tmp_source.zig:5:5: error: expected token ';', found 'var'");
 
     cases.add("implicit semicolon - if-else statement",
-        \\export fn entry() {
+        \\export fn entry() void {
         \\    if(true) {} else {}
         \\    var good = {};
         \\    if(true) ({}) else ({})
@@ -172,7 +172,7 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
     , ".tmp_source.zig:5:5: error: expected token ';', found 'var'");
 
     cases.add("implicit semicolon - if-else expression",
-        \\export fn entry() {
+        \\export fn entry() void {
         \\    _ = if(true) {} else {};
         \\    var good = {};
         \\    _ = if(true) {} else {}
@@ -181,7 +181,7 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
     , ".tmp_source.zig:5:5: error: expected token ';', found 'var'");
 
     cases.add("implicit semicolon - if-else-if statement",
-        \\export fn entry() {
+        \\export fn entry() void {
         \\    if(true) {} else if(true) {}
         \\    var good = {};
         \\    if(true) ({}) else if(true) ({})
@@ -190,7 +190,7 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
     , ".tmp_source.zig:5:5: error: expected token ';', found 'var'");
 
     cases.add("implicit semicolon - if-else-if expression",
-        \\export fn entry() {
+        \\export fn entry() void {
         \\    _ = if(true) {} else if(true) {};
         \\    var good = {};
         \\    _ = if(true) {} else if(true) {}
@@ -199,7 +199,7 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
     , ".tmp_source.zig:5:5: error: expected token ';', found 'var'");
 
     cases.add("implicit semicolon - if-else-if-else statement",
-        \\export fn entry() {
+        \\export fn entry() void {
         \\    if(true) {} else if(true) {} else {}
         \\    var good = {};
         \\    if(true) ({}) else if(true) ({}) else ({})
@@ -208,7 +208,7 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
     , ".tmp_source.zig:5:5: error: expected token ';', found 'var'");
 
     cases.add("implicit semicolon - if-else-if-else expression",
-        \\export fn entry() {
+        \\export fn entry() void {
         \\    _ = if(true) {} else if(true) {} else {};
         \\    var good = {};
         \\    _ = if(true) {} else if(true) {} else {}
@@ -217,7 +217,7 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
     , ".tmp_source.zig:5:5: error: expected token ';', found 'var'");
 
     cases.add("implicit semicolon - test statement",
-        \\export fn entry() {
+        \\export fn entry() void {
         \\    if (foo()) |_| {}
         \\    var good = {};
         \\    if (foo()) |_| ({})
@@ -226,7 +226,7 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
     , ".tmp_source.zig:5:5: error: expected token ';', found 'var'");
 
     cases.add("implicit semicolon - test expression",
-        \\export fn entry() {
+        \\export fn entry() void {
         \\    _ = if (foo()) |_| {};
         \\    var good = {};
         \\    _ = if (foo()) |_| {}
@@ -235,7 +235,7 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
     , ".tmp_source.zig:5:5: error: expected token ';', found 'var'");
 
     cases.add("implicit semicolon - while statement",
-        \\export fn entry() {
+        \\export fn entry() void {
         \\    while(true) {}
         \\    var good = {};
         \\    while(true) ({})
@@ -244,7 +244,7 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
     , ".tmp_source.zig:5:5: error: expected token ';', found 'var'");
 
     cases.add("implicit semicolon - while expression",
-        \\export fn entry() {
+        \\export fn entry() void {
         \\    _ = while(true) {};
         \\    var good = {};
         \\    _ = while(true) {}
@@ -253,7 +253,7 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
     , ".tmp_source.zig:5:5: error: expected token ';', found 'var'");
 
     cases.add("implicit semicolon - while-continue statement",
-        \\export fn entry() {
+        \\export fn entry() void {
         \\    while(true):({}) {}
         \\    var good = {};
         \\    while(true):({}) ({})
@@ -262,7 +262,7 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
     , ".tmp_source.zig:5:5: error: expected token ';', found 'var'");
 
     cases.add("implicit semicolon - while-continue expression",
-        \\export fn entry() {
+        \\export fn entry() void {
         \\    _ = while(true):({}) {};
         \\    var good = {};
         \\    _ = while(true):({}) {}
@@ -271,7 +271,7 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
     , ".tmp_source.zig:5:5: error: expected token ';', found 'var'");
 
     cases.add("implicit semicolon - for statement",
-        \\export fn entry() {
+        \\export fn entry() void {
         \\    for(foo()) {}
         \\    var good = {};
         \\    for(foo()) ({})
@@ -280,7 +280,7 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
     , ".tmp_source.zig:5:5: error: expected token ';', found 'var'");
 
     cases.add("implicit semicolon - for expression",
-        \\export fn entry() {
+        \\export fn entry() void {
         \\    _ = for(foo()) {};
         \\    var good = {};
         \\    _ = for(foo()) {}
@@ -289,60 +289,60 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
     , ".tmp_source.zig:5:5: error: expected token ';', found 'var'");
 
     cases.add("multiple function definitions",
-        \\fn a() {}
-        \\fn a() {}
-        \\export fn entry() { a(); }
+        \\fn a() void {}
+        \\fn a() void {}
+        \\export fn entry() void { a(); }
     , ".tmp_source.zig:2:1: error: redefinition of 'a'");
 
     cases.add("unreachable with return",
-        \\fn a() -> noreturn {return;}
-        \\export fn entry() { a(); }
-    , ".tmp_source.zig:1:21: error: expected type 'noreturn', found 'void'");
+        \\fn a() noreturn {return;}
+        \\export fn entry() void { a(); }
+    , ".tmp_source.zig:1:18: error: expected type 'noreturn', found 'void'");
 
     cases.add("control reaches end of non-void function",
-        \\fn a() -> i32 {}
-        \\export fn entry() { _ = a(); }
-    , ".tmp_source.zig:1:15: error: expected type 'i32', found 'void'");
+        \\fn a() i32 {}
+        \\export fn entry() void { _ = a(); }
+    , ".tmp_source.zig:1:12: error: expected type 'i32', found 'void'");
 
     cases.add("undefined function call",
-        \\export fn a() {
+        \\export fn a() void {
         \\    b();
         \\}
     , ".tmp_source.zig:2:5: error: use of undeclared identifier 'b'");
 
     cases.add("wrong number of arguments",
-        \\export fn a() {
+        \\export fn a() void {
         \\    b(1);
         \\}
-        \\fn b(a: i32, b: i32, c: i32) { }
+        \\fn b(a: i32, b: i32, c: i32) void { }
     , ".tmp_source.zig:2:6: error: expected 3 arguments, found 1");
 
     cases.add("invalid type",
-        \\fn a() -> bogus {}
-        \\export fn entry() { _ = a(); }
-    , ".tmp_source.zig:1:11: error: use of undeclared identifier 'bogus'");
+        \\fn a() bogus {}
+        \\export fn entry() void { _ = a(); }
+    , ".tmp_source.zig:1:8: error: use of undeclared identifier 'bogus'");
 
     cases.add("pointer to unreachable",
-        \\fn a() -> &noreturn {}
-        \\export fn entry() { _ = a(); }
-    , ".tmp_source.zig:1:12: error: pointer to unreachable not allowed");
+        \\fn a() &noreturn {}
+        \\export fn entry() void { _ = a(); }
+    , ".tmp_source.zig:1:9: error: pointer to unreachable not allowed");
 
     cases.add("unreachable code",
-        \\export fn a() {
+        \\export fn a() void {
         \\    return;
         \\    b();
         \\}
         \\
-        \\fn b() {}
+        \\fn b() void {}
     , ".tmp_source.zig:3:5: error: unreachable code");
 
     cases.add("bad import",
         \\const bogus = @import("bogus-does-not-exist.zig");
-        \\export fn entry() { bogus.bogo(); }
+        \\export fn entry() void { bogus.bogo(); }
     , ".tmp_source.zig:1:15: error: unable to find 'bogus-does-not-exist.zig'");
 
     cases.add("undeclared identifier",
-        \\export fn a() {
+        \\export fn a() void {
         \\    return
         \\    b +
         \\    c;
@@ -352,89 +352,89 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
             ".tmp_source.zig:4:5: error: use of undeclared identifier 'c'");
 
     cases.add("parameter redeclaration",
-        \\fn f(a : i32, a : i32) {
+        \\fn f(a : i32, a : i32) void {
         \\}
-        \\export fn entry() { f(1, 2); }
+        \\export fn entry() void { f(1, 2); }
     , ".tmp_source.zig:1:15: error: redeclaration of variable 'a'");
 
     cases.add("local variable redeclaration",
-        \\export fn f() {
+        \\export fn f() void {
         \\    const a : i32 = 0;
         \\    const a = 0;
         \\}
     , ".tmp_source.zig:3:5: error: redeclaration of variable 'a'");
 
     cases.add("local variable redeclares parameter",
-        \\fn f(a : i32) {
+        \\fn f(a : i32) void {
         \\    const a = 0;
         \\}
-        \\export fn entry() { f(1); }
+        \\export fn entry() void { f(1); }
     , ".tmp_source.zig:2:5: error: redeclaration of variable 'a'");
 
     cases.add("variable has wrong type",
-        \\export fn f() -> i32 {
+        \\export fn f() i32 {
         \\    const a = c"a";
         \\    return a;
         \\}
     , ".tmp_source.zig:3:12: error: expected type 'i32', found '&const u8'");
 
     cases.add("if condition is bool, not int",
-        \\export fn f() {
+        \\export fn f() void {
         \\    if (0) {}
         \\}
     , ".tmp_source.zig:2:9: error: integer value 0 cannot be implicitly casted to type 'bool'");
 
     cases.add("assign unreachable",
-        \\export fn f() {
+        \\export fn f() void {
         \\    const a = return;
         \\}
     , ".tmp_source.zig:2:5: error: unreachable code");
 
     cases.add("unreachable variable",
-        \\export fn f() {
+        \\export fn f() void {
         \\    const a: noreturn = {};
         \\}
     , ".tmp_source.zig:2:14: error: variable of type 'noreturn' not allowed");
 
     cases.add("unreachable parameter",
-        \\fn f(a: noreturn) {}
-        \\export fn entry() { f(); }
+        \\fn f(a: noreturn) void {}
+        \\export fn entry() void { f(); }
     , ".tmp_source.zig:1:9: error: parameter of type 'noreturn' not allowed");
 
     cases.add("bad assignment target",
-        \\export fn f() {
+        \\export fn f() void {
         \\    3 = 3;
         \\}
     , ".tmp_source.zig:2:7: error: cannot assign to constant");
 
     cases.add("assign to constant variable",
-        \\export fn f() {
+        \\export fn f() void {
         \\    const a = 3;
         \\    a = 4;
         \\}
     , ".tmp_source.zig:3:7: error: cannot assign to constant");
 
     cases.add("use of undeclared identifier",
-        \\export fn f() {
+        \\export fn f() void {
         \\    b = 3;
         \\}
     , ".tmp_source.zig:2:5: error: use of undeclared identifier 'b'");
 
     cases.add("const is a statement, not an expression",
-        \\export fn f() {
+        \\export fn f() void {
         \\    (const a = 0);
         \\}
     , ".tmp_source.zig:2:6: error: invalid token: 'const'");
 
     cases.add("array access of undeclared identifier",
-        \\export fn f() {
+        \\export fn f() void {
         \\    i[i] = i[i];
         \\}
     , ".tmp_source.zig:2:5: error: use of undeclared identifier 'i'",
                  ".tmp_source.zig:2:12: error: use of undeclared identifier 'i'");
 
     cases.add("array access of non array",
-        \\export fn f() {
+        \\export fn f() void {
         \\    var bad : bool = undefined;
         \\    bad[bad] = bad[bad];
         \\}
@@ -442,7 +442,7 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
                  ".tmp_source.zig:3:19: error: array access of non-array type 'bool'");
 
     cases.add("array access with non integer index",
-        \\export fn f() {
+        \\export fn f() void {
         \\    var array = "aoeu";
         \\    var bad = false;
         \\    array[bad] = array[bad];
@@ -452,37 +452,37 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
 
     cases.add("write to const global variable",
         \\const x : i32 = 99;
-        \\fn f() {
+        \\fn f() void {
         \\    x = 1;
         \\}
-        \\export fn entry() { f(); }
+        \\export fn entry() void { f(); }
     , ".tmp_source.zig:3:7: error: cannot assign to constant");
 
 
     cases.add("missing else clause",
-        \\fn f(b: bool) {
+        \\fn f(b: bool) void {
         \\    const x : i32 = if (b) h: { break :h 1; };
         \\    const y = if (b) h: { break :h i32(1); };
         \\}
-        \\export fn entry() { f(true); }
+        \\export fn entry() void { f(true); }
     , ".tmp_source.zig:2:42: error: integer value 1 cannot be implicitly casted to type 'void'",
                  ".tmp_source.zig:3:15: error: incompatible types: 'i32' and 'void'");
 
     cases.add("direct struct loop",
         \\const A = struct { a : A, };
-        \\export fn entry() -> usize { return @sizeOf(A); }
+        \\export fn entry() usize { return @sizeOf(A); }
     , ".tmp_source.zig:1:11: error: struct 'A' contains itself");
 
     cases.add("indirect struct loop",
         \\const A = struct { b : B, };
         \\const B = struct { c : C, };
         \\const C = struct { a : A, };
-        \\export fn entry() -> usize { return @sizeOf(A); }
+        \\export fn entry() usize { return @sizeOf(A); }
     , ".tmp_source.zig:1:11: error: struct 'A' contains itself");
 
     cases.add("invalid struct field",
         \\const A = struct { x : i32, };
-        \\export fn f() {
+        \\export fn f() void {
         \\    var a : A = undefined;
         \\    a.foo = 1;
         \\    const y = a.bar;
@@ -514,7 +514,7 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
         \\    y : i32,
         \\    z : i32,
         \\};
-        \\export fn f() {
+        \\export fn f() void {
         \\    const a = A {
         \\        .z = 1,
         \\        .y = 2,
@@ -530,7 +530,7 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
         \\    y : i32,
         \\    z : i32,
         \\};
-        \\export fn f() {
+        \\export fn f() void {
         \\    // we want the error on the '{' not the 'A' because
         \\    // the A could be a complicated expression
         \\    const a = A {
@@ -546,7 +546,7 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
         \\    y : i32,
         \\    z : i32,
         \\};
-        \\export fn f() {
+        \\export fn f() void {
         \\    const a = A {
         \\        .z = 4,
         \\        .y = 2,
@@ -556,57 +556,57 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
     , ".tmp_source.zig:10:9: error: no member named 'foo' in struct 'A'");
 
     cases.add("invalid break expression",
-        \\export fn f() {
+        \\export fn f() void {
         \\    break;
         \\}
     , ".tmp_source.zig:2:5: error: break expression outside loop");
 
     cases.add("invalid continue expression",
-        \\export fn f() {
+        \\export fn f() void {
         \\    continue;
         \\}
     , ".tmp_source.zig:2:5: error: continue expression outside loop");
 
     cases.add("invalid maybe type",
-        \\export fn f() {
+        \\export fn f() void {
         \\    if (true) |x| { }
         \\}
     , ".tmp_source.zig:2:9: error: expected nullable type, found 'bool'");
 
     cases.add("cast unreachable",
-        \\fn f() -> i32 {
+        \\fn f() i32 {
         \\    return i32(return 1);
         \\}
-        \\export fn entry() { _ = f(); }
+        \\export fn entry() void { _ = f(); }
     , ".tmp_source.zig:2:15: error: unreachable code");
 
     cases.add("invalid builtin fn",
-        \\fn f() -> @bogus(foo) {
+        \\fn f() @bogus(foo) {
         \\}
-        \\export fn entry() { _ = f(); }
-    , ".tmp_source.zig:1:11: error: invalid builtin function: 'bogus'");
+        \\export fn entry() void { _ = f(); }
+    , ".tmp_source.zig:1:8: error: invalid builtin function: 'bogus'");
 
     cases.add("top level decl dependency loop",
         \\const a : @typeOf(b) = 0;
         \\const b : @typeOf(a) = 0;
-        \\export fn entry() {
+        \\export fn entry() void {
         \\    const c = a + b;
         \\}
     , ".tmp_source.zig:1:1: error: 'a' depends on itself");
 
     cases.add("noalias on non pointer param",
-        \\fn f(noalias x: i32) {}
-        \\export fn entry() { f(1234); }
+        \\fn f(noalias x: i32) void {}
+        \\export fn entry() void { f(1234); }
     , ".tmp_source.zig:1:6: error: noalias on non-pointer parameter");
 
     cases.add("struct init syntax for array",
         \\const foo = []u16{.x = 1024,};
-        \\export fn entry() -> usize { return @sizeOf(@typeOf(foo)); }
+        \\export fn entry() usize { return @sizeOf(@typeOf(foo)); }
     , ".tmp_source.zig:1:18: error: type '[]u16' does not support struct initialization syntax");
 
     cases.add("type variables must be constant",
         \\var foo = u8;
-        \\export fn entry() -> foo {
+        \\export fn entry() foo {
         \\    return 1;
         \\}
     , ".tmp_source.zig:1:1: error: variable of type 'type' must be constant");
@@ -616,11 +616,11 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
         \\const Foo = struct {};
         \\const Bar = struct {};
         \\
-        \\fn f(Foo: i32) {
+        \\fn f(Foo: i32) void {
         \\    var Bar : i32 = undefined;
         \\}
         \\
-        \\export fn entry() {
+        \\export fn entry() void {
         \\    f(1234);
         \\}
     ,
@@ -636,7 +636,7 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
         \\    Three,
         \\    Four,
         \\};
-        \\fn f(n: Number) -> i32 {
+        \\fn f(n: Number) i32 {
         \\    switch (n) {
         \\        Number.One => 1,
         \\        Number.Two => 2,
@@ -644,7 +644,7 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
         \\    }
         \\}
         \\
-        \\export fn entry() -> usize { return @sizeOf(@typeOf(f)); }
+        \\export fn entry() usize { return @sizeOf(@typeOf(f)); }
     , ".tmp_source.zig:8:5: error: enumeration value 'Number.Four' not handled in switch");
 
     cases.add("switch expression - duplicate enumeration prong",
@@ -654,7 +654,7 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
         \\    Three,
         \\    Four,
         \\};
-        \\fn f(n: Number) -> i32 {
+        \\fn f(n: Number) i32 {
         \\    switch (n) {
         \\        Number.One => 1,
         \\        Number.Two => 2,
@@ -664,7 +664,7 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
         \\    }
         \\}
         \\
-        \\export fn entry() -> usize { return @sizeOf(@typeOf(f)); }
+        \\export fn entry() usize { return @sizeOf(@typeOf(f)); }
     , ".tmp_source.zig:13:15: error: duplicate switch value",
       ".tmp_source.zig:10:15: note: other value is here");
 
@@ -675,7 +675,7 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
         \\    Three,
         \\    Four,
         \\};
-        \\fn f(n: Number) -> i32 {
+        \\fn f(n: Number) i32 {
         \\    switch (n) {
         \\        Number.One => 1,
         \\        Number.Two => 2,
@@ -686,35 +686,35 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
         \\    }
         \\}
         \\
-        \\export fn entry() -> usize { return @sizeOf(@typeOf(f)); }
+        \\export fn entry() usize { return @sizeOf(@typeOf(f)); }
     , ".tmp_source.zig:13:15: error: duplicate switch value",
       ".tmp_source.zig:10:15: note: other value is here");
 
     cases.add("switch expression - multiple else prongs",
-        \\fn f(x: u32) {
+        \\fn f(x: u32) void {
         \\    const value: bool = switch (x) {
         \\        1234 => false,
         \\        else => true,
         \\        else => true,
         \\    };
         \\}
-        \\export fn entry() {
+        \\export fn entry() void {
         \\    f(1234);
         \\}
     , ".tmp_source.zig:5:9: error: multiple else prongs in switch expression");
 
     cases.add("switch expression - non exhaustive integer prongs",
-        \\fn foo(x: u8) {
+        \\fn foo(x: u8) void {
         \\    switch (x) {
         \\        0 => {},
         \\    }
         \\}
-        \\export fn entry() -> usize { return @sizeOf(@typeOf(foo)); }
+        \\export fn entry() usize { return @sizeOf(@typeOf(foo)); }
     ,
         ".tmp_source.zig:2:5: error: switch must handle all possibilities");
 
     cases.add("switch expression - duplicate or overlapping integer value",
-        \\fn foo(x: u8) -> u8 {
+        \\fn foo(x: u8) u8 {
         \\    return switch (x) {
         \\        0 ... 100 => u8(0),
         \\        101 ... 200 => 1,
@@ -722,26 +722,26 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
         \\        206 ... 255 => 3,
         \\    };
         \\}
-        \\export fn entry() -> usize { return @sizeOf(@typeOf(foo)); }
+        \\export fn entry() usize { return @sizeOf(@typeOf(foo)); }
     ,
         ".tmp_source.zig:6:9: error: duplicate switch value",
         ".tmp_source.zig:5:14: note: previous value is here");
 
     cases.add("switch expression - switch on pointer type with no else",
-        \\fn foo(x: &u8) {
+        \\fn foo(x: &u8) void {
         \\    switch (x) {
         \\        &y => {},
         \\    }
         \\}
         \\const y: u8 = 100;
-        \\export fn entry() -> usize { return @sizeOf(@typeOf(foo)); }
+        \\export fn entry() usize { return @sizeOf(@typeOf(foo)); }
     ,
         ".tmp_source.zig:2:5: error: else prong required when switching on type '&u8'");
 
     cases.add("global variable initializer must be constant expression",
-        \\extern fn foo() -> i32;
+        \\extern fn foo() i32;
         \\const x = foo();
-        \\export fn entry() -> i32 { return x; }
+        \\export fn entry() i32 { return x; }
     , ".tmp_source.zig:2:11: error: unable to evaluate constant expression");
 
     cases.add("array concatenation with wrong type",
@@ -749,38 +749,38 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
         \\const derp = usize(1234);
         \\const a = derp ++ "foo";
         \\
-        \\export fn entry() -> usize { return @sizeOf(@typeOf(a)); }
+        \\export fn entry() usize { return @sizeOf(@typeOf(a)); }
     , ".tmp_source.zig:3:11: error: expected array or C string literal, found 'usize'");
 
     cases.add("non compile time array concatenation",
-        \\fn f() -> []u8 {
+        \\fn f() []u8 {
         \\    return s ++ "foo";
         \\}
         \\var s: [10]u8 = undefined;
-        \\export fn entry() -> usize { return @sizeOf(@typeOf(f)); }
+        \\export fn entry() usize { return @sizeOf(@typeOf(f)); }
     , ".tmp_source.zig:2:12: error: unable to evaluate constant expression");
 
     cases.add("@cImport with bogus include",
         \\const c = @cImport(@cInclude("bogus.h"));
-        \\export fn entry() -> usize { return @sizeOf(@typeOf(c.bogo)); }
+        \\export fn entry() usize { return @sizeOf(@typeOf(c.bogo)); }
     , ".tmp_source.zig:1:11: error: C import failed",
                  ".h:1:10: note: 'bogus.h' file not found");
 
     cases.add("address of number literal",
         \\const x = 3;
         \\const y = &x;
-        \\fn foo() -> &const i32 { return y; }
-        \\export fn entry() -> usize { return @sizeOf(@typeOf(foo)); }
-    , ".tmp_source.zig:3:33: error: expected type '&const i32', found '&const (integer literal)'");
+        \\fn foo() &const i32 { return y; }
+        \\export fn entry() usize { return @sizeOf(@typeOf(foo)); }
+    , ".tmp_source.zig:3:30: error: expected type '&const i32', found '&const (integer literal)'");
 
     cases.add("integer overflow error",
         \\const x : u8 = 300;
-        \\export fn entry() -> usize { return @sizeOf(@typeOf(x)); }
+        \\export fn entry() usize { return @sizeOf(@typeOf(x)); }
     , ".tmp_source.zig:1:16: error: integer value 300 cannot be implicitly casted to type 'u8'");
 
     cases.add("incompatible number literals",
         \\const x = 2 == 2.0;
-        \\export fn entry() -> usize { return @sizeOf(@typeOf(x)); }
+        \\export fn entry() usize { return @sizeOf(@typeOf(x)); }
     , ".tmp_source.zig:1:11: error: integer value 2 cannot be implicitly casted to type '(float literal)'");
 
     cases.add("missing function call param",
@@ -788,10 +788,10 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
         \\    a: i32,
         \\    b: i32,
         \\
-        \\    fn member_a(foo: &const Foo) -> i32 {
+        \\    fn member_a(foo: &const Foo) i32 {
         \\        return foo.a;
         \\    }
-        \\    fn member_b(foo: &const Foo) -> i32 {
+        \\    fn member_b(foo: &const Foo) i32 {
         \\        return foo.b;
         \\    }
         \\};
@@ -802,59 +802,59 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
         \\    Foo.member_b,
         \\};
         \\
-        \\fn f(foo: &const Foo, index: usize) {
+        \\fn f(foo: &const Foo, index: usize) void {
         \\    const result = members[index]();
         \\}
         \\
-        \\export fn entry() -> usize { return @sizeOf(@typeOf(f)); }
+        \\export fn entry() usize { return @sizeOf(@typeOf(f)); }
     , ".tmp_source.zig:20:34: error: expected 1 arguments, found 0");
 
     cases.add("missing function name and param name",
-        \\fn () {}
-        \\fn f(i32) {}
-        \\export fn entry() -> usize { return @sizeOf(@typeOf(f)); }
+        \\fn () void {}
+        \\fn f(i32) void {}
+        \\export fn entry() usize { return @sizeOf(@typeOf(f)); }
     ,
             ".tmp_source.zig:1:1: error: missing function name",
             ".tmp_source.zig:2:6: error: missing parameter name");
 
     cases.add("wrong function type",
-        \\const fns = []fn(){ a, b, c };
-        \\fn a() -> i32 {return 0;}
-        \\fn b() -> i32 {return 1;}
-        \\fn c() -> i32 {return 2;}
-        \\export fn entry() -> usize { return @sizeOf(@typeOf(fns)); }
-    , ".tmp_source.zig:1:21: error: expected type 'fn()', found 'fn() -> i32'");
+        \\const fns = []fn() void { a, b, c };
+        \\fn a() i32 {return 0;}
+        \\fn b() i32 {return 1;}
+        \\fn c() i32 {return 2;}
+        \\export fn entry() usize { return @sizeOf(@typeOf(fns)); }
+    , ".tmp_source.zig:1:27: error: expected type 'fn() void', found 'fn() i32'");
 
     cases.add("extern function pointer mismatch",
-        \\const fns = [](fn(i32)->i32){ a, b, c };
-        \\pub fn a(x: i32) -> i32 {return x + 0;}
-        \\pub fn b(x: i32) -> i32 {return x + 1;}
-        \\export fn c(x: i32) -> i32 {return x + 2;}
+        \\const fns = [](fn(i32)i32) { a, b, c };
+        \\pub fn a(x: i32) i32 {return x + 0;}
+        \\pub fn b(x: i32) i32 {return x + 1;}
+        \\export fn c(x: i32) i32 {return x + 2;}
         \\
-        \\export fn entry() -> usize { return @sizeOf(@typeOf(fns)); }
-    , ".tmp_source.zig:1:37: error: expected type 'fn(i32) -> i32', found 'extern fn(i32) -> i32'");
+        \\export fn entry() usize { return @sizeOf(@typeOf(fns)); }
+    , ".tmp_source.zig:1:36: error: expected type 'fn(i32) i32', found 'extern fn(i32) i32'");
 
 
     cases.add("implicit cast from f64 to f32",
         \\const x : f64 = 1.0;
         \\const y : f32 = x;
         \\
-        \\export fn entry() -> usize { return @sizeOf(@typeOf(y)); }
+        \\export fn entry() usize { return @sizeOf(@typeOf(y)); }
     , ".tmp_source.zig:2:17: error: expected type 'f32', found 'f64'");
 
 
     cases.add("colliding invalid top level functions",
-        \\fn func() -> bogus {}
-        \\fn func() -> bogus {}
-        \\export fn entry() -> usize { return @sizeOf(@typeOf(func)); }
+        \\fn func() bogus {}
+        \\fn func() bogus {}
+        \\export fn entry() usize { return @sizeOf(@typeOf(func)); }
     ,
             ".tmp_source.zig:2:1: error: redefinition of 'func'",
-            ".tmp_source.zig:1:14: error: use of undeclared identifier 'bogus'");
+            ".tmp_source.zig:1:11: error: use of undeclared identifier 'bogus'");
 
 
     cases.add("bogus compile var",
         \\const x = @import("builtin").bogus;
-        \\export fn entry() -> usize { return @sizeOf(@typeOf(x)); }
+        \\export fn entry() usize { return @sizeOf(@typeOf(x)); }
     , ".tmp_source.zig:1:29: error: no member named 'bogus' in '");
 
 
@@ -863,11 +863,11 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
         \\    y: [get()]u8,
         \\};
         \\var global_var: usize = 1;
-        \\fn get() -> usize { return global_var; }
+        \\fn get() usize { return global_var; }
         \\
-        \\export fn entry() -> usize { return @sizeOf(@typeOf(Foo)); }
+        \\export fn entry() usize { return @sizeOf(@typeOf(Foo)); }
     ,
-            ".tmp_source.zig:5:28: error: unable to evaluate constant expression",
+            ".tmp_source.zig:5:25: error: unable to evaluate constant expression",
             ".tmp_source.zig:2:12: note: called from here",
             ".tmp_source.zig:2:8: note: called from here");
 
@@ -878,7 +878,7 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
         \\};
         \\const x = Foo {.field = 1} + Foo {.field = 2};
         \\
-        \\export fn entry() -> usize { return @sizeOf(@typeOf(x)); }
+        \\export fn entry() usize { return @sizeOf(@typeOf(x)); }
     , ".tmp_source.zig:4:28: error: invalid operands to binary expression: 'Foo' and 'Foo'");
 
 
@@ -888,10 +888,10 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
         \\const int_x = u32(1) / u32(0);
         \\const float_x = f32(1.0) / f32(0.0);
         \\
-        \\export fn entry1() -> usize { return @sizeOf(@typeOf(lit_int_x)); }
-        \\export fn entry2() -> usize { return @sizeOf(@typeOf(lit_float_x)); }
-        \\export fn entry3() -> usize { return @sizeOf(@typeOf(int_x)); }
-        \\export fn entry4() -> usize { return @sizeOf(@typeOf(float_x)); }
+        \\export fn entry1() usize { return @sizeOf(@typeOf(lit_int_x)); }
+        \\export fn entry2() usize { return @sizeOf(@typeOf(lit_float_x)); }
+        \\export fn entry3() usize { return @sizeOf(@typeOf(int_x)); }
+        \\export fn entry4() usize { return @sizeOf(@typeOf(float_x)); }
     ,
             ".tmp_source.zig:1:21: error: division by zero",
             ".tmp_source.zig:2:25: error: division by zero",
@@ -903,45 +903,45 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
         \\const foo = "a
         \\b";
         \\
-        \\export fn entry() -> usize { return @sizeOf(@typeOf(foo)); }
+        \\export fn entry() usize { return @sizeOf(@typeOf(foo)); }
     , ".tmp_source.zig:1:13: error: newline not allowed in string literal");
 
     cases.add("invalid comparison for function pointers",
-        \\fn foo() {}
+        \\fn foo() void {}
         \\const invalid = foo > foo;
         \\
-        \\export fn entry() -> usize { return @sizeOf(@typeOf(invalid)); }
-    , ".tmp_source.zig:2:21: error: operator not allowed for type 'fn()'");
+        \\export fn entry() usize { return @sizeOf(@typeOf(invalid)); }
+    , ".tmp_source.zig:2:21: error: operator not allowed for type 'fn() void'");
 
     cases.add("generic function instance with non-constant expression",
-        \\fn foo(comptime x: i32, y: i32) -> i32 { return x + y; }
-        \\fn test1(a: i32, b: i32) -> i32 {
+        \\fn foo(comptime x: i32, y: i32) i32 { return x + y; }
+        \\fn test1(a: i32, b: i32) i32 {
         \\    return foo(a, b);
         \\}
         \\
-        \\export fn entry() -> usize { return @sizeOf(@typeOf(test1)); }
+        \\export fn entry() usize { return @sizeOf(@typeOf(test1)); }
     , ".tmp_source.zig:3:16: error: unable to evaluate constant expression");
 
     cases.add("assign null to non-nullable pointer",
         \\const a: &u8 = null;
         \\
-        \\export fn entry() -> usize { return @sizeOf(@typeOf(a)); }
+        \\export fn entry() usize { return @sizeOf(@typeOf(a)); }
     , ".tmp_source.zig:1:16: error: expected type '&u8', found '(null)'");
 
     cases.add("indexing an array of size zero",
         \\const array = []u8{};
-        \\export fn foo() {
+        \\export fn foo() void {
         \\    const pointer = &array[0];
         \\}
     , ".tmp_source.zig:3:27: error: index 0 outside array of size 0");
 
     cases.add("compile time division by zero",
         \\const y = foo(0);
-        \\fn foo(x: u32) -> u32 {
+        \\fn foo(x: u32) u32 {
         \\    return 1 / x;
         \\}
         \\
-        \\export fn entry() -> usize { return @sizeOf(@typeOf(y)); }
+        \\export fn entry() usize { return @sizeOf(@typeOf(y)); }
     ,
             ".tmp_source.zig:3:14: error: division by zero",
             ".tmp_source.zig:1:14: note: called from here");
@@ -949,17 +949,17 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
     cases.add("branch on undefined value",
         \\const x = if (undefined) true else false;
         \\
-        \\export fn entry() -> usize { return @sizeOf(@typeOf(x)); }
+        \\export fn entry() usize { return @sizeOf(@typeOf(x)); }
     , ".tmp_source.zig:1:15: error: use of undefined value");
 
 
     cases.add("endless loop in function evaluation",
         \\const seventh_fib_number = fibbonaci(7);
-        \\fn fibbonaci(x: i32) -> i32 {
+        \\fn fibbonaci(x: i32) i32 {
         \\    return fibbonaci(x - 1) + fibbonaci(x - 2);
         \\}
         \\
-        \\export fn entry() -> usize { return @sizeOf(@typeOf(seventh_fib_number)); }
+        \\export fn entry() usize { return @sizeOf(@typeOf(seventh_fib_number)); }
     ,
             ".tmp_source.zig:3:21: error: evaluation exceeded 1000 backwards branches",
             ".tmp_source.zig:3:21: note: called from here");
@@ -967,7 +967,7 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
     cases.add("@embedFile with bogus file",
         \\const resource = @embedFile("bogus.txt");
         \\
-        \\export fn entry() -> usize { return @sizeOf(@typeOf(resource)); }
+        \\export fn entry() usize { return @sizeOf(@typeOf(resource)); }
     , ".tmp_source.zig:1:29: error: unable to find '", "bogus.txt'");
 
     cases.add("non-const expression in struct literal outside function",
@@ -975,9 +975,9 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
         \\    x: i32,
         \\};
         \\const a = Foo {.x = get_it()};
-        \\extern fn get_it() -> i32;
+        \\extern fn get_it() i32;
         \\
-        \\export fn entry() -> usize { return @sizeOf(@typeOf(a)); }
+        \\export fn entry() usize { return @sizeOf(@typeOf(a)); }
     , ".tmp_source.zig:4:21: error: unable to evaluate constant expression");
 
     cases.add("non-const expression function call with struct return value outside function",
@@ -985,60 +985,60 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
         \\    x: i32,
         \\};
         \\const a = get_it();
-        \\fn get_it() -> Foo {
+        \\fn get_it() Foo {
         \\    global_side_effect = true;
         \\    return Foo {.x = 13};
         \\}
         \\var global_side_effect = false;
         \\
-        \\export fn entry() -> usize { return @sizeOf(@typeOf(a)); }
+        \\export fn entry() usize { return @sizeOf(@typeOf(a)); }
     ,
             ".tmp_source.zig:6:24: error: unable to evaluate constant expression",
             ".tmp_source.zig:4:17: note: called from here");
 
     cases.add("undeclared identifier error should mark fn as impure",
-        \\export fn foo() {
+        \\export fn foo() void {
         \\    test_a_thing();
         \\}
-        \\fn test_a_thing() {
+        \\fn test_a_thing() void {
         \\    bad_fn_call();
         \\}
     , ".tmp_source.zig:5:5: error: use of undeclared identifier 'bad_fn_call'");
 
     cases.add("illegal comparison of types",
-        \\fn bad_eql_1(a: []u8, b: []u8) -> bool {
+        \\fn bad_eql_1(a: []u8, b: []u8) bool {
         \\    return a == b;
         \\}
         \\const EnumWithData = union(enum) {
         \\    One: void,
         \\    Two: i32,
         \\};
-        \\fn bad_eql_2(a: &const EnumWithData, b: &const EnumWithData) -> bool {
+        \\fn bad_eql_2(a: &const EnumWithData, b: &const EnumWithData) bool {
         \\    return *a == *b;
         \\}
         \\
-        \\export fn entry1() -> usize { return @sizeOf(@typeOf(bad_eql_1)); }
-        \\export fn entry2() -> usize { return @sizeOf(@typeOf(bad_eql_2)); }
+        \\export fn entry1() usize { return @sizeOf(@typeOf(bad_eql_1)); }
+        \\export fn entry2() usize { return @sizeOf(@typeOf(bad_eql_2)); }
     ,
             ".tmp_source.zig:2:14: error: operator not allowed for type '[]u8'",
             ".tmp_source.zig:9:15: error: operator not allowed for type 'EnumWithData'");
 
     cases.add("non-const switch number literal",
-        \\export fn foo() {
+        \\export fn foo() void {
         \\    const x = switch (bar()) {
         \\        1, 2 => 1,
         \\        3, 4 => 2,
         \\        else => 3,
         \\    };
         \\}
-        \\fn bar() -> i32 {
+        \\fn bar() i32 {
         \\    return 2;
         \\}
     , ".tmp_source.zig:2:15: error: unable to infer expression type");
 
     cases.add("atomic orderings of cmpxchg - failure stricter than success",
         \\const AtomicOrder = @import("builtin").AtomicOrder;
-        \\export fn f() {
+        \\export fn f() void {
         \\    var x: i32 = 1234;
         \\    while (!@cmpxchg(&x, 1234, 5678, AtomicOrder.Monotonic, AtomicOrder.SeqCst)) {}
         \\}
@@ -1046,7 +1046,7 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
 
     cases.add("atomic orderings of cmpxchg - success Monotonic or stricter",
         \\const AtomicOrder = @import("builtin").AtomicOrder;
-        \\export fn f() {
+        \\export fn f() void {
         \\    var x: i32 = 1234;
         \\    while (!@cmpxchg(&x, 1234, 5678, AtomicOrder.Unordered, AtomicOrder.Unordered)) {}
         \\}
@@ -1054,22 +1054,22 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
 
     cases.add("negation overflow in function evaluation",
         \\const y = neg(-128);
-        \\fn neg(x: i8) -> i8 {
+        \\fn neg(x: i8) i8 {
         \\    return -x;
         \\}
         \\
-        \\export fn entry() -> usize { return @sizeOf(@typeOf(y)); }
+        \\export fn entry() usize { return @sizeOf(@typeOf(y)); }
     ,
             ".tmp_source.zig:3:12: error: negation caused overflow",
             ".tmp_source.zig:1:14: note: called from here");
 
     cases.add("add overflow in function evaluation",
         \\const y = add(65530, 10);
-        \\fn add(a: u16, b: u16) -> u16 {
+        \\fn add(a: u16, b: u16) u16 {
         \\    return a + b;
         \\}
         \\
-        \\export fn entry() -> usize { return @sizeOf(@typeOf(y)); }
+        \\export fn entry() usize { return @sizeOf(@typeOf(y)); }
     ,
             ".tmp_source.zig:3:14: error: operation caused overflow",
             ".tmp_source.zig:1:14: note: called from here");
@@ -1077,47 +1077,47 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
 
     cases.add("sub overflow in function evaluation",
         \\const y = sub(10, 20);
-        \\fn sub(a: u16, b: u16) -> u16 {
+        \\fn sub(a: u16, b: u16) u16 {
         \\    return a - b;
         \\}
         \\
-        \\export fn entry() -> usize { return @sizeOf(@typeOf(y)); }
+        \\export fn entry() usize { return @sizeOf(@typeOf(y)); }
     ,
             ".tmp_source.zig:3:14: error: operation caused overflow",
             ".tmp_source.zig:1:14: note: called from here");
 
     cases.add("mul overflow in function evaluation",
         \\const y = mul(300, 6000);
-        \\fn mul(a: u16, b: u16) -> u16 {
+        \\fn mul(a: u16, b: u16) u16 {
         \\    return a * b;
         \\}
         \\
-        \\export fn entry() -> usize { return @sizeOf(@typeOf(y)); }
+        \\export fn entry() usize { return @sizeOf(@typeOf(y)); }
     ,
             ".tmp_source.zig:3:14: error: operation caused overflow",
             ".tmp_source.zig:1:14: note: called from here");
 
     cases.add("truncate sign mismatch",
-        \\fn f() -> i8 {
+        \\fn f() i8 {
         \\    const x: u32 = 10;
         \\    return @truncate(i8, x);
         \\}
         \\
-        \\export fn entry() -> usize { return @sizeOf(@typeOf(f)); }
+        \\export fn entry() usize { return @sizeOf(@typeOf(f)); }
     , ".tmp_source.zig:3:26: error: expected signed integer type, found 'u32'");
 
     cases.add("try in function with non error return type",
-        \\export fn f() {
+        \\export fn f() void {
         \\    try something();
         \\}
-        \\fn something() -> %void { }
+        \\fn something() %void { }
     ,
             ".tmp_source.zig:2:5: error: expected type 'void', found 'error'");
 
     cases.add("invalid pointer for var type",
-        \\extern fn ext() -> usize;
+        \\extern fn ext() usize;
         \\var bytes: [ext()]u8 = undefined;
-        \\export fn f() {
+        \\export fn f() void {
         \\    for (bytes) |*b, i| {
         \\        *b = u8(i);
         \\    }
@@ -1125,21 +1125,21 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
     , ".tmp_source.zig:2:13: error: unable to evaluate constant expression");
 
     cases.add("export function with comptime parameter",
-        \\export fn foo(comptime x: i32, y: i32) -> i32{
+        \\export fn foo(comptime x: i32, y: i32) i32{
         \\    return x + y;
         \\}
     , ".tmp_source.zig:1:15: error: comptime parameter not allowed in function with calling convention 'ccc'");
 
     cases.add("extern function with comptime parameter",
-        \\extern fn foo(comptime x: i32, y: i32) -> i32;
-        \\fn f() -> i32 {
+        \\extern fn foo(comptime x: i32, y: i32) i32;
+        \\fn f() i32 {
         \\    return foo(1, 2);
         \\}
-        \\export fn entry() -> usize { return @sizeOf(@typeOf(f)); }
+        \\export fn entry() usize { return @sizeOf(@typeOf(f)); }
     , ".tmp_source.zig:1:15: error: comptime parameter not allowed in function with calling convention 'ccc'");
 
     cases.add("convert fixed size array to slice with invalid size",
-        \\export fn f() {
+        \\export fn f() void {
         \\    var array: [5]u8 = undefined;
         \\    var foo = ([]const u32)(array)[0];
         \\}
@@ -1147,12 +1147,12 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
 
     cases.add("non-pure function returns type",
         \\var a: u32 = 0;
-        \\pub fn List(comptime T: type) -> type {
+        \\pub fn List(comptime T: type) type {
         \\    a += 1;
         \\    return SmallList(T, 8);
         \\}
         \\
-        \\pub fn SmallList(comptime T: type, comptime STATIC_SIZE: usize) -> type {
+        \\pub fn SmallList(comptime T: type, comptime STATIC_SIZE: usize) type {
         \\    return struct {
         \\        items: []T,
         \\        length: usize,
@@ -1160,7 +1160,7 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
         \\    };
         \\}
         \\
-        \\export fn function_with_return_type_type() {
+        \\export fn function_with_return_type_type() void {
         \\    var list: List(i32) = undefined;
         \\    list.length = 10;
         \\}
@@ -1169,46 +1169,46 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
 
     cases.add("bogus method call on slice",
         \\var self = "aoeu";
-        \\fn f(m: []const u8) {
+        \\fn f(m: []const u8) void {
         \\    m.copy(u8, self[0..], m);
         \\}
-        \\export fn entry() -> usize { return @sizeOf(@typeOf(f)); }
+        \\export fn entry() usize { return @sizeOf(@typeOf(f)); }
     , ".tmp_source.zig:3:6: error: no member named 'copy' in '[]const u8'");
 
     cases.add("wrong number of arguments for method fn call",
         \\const Foo = struct {
-        \\    fn method(self: &const Foo, a: i32) {}
+        \\    fn method(self: &const Foo, a: i32) void {}
         \\};
-        \\fn f(foo: &const Foo) {
+        \\fn f(foo: &const Foo) void {
         \\
         \\    foo.method(1, 2);
         \\}
-        \\export fn entry() -> usize { return @sizeOf(@typeOf(f)); }
+        \\export fn entry() usize { return @sizeOf(@typeOf(f)); }
     , ".tmp_source.zig:6:15: error: expected 2 arguments, found 3");
 
     cases.add("assign through constant pointer",
-        \\export fn f() {
+        \\export fn f() void {
         \\  var cstr = c"Hat";
         \\  cstr[0] = 'W';
         \\}
     , ".tmp_source.zig:3:11: error: cannot assign to constant");
 
     cases.add("assign through constant slice",
-        \\export fn f() {
+        \\export fn f() void {
         \\  var cstr: []const u8 = "Hat";
         \\  cstr[0] = 'W';
         \\}
     , ".tmp_source.zig:3:11: error: cannot assign to constant");
 
     cases.add("main function with bogus args type",
-        \\pub fn main(args: [][]bogus) -> %void {}
+        \\pub fn main(args: [][]bogus) %void {}
     , ".tmp_source.zig:1:23: error: use of undeclared identifier 'bogus'");
 
     cases.add("for loop missing element param",
-        \\fn foo(blah: []u8) {
+        \\fn foo(blah: []u8) void {
         \\    for (blah) { }
         \\}
-        \\export fn entry() -> usize { return @sizeOf(@typeOf(foo)); }
+        \\export fn entry() usize { return @sizeOf(@typeOf(foo)); }
     , ".tmp_source.zig:2:5: error: for loop expression missing element parameter");
 
     cases.add("misspelled type with pointer only reference",
@@ -1235,27 +1235,27 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
         \\    jobject: ?JsonOA,
         \\};
         \\
-        \\fn foo() {
+        \\fn foo() void {
         \\    var jll: JasonList = undefined;
         \\    jll.init(1234);
         \\    var jd = JsonNode {.kind = JsonType.JSONArray , .jobject = JsonOA.JSONArray {jll} };
         \\}
         \\
-        \\export fn entry() -> usize { return @sizeOf(@typeOf(foo)); }
+        \\export fn entry() usize { return @sizeOf(@typeOf(foo)); }
     , ".tmp_source.zig:5:16: error: use of undeclared identifier 'JsonList'");
 
     cases.add("method call with first arg type primitive",
         \\const Foo = struct {
         \\    x: i32,
         \\
-        \\    fn init(x: i32) -> Foo {
+        \\    fn init(x: i32) Foo {
         \\        return Foo {
         \\            .x = x,
         \\        };
         \\    }
         \\};
         \\
-        \\export fn f() {
+        \\export fn f() void {
         \\    const derp = Foo.init(3);
         \\
         \\    derp.init();
@@ -1267,7 +1267,7 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
         \\    len: usize,
         \\    allocator: &Allocator,
         \\
-        \\    pub fn init(allocator: &Allocator) -> List {
+        \\    pub fn init(allocator: &Allocator) List {
         \\        return List {
         \\            .len = 0,
         \\            .allocator = allocator,
@@ -1283,7 +1283,7 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
         \\    field: i32,
         \\};
         \\
-        \\export fn foo() {
+        \\export fn foo() void {
         \\    var x = List.init(&global_allocator);
         \\    x.init();
         \\}
@@ -1294,14 +1294,14 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
         \\const TINY_QUANTUM_SIZE = 1 << TINY_QUANTUM_SHIFT;
         \\var block_aligned_stuff: usize = (4 + TINY_QUANTUM_SIZE) & ~(TINY_QUANTUM_SIZE - 1);
         \\
-        \\export fn entry() -> usize { return @sizeOf(@typeOf(block_aligned_stuff)); }
+        \\export fn entry() usize { return @sizeOf(@typeOf(block_aligned_stuff)); }
     , ".tmp_source.zig:3:60: error: unable to perform binary not operation on type '(integer literal)'");
 
     cases.addCase(x: {
         const tc = cases.create("multiple files with private function error",
             \\const foo = @import("foo.zig");
             \\
-            \\export fn callPrivFunction() {
+            \\export fn callPrivFunction() void {
             \\    foo.privateFunction();
             \\}
         ,
@@ -1309,7 +1309,7 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
             "foo.zig:1:1: note: declared here");
 
         tc.addSourceFile("foo.zig",
-            \\fn privateFunction() { }
+            \\fn privateFunction() void { }
         );
 
         break :x tc;
@@ -1319,21 +1319,21 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
         \\const zero: i32 = 0;
         \\const a = zero{1};
         \\
-        \\export fn entry() -> usize { return @sizeOf(@typeOf(a)); }
+        \\export fn entry() usize { return @sizeOf(@typeOf(a)); }
     , ".tmp_source.zig:2:11: error: expected type, found 'i32'");
 
     cases.add("assign to constant field",
         \\const Foo = struct {
         \\    field: i32,
         \\};
-        \\export fn derp() {
+        \\export fn derp() void {
         \\    const f = Foo {.field = 1234,};
         \\    f.field = 0;
         \\}
     , ".tmp_source.zig:6:13: error: cannot assign to constant");
 
     cases.add("return from defer expression",
-        \\pub fn testTrickyDefer() -> %void {
+        \\pub fn testTrickyDefer() %void {
         \\    defer canFail() catch {};
         \\
         \\    defer try canFail();
@@ -1341,31 +1341,31 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
         \\    const a = maybeInt() ?? return;
         \\}
         \\
-        \\fn canFail() -> %void { }
+        \\fn canFail() %void { }
         \\
-        \\pub fn maybeInt() -> ?i32 {
+        \\pub fn maybeInt() ?i32 {
         \\    return 0;
         \\}
         \\
-        \\export fn entry() -> usize { return @sizeOf(@typeOf(testTrickyDefer)); }
+        \\export fn entry() usize { return @sizeOf(@typeOf(testTrickyDefer)); }
     , ".tmp_source.zig:4:11: error: cannot return from defer expression");
 
     cases.add("attempt to access var args out of bounds",
-        \\fn add(args: ...) -> i32 {
+        \\fn add(args: ...) i32 {
         \\    return args[0] + args[1];
         \\}
         \\
-        \\fn foo() -> i32 {
+        \\fn foo() i32 {
         \\    return add(i32(1234));
         \\}
         \\
-        \\export fn entry() -> usize { return @sizeOf(@typeOf(foo)); }
+        \\export fn entry() usize { return @sizeOf(@typeOf(foo)); }
     ,
             ".tmp_source.zig:2:26: error: index 1 outside argument list of size 1",
             ".tmp_source.zig:6:15: note: called from here");
 
     cases.add("pass integer literal to var args",
-        \\fn add(args: ...) -> i32 {
+        \\fn add(args: ...) i32 {
         \\    var sum = i32(0);
         \\    {comptime var i: usize = 0; inline while (i < args.len) : (i += 1) {
         \\        sum += args[i];
@@ -1373,34 +1373,34 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
         \\    return sum;
         \\}
         \\
-        \\fn bar() -> i32 {
+        \\fn bar() i32 {
         \\    return add(1, 2, 3, 4);
         \\}
         \\
-        \\export fn entry() -> usize { return @sizeOf(@typeOf(bar)); }
+        \\export fn entry() usize { return @sizeOf(@typeOf(bar)); }
     , ".tmp_source.zig:10:16: error: parameter of type '(integer literal)' requires comptime");
 
     cases.add("assign too big number to u16",
-        \\export fn foo() {
+        \\export fn foo() void {
         \\    var vga_mem: u16 = 0xB8000;
         \\}
     , ".tmp_source.zig:2:24: error: integer value 753664 cannot be implicitly casted to type 'u16'");
 
     cases.add("global variable alignment non power of 2",
         \\const some_data: [100]u8 align(3) = undefined;
-        \\export fn entry() -> usize { return @sizeOf(@typeOf(some_data)); }
+        \\export fn entry() usize { return @sizeOf(@typeOf(some_data)); }
     , ".tmp_source.zig:1:32: error: alignment value 3 is not a power of 2");
 
     cases.add("function alignment non power of 2",
-        \\extern fn foo() align(3);
-        \\export fn entry() { return foo(); }
+        \\extern fn foo() align(3) void;
+        \\export fn entry() void { return foo(); }
     , ".tmp_source.zig:1:23: error: alignment value 3 is not a power of 2");
 
     cases.add("compile log",
-        \\export fn foo() {
+        \\export fn foo() void {
         \\    comptime bar(12, "hi");
         \\}
-        \\fn bar(a: i32, b: []const u8) {
+        \\fn bar(a: i32, b: []const u8) void {
         \\    @compileLog("begin");
         \\    @compileLog("a", a, "b", b);
         \\    @compileLog("end");
@@ -1420,15 +1420,15 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
         \\    c: u2,
         \\};
         \\
-        \\fn foo(bit_field: &const BitField) -> u3 {
+        \\fn foo(bit_field: &const BitField) u3 {
         \\    return bar(&bit_field.b);
         \\}
         \\
-        \\fn bar(x: &const u3) -> u3 {
+        \\fn bar(x: &const u3) u3 {
         \\    return *x;
         \\}
         \\
-        \\export fn entry() -> usize { return @sizeOf(@typeOf(foo)); }
+        \\export fn entry() usize { return @sizeOf(@typeOf(foo)); }
     , ".tmp_source.zig:8:26: error: expected type '&const u3', found '&align(1:3:6) const u3'");
 
     cases.add("referring to a struct that is invalid",
@@ -1436,11 +1436,11 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
         \\    Type: u8,
         \\};
         \\
-        \\export fn foo() {
+        \\export fn foo() void {
         \\    comptime assert(@sizeOf(UsbDeviceRequest) == 0x8);
         \\}
         \\
-        \\fn assert(ok: bool) {
+        \\fn assert(ok: bool) void {
         \\    if (!ok) unreachable;
         \\}
     ,
@@ -1448,92 +1448,92 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
             ".tmp_source.zig:6:20: note: called from here");
 
     cases.add("control flow uses comptime var at runtime",
-        \\export fn foo() {
+        \\export fn foo() void {
         \\    comptime var i = 0;
         \\    while (i < 5) : (i += 1) {
         \\        bar();
         \\    }
         \\}
         \\
-        \\fn bar() { }
+        \\fn bar() void { }
     ,
             ".tmp_source.zig:3:5: error: control flow attempts to use compile-time variable at runtime",
             ".tmp_source.zig:3:24: note: compile-time variable assigned here");
 
     cases.add("ignored return value",
-        \\export fn foo() {
+        \\export fn foo() void {
         \\    bar();
         \\}
-        \\fn bar() -> i32 { return 0; }
+        \\fn bar() i32 { return 0; }
     , ".tmp_source.zig:2:8: error: expression value is ignored");
 
     cases.add("ignored assert-err-ok return value",
-        \\export fn foo() {
+        \\export fn foo() void {
         \\    bar() catch unreachable;
         \\}
-        \\fn bar() -> %i32 { return 0; }
+        \\fn bar() %i32 { return 0; }
     , ".tmp_source.zig:2:11: error: expression value is ignored");
 
     cases.add("ignored statement value",
-        \\export fn foo() {
+        \\export fn foo() void {
         \\    1;
         \\}
     , ".tmp_source.zig:2:5: error: expression value is ignored");
 
     cases.add("ignored comptime statement value",
-        \\export fn foo() {
+        \\export fn foo() void {
         \\    comptime {1;}
         \\}
     , ".tmp_source.zig:2:15: error: expression value is ignored");
 
     cases.add("ignored comptime value",
-        \\export fn foo() {
+        \\export fn foo() void {
         \\    comptime 1;
         \\}
     , ".tmp_source.zig:2:5: error: expression value is ignored");
 
     cases.add("ignored defered statement value",
-        \\export fn foo() {
+        \\export fn foo() void {
         \\    defer {1;}
         \\}
     , ".tmp_source.zig:2:12: error: expression value is ignored");
 
     cases.add("ignored defered function call",
-        \\export fn foo() {
+        \\export fn foo() void {
         \\    defer bar();
         \\}
-        \\fn bar() -> %i32 { return 0; }
+        \\fn bar() %i32 { return 0; }
     , ".tmp_source.zig:2:14: error: expression value is ignored");
 
     cases.add("dereference an array",
         \\var s_buffer: [10]u8 = undefined;
-        \\pub fn pass(in: []u8) -> []u8 {
+        \\pub fn pass(in: []u8) []u8 {
         \\    var out = &s_buffer;
         \\    *out[0] = in[0];
         \\    return (*out)[0..1];
         \\}
         \\
-        \\export fn entry() -> usize { return @sizeOf(@typeOf(pass)); }
+        \\export fn entry() usize { return @sizeOf(@typeOf(pass)); }
     , ".tmp_source.zig:4:5: error: attempt to dereference non pointer type '[10]u8'");
 
     cases.add("pass const ptr to mutable ptr fn",
-        \\fn foo() -> bool {
+        \\fn foo() bool {
         \\    const a = ([]const u8)("a");
         \\    const b = &a;
         \\    return ptrEql(b, b);
         \\}
-        \\fn ptrEql(a: &[]const u8, b: &[]const u8) -> bool {
+        \\fn ptrEql(a: &[]const u8, b: &[]const u8) bool {
         \\    return true;
         \\}
         \\
-        \\export fn entry() -> usize { return @sizeOf(@typeOf(foo)); }
+        \\export fn entry() usize { return @sizeOf(@typeOf(foo)); }
     , ".tmp_source.zig:4:19: error: expected type '&[]const u8', found '&const []const u8'");
 
     cases.addCase(x: {
         const tc = cases.create("export collision",
             \\const foo = @import("foo.zig");
             \\
-            \\export fn bar() -> usize {
+            \\export fn bar() usize {
             \\    return foo.baz;
             \\}
         ,
@@ -1541,7 +1541,7 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
             ".tmp_source.zig:3:8: note: other symbol here");
 
         tc.addSourceFile("foo.zig",
-            \\export fn bar() {}
+            \\export fn bar() void {}
             \\pub const baz = 1234;
         );
 
@@ -1550,20 +1550,20 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
 
     cases.add("pass non-copyable type by value to function",
         \\const Point = struct { x: i32, y: i32, };
-        \\fn foo(p: Point) { }
-        \\export fn entry() -> usize { return @sizeOf(@typeOf(foo)); }
+        \\fn foo(p: Point) void { }
+        \\export fn entry() usize { return @sizeOf(@typeOf(foo)); }
     , ".tmp_source.zig:2:11: error: type 'Point' is not copyable; cannot pass by value");
 
     cases.add("implicit cast from array to mutable slice",
         \\var global_array: [10]i32 = undefined;
-        \\fn foo(param: []i32) {}
-        \\export fn entry() {
+        \\fn foo(param: []i32) void {}
+        \\export fn entry() void {
         \\    foo(global_array);
         \\}
     , ".tmp_source.zig:4:9: error: expected type '[]i32', found '[10]i32'");
 
     cases.add("ptrcast to non-pointer",
-        \\export fn entry(a: &i32) -> usize {
+        \\export fn entry(a: &i32) usize {
         \\    return @ptrCast(usize, a);
         \\}
     , ".tmp_source.zig:2:21: error: expected pointer, found 'usize'");
@@ -1571,10 +1571,10 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
     cases.add("too many error values to cast to small integer",
         \\error A; error B; error C; error D; error E; error F; error G; error H;
         \\const u2 = @IntType(false, 2);
-        \\fn foo(e: error) -> u2 {
+        \\fn foo(e: error) u2 {
         \\    return u2(e);
         \\}
-        \\export fn entry() -> usize { return @sizeOf(@typeOf(foo)); }
+        \\export fn entry() usize { return @sizeOf(@typeOf(foo)); }
     , ".tmp_source.zig:4:14: error: too many error values to fit in 'u2'");
 
     cases.add("asm at compile time",
@@ -1582,7 +1582,7 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
         \\    doSomeAsm();
         \\}
         \\
-        \\fn doSomeAsm() {
+        \\fn doSomeAsm() void {
         \\    asm volatile (
         \\        \\.globl aoeu;
         \\        \\.type aoeu, @function;
@@ -1593,13 +1593,13 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
 
     cases.add("invalid member of builtin enum",
         \\const builtin = @import("builtin");
-        \\export fn entry() {
+        \\export fn entry() void {
         \\    const foo = builtin.Arch.x86;
         \\}
     , ".tmp_source.zig:3:29: error: container 'Arch' has no member called 'x86'");
 
     cases.add("int to ptr of 0 bits",
-        \\export fn foo() {
+        \\export fn foo() void {
         \\    var x: usize = 0x1000;
         \\    var y: &void = @intToPtr(&void, x);
         \\}
@@ -1607,7 +1607,7 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
 
     cases.add("@fieldParentPtr - non struct",
         \\const Foo = i32;
-        \\export fn foo(a: &i32) -> &Foo {
+        \\export fn foo(a: &i32) &Foo {
         \\    return @fieldParentPtr(Foo, "a", a);
         \\}
     , ".tmp_source.zig:3:28: error: expected struct type, found 'i32'");
@@ -1616,7 +1616,7 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
         \\const Foo = extern struct {
         \\    derp: i32,
         \\};
-        \\export fn foo(a: &i32) -> &Foo {
+        \\export fn foo(a: &i32) &Foo {
         \\    return @fieldParentPtr(Foo, "a", a);
         \\}
     , ".tmp_source.zig:5:33: error: struct 'Foo' has no field 'a'");
@@ -1625,7 +1625,7 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
         \\const Foo = extern struct {
         \\    a: i32,
         \\};
-        \\export fn foo(a: i32) -> &Foo {
+        \\export fn foo(a: i32) &Foo {
         \\    return @fieldParentPtr(Foo, "a", a);
         \\}
     , ".tmp_source.zig:5:38: error: expected pointer, found 'i32'");
@@ -1657,7 +1657,7 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
 
     cases.add("@offsetOf - non struct",
         \\const Foo = i32;
-        \\export fn foo() -> usize {
+        \\export fn foo() usize {
         \\    return @offsetOf(Foo, "a");
         \\}
     , ".tmp_source.zig:3:22: error: expected struct type, found 'i32'");
@@ -1666,7 +1666,7 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
         \\const Foo = struct {
         \\    derp: i32,
         \\};
-        \\export fn foo() -> usize {
+        \\export fn foo() usize {
         \\    return @offsetOf(Foo, "a");
         \\}
     , ".tmp_source.zig:5:27: error: struct 'Foo' has no field 'a'");
@@ -1676,21 +1676,21 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
     , "error: no member named 'main' in '");
 
     cases.addExe("private main fn",
-        \\fn main() {}
+        \\fn main() void {}
     ,
         "error: 'main' is private",
         ".tmp_source.zig:1:1: note: declared here");
 
     cases.add("setting a section on an extern variable",
         \\extern var foo: i32 section(".text2");
-        \\export fn entry() -> i32 {
+        \\export fn entry() i32 {
         \\    return foo;
         \\}
     ,
         ".tmp_source.zig:1:29: error: cannot set section of external variable 'foo'");
 
     cases.add("setting a section on a local variable",
-        \\export fn entry() -> i32 {
+        \\export fn entry() i32 {
         \\    var foo: i32 section(".text2") = 1234;
         \\    return foo;
         \\}
@@ -1698,15 +1698,15 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
         ".tmp_source.zig:2:26: error: cannot set section of local variable 'foo'");
 
     cases.add("setting a section on an extern fn",
-        \\extern fn foo() section(".text2");
-        \\export fn entry() {
+        \\extern fn foo() section(".text2") void;
+        \\export fn entry() void {
         \\    foo();
         \\}
     ,
         ".tmp_source.zig:1:25: error: cannot set section of external function 'foo'");
 
     cases.add("returning address of local variable - simple",
-        \\export fn foo() -> &i32 {
+        \\export fn foo() &i32 {
         \\    var a: i32 = undefined;
         \\    return &a;
         \\}
@@ -1714,7 +1714,7 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
         ".tmp_source.zig:3:13: error: function returns address of local variable");
 
     cases.add("returning address of local variable - phi",
-        \\export fn foo(c: bool) -> &i32 {
+        \\export fn foo(c: bool) &i32 {
         \\    var a: i32 = undefined;
         \\    var b: i32 = undefined;
         \\    return if (c) &a else &b;
@@ -1723,13 +1723,13 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
         ".tmp_source.zig:4:12: error: function returns address of local variable");
 
     cases.add("inner struct member shadowing outer struct member",
-        \\fn A() -> type {
+        \\fn A() type {
         \\    return struct {
         \\        b: B(),
         \\
         \\        const Self = this;
         \\
-        \\        fn B() -> type {
+        \\        fn B() type {
         \\            return struct {
         \\                const Self = this;
         \\            };
@@ -1739,7 +1739,7 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
         \\comptime {
         \\    assert(A().B().Self != A().Self);
         \\}
-        \\fn assert(ok: bool) {
+        \\fn assert(ok: bool) void {
         \\    if (!ok) unreachable;
         \\}
     ,
@@ -1747,87 +1747,87 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
         ".tmp_source.zig:5:9: note: previous definition is here");
 
     cases.add("while expected bool, got nullable",
-        \\export fn foo() {
+        \\export fn foo() void {
         \\    while (bar()) {}
         \\}
-        \\fn bar() -> ?i32 { return 1; }
+        \\fn bar() ?i32 { return 1; }
     ,
         ".tmp_source.zig:2:15: error: expected type 'bool', found '?i32'");
 
     cases.add("while expected bool, got error union",
-        \\export fn foo() {
+        \\export fn foo() void {
         \\    while (bar()) {}
         \\}
-        \\fn bar() -> %i32 { return 1; }
+        \\fn bar() %i32 { return 1; }
     ,
         ".tmp_source.zig:2:15: error: expected type 'bool', found '%i32'");
 
     cases.add("while expected nullable, got bool",
-        \\export fn foo() {
+        \\export fn foo() void {
         \\    while (bar()) |x| {}
         \\}
-        \\fn bar() -> bool { return true; }
+        \\fn bar() bool { return true; }
     ,
         ".tmp_source.zig:2:15: error: expected nullable type, found 'bool'");
 
     cases.add("while expected nullable, got error union",
-        \\export fn foo() {
+        \\export fn foo() void {
         \\    while (bar()) |x| {}
         \\}
-        \\fn bar() -> %i32 { return 1; }
+        \\fn bar() %i32 { return 1; }
     ,
         ".tmp_source.zig:2:15: error: expected nullable type, found '%i32'");
 
     cases.add("while expected error union, got bool",
-        \\export fn foo() {
+        \\export fn foo() void {
         \\    while (bar()) |x| {} else |err| {}
         \\}
-        \\fn bar() -> bool { return true; }
+        \\fn bar() bool { return true; }
     ,
         ".tmp_source.zig:2:15: error: expected error union type, found 'bool'");
 
     cases.add("while expected error union, got nullable",
-        \\export fn foo() {
+        \\export fn foo() void {
         \\    while (bar()) |x| {} else |err| {}
         \\}
-        \\fn bar() -> ?i32 { return 1; }
+        \\fn bar() ?i32 { return 1; }
     ,
         ".tmp_source.zig:2:15: error: expected error union type, found '?i32'");
 
     cases.add("inline fn calls itself indirectly",
-        \\export fn foo() {
+        \\export fn foo() void {
         \\    bar();
         \\}
-        \\inline fn bar() {
+        \\inline fn bar() void {
         \\    baz();
         \\    quux();
         \\}
-        \\inline fn baz() {
+        \\inline fn baz() void {
         \\    bar();
         \\    quux();
         \\}
-        \\extern fn quux();
+        \\extern fn quux() void;
     ,
         ".tmp_source.zig:4:8: error: unable to inline function");
 
     cases.add("save reference to inline function",
-        \\export fn foo() {
+        \\export fn foo() void {
         \\    quux(@ptrToInt(bar));
         \\}
-        \\inline fn bar() { }
-        \\extern fn quux(usize);
+        \\inline fn bar() void { }
+        \\extern fn quux(usize) void;
     ,
         ".tmp_source.zig:4:8: error: unable to inline function");
 
     cases.add("signed integer division",
-        \\export fn foo(a: i32, b: i32) -> i32 {
+        \\export fn foo(a: i32, b: i32) i32 {
         \\    return a / b;
         \\}
     ,
         ".tmp_source.zig:2:14: error: division with 'i32' and 'i32': signed integers must use @divTrunc, @divFloor, or @divExact");
 
     cases.add("signed integer remainder division",
-        \\export fn foo(a: i32, b: i32) -> i32 {
+        \\export fn foo(a: i32, b: i32) i32 {
         \\    return a % b;
         \\}
     ,
@@ -1868,7 +1868,7 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
         ".tmp_source.zig:3:20: error: cast from 'u16' to 'u8' truncates bits");
 
     cases.add("@setRuntimeSafety twice for same scope",
-        \\export fn foo() {
+        \\export fn foo() void {
         \\    @setRuntimeSafety(false);
         \\    @setRuntimeSafety(false);
         \\}
@@ -1877,7 +1877,7 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
         ".tmp_source.zig:2:5: note: first set here");
 
     cases.add("@setFloatMode twice for same scope",
-        \\export fn foo() {
+        \\export fn foo() void {
         \\    @setFloatMode(this, @import("builtin").FloatMode.Optimized);
         \\    @setFloatMode(this, @import("builtin").FloatMode.Optimized);
         \\}
@@ -1886,14 +1886,14 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
         ".tmp_source.zig:2:5: note: first set here");
 
     cases.add("array access of type",
-        \\export fn foo() {
+        \\export fn foo() void {
         \\    var b: u8[40] = undefined;
         \\}
     ,
         ".tmp_source.zig:2:14: error: array access of non-array type 'type'");
 
     cases.add("cannot break out of defer expression",
-        \\export fn foo() {
+        \\export fn foo() void {
         \\    while (true) {
         \\        defer {
         \\            break;
@@ -1904,7 +1904,7 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
         ".tmp_source.zig:4:13: error: cannot break out of defer expression");
 
     cases.add("cannot continue out of defer expression",
-        \\export fn foo() {
+        \\export fn foo() void {
         \\    while (true) {
         \\        defer {
         \\            continue;
@@ -1915,24 +1915,24 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
         ".tmp_source.zig:4:13: error: cannot continue out of defer expression");
 
     cases.add("calling a var args function only known at runtime",
-        \\var foos = []fn(...) { foo1, foo2 };
+        \\var foos = []fn(...) void { foo1, foo2 };
         \\
-        \\fn foo1(args: ...) {}
-        \\fn foo2(args: ...) {}
+        \\fn foo1(args: ...) void {}
+        \\fn foo2(args: ...) void {}
         \\
-        \\pub fn main() -> %void {
+        \\pub fn main() %void {
         \\    foos[0]();
         \\}
     ,
         ".tmp_source.zig:7:9: error: calling a generic function requires compile-time known function value");
 
     cases.add("calling a generic function only known at runtime",
-        \\var foos = []fn(var) { foo1, foo2 };
+        \\var foos = []fn(var) void { foo1, foo2 };
         \\
-        \\fn foo1(arg: var) {}
-        \\fn foo2(arg: var) {}
+        \\fn foo1(arg: var) void {}
+        \\fn foo2(arg: var) void {}
         \\
-        \\pub fn main() -> %void {
+        \\pub fn main() %void {
         \\    foos[0](true);
         \\}
     ,
@@ -1944,7 +1944,7 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
         \\const bar = baz + foo;
         \\const baz = 1;
         \\
-        \\export fn entry() -> i32 {
+        \\export fn entry() i32 {
         \\    return bar;
         \\}
     ,
@@ -1959,7 +1959,7 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
         \\
         \\var foo: Foo = undefined;
         \\
-        \\export fn entry() -> usize {
+        \\export fn entry() usize {
         \\    return @sizeOf(@typeOf(foo.x));
         \\}
     ,
@@ -1980,14 +1980,14 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
         ".tmp_source.zig:2:15: error: float literal out of range of any type");
 
     cases.add("explicit cast float literal to integer when there is a fraction component",
-        \\export fn entry() -> i32 {
+        \\export fn entry() i32 {
         \\    return i32(12.34);
         \\}
     ,
         ".tmp_source.zig:2:16: error: fractional component prevents float value 12.340000 from being casted to type 'i32'");
 
     cases.add("non pointer given to @ptrToInt",
-        \\export fn entry(x: i32) -> usize {
+        \\export fn entry(x: i32) usize {
         \\    return @ptrToInt(x);
         \\}
     ,
@@ -2008,14 +2008,14 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
         ".tmp_source.zig:2:15: error: exact shift shifted out 1 bits");
 
     cases.add("shifting without int type or comptime known",
-        \\export fn entry(x: u8) -> u8 {
+        \\export fn entry(x: u8) u8 {
         \\    return 0x11 << x;
         \\}
     ,
         ".tmp_source.zig:2:17: error: LHS of shift must be an integer type, or RHS must be compile-time known");
 
     cases.add("shifting RHS is log2 of LHS int bit width",
-        \\export fn entry(x: u8, y: u8) -> u8 {
+        \\export fn entry(x: u8, y: u8) u8 {
         \\    return x << y;
         \\}
     ,
@@ -2023,7 +2023,7 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
 
     cases.add("globally shadowing a primitive type",
         \\const u16 = @intType(false, 8);
-        \\export fn entry() {
+        \\export fn entry() void {
         \\    const a: u16 = 300;
         \\}
     ,
@@ -2035,12 +2035,12 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
         \\    b: u32,
         \\};
         \\
-        \\export fn entry() {
+        \\export fn entry() void {
         \\    var foo = Foo { .a = 1, .b = 10 };
         \\    bar(&foo.b);
         \\}
         \\
-        \\fn bar(x: &u32) {
+        \\fn bar(x: &u32) void {
         \\    *x += 1;
         \\}
     ,
@@ -2052,20 +2052,20 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
         \\    b: u32,
         \\};
         \\
-        \\export fn entry() {
+        \\export fn entry() void {
         \\    var foo = Foo { .a = 1, .b = 10 };
         \\    foo.b += 1;
         \\    bar((&foo.b)[0..1]);
         \\}
         \\
-        \\fn bar(x: []u32) {
+        \\fn bar(x: []u32) void {
         \\    x[0] += 1;
         \\}
     ,
         ".tmp_source.zig:9:17: error: expected type '[]u32', found '[]align(1) u32'");
 
     cases.add("increase pointer alignment in @ptrCast",
-        \\export fn entry() -> u32 {
+        \\export fn entry() u32 {
         \\    var bytes: [4]u8 = []u8{0x01, 0x02, 0x03, 0x04};
         \\    const ptr = @ptrCast(&u32, &bytes[0]);
         \\    return *ptr;
@@ -2076,7 +2076,7 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
         ".tmp_source.zig:3:27: note: '&u32' has alignment 4");
 
     cases.add("increase pointer alignment in slice resize",
-        \\export fn entry() -> u32 {
+        \\export fn entry() u32 {
         \\    var bytes = []u8{0x01, 0x02, 0x03, 0x04};
         \\    return ([]u32)(bytes[0..])[0];
         \\}
@@ -2086,26 +2086,26 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
         ".tmp_source.zig:3:19: note: '[]u32' has alignment 4");
 
     cases.add("@alignCast expects pointer or slice",
-        \\export fn entry() {
+        \\export fn entry() void {
         \\    @alignCast(4, u32(3));
         \\}
     ,
         ".tmp_source.zig:2:22: error: expected pointer or slice, found 'u32'");
 
     cases.add("passing an under-aligned function pointer",
-        \\export fn entry() {
+        \\export fn entry() void {
         \\    testImplicitlyDecreaseFnAlign(alignedSmall, 1234);
         \\}
-        \\fn testImplicitlyDecreaseFnAlign(ptr: fn () align(8) -> i32, answer: i32) {
+        \\fn testImplicitlyDecreaseFnAlign(ptr: fn () align(8) i32, answer: i32) void {
         \\    if (ptr() != answer) unreachable;
         \\}
-        \\fn alignedSmall() align(4) -> i32 { return 1234; }
+        \\fn alignedSmall() align(4) i32 { return 1234; }
     ,
-        ".tmp_source.zig:2:35: error: expected type 'fn() align(8) -> i32', found 'fn() align(4) -> i32'");
+        ".tmp_source.zig:2:35: error: expected type 'fn() align(8) i32', found 'fn() align(4) i32'");
 
     cases.add("passing a not-aligned-enough pointer to cmpxchg",
         \\const AtomicOrder = @import("builtin").AtomicOrder;
-        \\export fn entry() -> bool {
+        \\export fn entry() bool {
         \\    var x: i32 align(1) = 1234;
         \\    while (!@cmpxchg(&x, 1234, 5678, AtomicOrder.SeqCst, AtomicOrder.SeqCst)) {}
         \\    return x == 5678;
@@ -2124,7 +2124,7 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
         \\comptime {
         \\    foo();
         \\}
-        \\fn foo() {
+        \\fn foo() void {
         \\    @setEvalBranchQuota(1001);
         \\}
     ,
@@ -2134,8 +2134,8 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
 
     cases.add("wrong pointer implicitly casted to pointer to @OpaqueType()",
         \\const Derp = @OpaqueType();
-        \\extern fn bar(d: &Derp);
-        \\export fn foo() {
+        \\extern fn bar(d: &Derp) void;
+        \\export fn foo() void {
         \\    const x = u8(1);
         \\    bar(@ptrCast(&c_void, &x));
         \\}
@@ -2145,7 +2145,7 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
     cases.add("non-const variables of things that require const variables",
         \\const Opaque = @OpaqueType();
         \\
-        \\export fn entry(opaque: &Opaque) {
+        \\export fn entry(opaque: &Opaque) void {
         \\   var m2 = &2;
         \\   const y: u32 = *m2;
         \\
@@ -2163,7 +2163,7 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
         \\}
         \\
         \\const Foo = struct {
-        \\    fn bar(self: &const Foo) {}
+        \\    fn bar(self: &const Foo) void {}
         \\};
     ,
         ".tmp_source.zig:4:4: error: variable of type '&const (integer literal)' must be const or comptime",
@@ -2175,11 +2175,11 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
         ".tmp_source.zig:12:4: error: variable of type 'Opaque' must be const or comptime",
         ".tmp_source.zig:13:4: error: variable of type 'type' must be const or comptime",
         ".tmp_source.zig:14:4: error: variable of type '(namespace)' must be const or comptime",
-        ".tmp_source.zig:15:4: error: variable of type '(bound fn(&const Foo))' must be const or comptime",
+        ".tmp_source.zig:15:4: error: variable of type '(bound fn(&const Foo) void)' must be const or comptime",
         ".tmp_source.zig:17:4: error: unreachable code");
 
     cases.add("wrong types given to atomic order args in cmpxchg",
-        \\export fn entry() {
+        \\export fn entry() void {
         \\    var x: i32 = 1234;
         \\    while (!@cmpxchg(&x, 1234, 5678, u32(1234), u32(1234))) {}
         \\}
@@ -2187,7 +2187,7 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
         ".tmp_source.zig:3:41: error: expected type 'AtomicOrder', found 'u32'");
 
     cases.add("wrong types given to @export",
-        \\extern fn entry() { }
+        \\extern fn entry() void { }
         \\comptime {
         \\    @export("entry", entry, u32(1234));
         \\}
@@ -2212,7 +2212,7 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
         \\    },
         \\};
         \\
-        \\export fn entry() {
+        \\export fn entry() void {
         \\    const a = MdNode.Header {
         \\        .text = MdText.init(&std.debug.global_allocator),
         \\        .weight = HeaderWeight.H1,
@@ -2229,24 +2229,24 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
         ".tmp_source.zig:2:5: error: @setAlignStack outside function");
 
     cases.add("@setAlignStack in naked function",
-        \\export nakedcc fn entry() {
+        \\export nakedcc fn entry() void {
         \\    @setAlignStack(16);
         \\}
     ,
         ".tmp_source.zig:2:5: error: @setAlignStack in naked function");
 
     cases.add("@setAlignStack in inline function",
-        \\export fn entry() {
+        \\export fn entry() void {
         \\    foo();
         \\}
-        \\inline fn foo() {
+        \\inline fn foo() void {
         \\    @setAlignStack(16);
         \\}
     ,
         ".tmp_source.zig:5:5: error: @setAlignStack in inline function");
 
     cases.add("@setAlignStack set twice",
-        \\export fn entry() {
+        \\export fn entry() void {
         \\    @setAlignStack(16);
         \\    @setAlignStack(16);
         \\}
@@ -2255,7 +2255,7 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
         ".tmp_source.zig:2:5: note: first set here");
 
     cases.add("@setAlignStack too big",
-        \\export fn entry() {
+        \\export fn entry() void {
         \\    @setAlignStack(511 + 1);
         \\}
     ,
@@ -2264,14 +2264,14 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
     cases.add("storing runtime value in compile time variable then using it",
         \\const Mode = @import("builtin").Mode;
         \\
-        \\fn Free(comptime filename: []const u8) -> TestCase {
+        \\fn Free(comptime filename: []const u8) TestCase {
         \\    return TestCase {
         \\        .filename = filename,
         \\        .problem_type = ProblemType.Free,
         \\    };
         \\}
         \\
-        \\fn LibC(comptime filename: []const u8) -> TestCase {
+        \\fn LibC(comptime filename: []const u8) TestCase {
         \\    return TestCase {
         \\        .filename = filename,
         \\        .problem_type = ProblemType.LinkLibC,
@@ -2288,7 +2288,7 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
         \\    LinkLibC,
         \\};
         \\
-        \\export fn entry() {
+        \\export fn entry() void {
         \\    const tests = []TestCase {
         \\        Free("001"),
         \\        Free("002"),
@@ -2309,34 +2309,34 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
     cases.add("field access of opaque type",
         \\const MyType = @OpaqueType();
         \\
-        \\export fn entry() -> bool {
+        \\export fn entry() bool {
         \\    var x: i32 = 1;
         \\    return bar(@ptrCast(&MyType, &x));
         \\}
         \\
-        \\fn bar(x: &MyType) -> bool {
+        \\fn bar(x: &MyType) bool {
         \\    return x.blah;
         \\}
     ,
         ".tmp_source.zig:9:13: error: type '&MyType' does not support field access");
 
     cases.add("carriage return special case",
-        "fn test() -> bool {\r\n" ++
+        "fn test() bool {\r\n" ++
         "   true\r\n" ++
         "}\r\n"
     ,
-        ".tmp_source.zig:1:20: error: invalid carriage return, only '\\n' line endings are supported");
+        ".tmp_source.zig:1:17: error: invalid carriage return, only '\\n' line endings are supported");
 
     cases.add("non-printable invalid character",
         "\xff\xfe" ++
-        \\fn test() -> bool {\r
+        \\fn test() bool {\r
         \\    true\r
         \\}
     ,
         ".tmp_source.zig:1:1: error: invalid character: '\\xff'");
 
     cases.add("non-printable invalid character with escape alternative",
-        "fn test() -> bool {\n" ++
+        "fn test() bool {\n" ++
         "\ttrue\n" ++
         "}\n"
     ,
@@ -2353,9 +2353,9 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
         \\comptime {
         \\    _ = @ArgType(@typeOf(add), 2);
         \\}
-        \\fn add(a: i32, b: i32) -> i32 { return a + b; }
+        \\fn add(a: i32, b: i32) i32 { return a + b; }
     ,
-        ".tmp_source.zig:2:32: error: arg index 2 out of bounds; 'fn(i32, i32) -> i32' has 2 arguments");
+        ".tmp_source.zig:2:32: error: arg index 2 out of bounds; 'fn(i32, i32) i32' has 2 arguments");
 
     cases.add("@memberType on unsupported type",
         \\comptime {
@@ -2420,17 +2420,17 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
         ".tmp_source.zig:2:26: error: member index 1 out of bounds; 'Foo' has 1 members");
 
     cases.add("calling var args extern function, passing array instead of pointer",
-        \\export fn entry() {
+        \\export fn entry() void {
         \\    foo("hello");
         \\}
-        \\pub extern fn foo(format: &const u8, ...);
+        \\pub extern fn foo(format: &const u8, ...) void;
     ,
         ".tmp_source.zig:2:9: error: expected type '&const u8', found '[5]u8'");
 
     cases.add("constant inside comptime function has compile error",
         \\const ContextAllocator = MemoryPool(usize);
         \\
-        \\pub fn MemoryPool(comptime T: type) -> type {
+        \\pub fn MemoryPool(comptime T: type) type {
         \\    const free_list_t = @compileError("aoeu");
         \\
         \\    return struct {
@@ -2438,7 +2438,7 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
         \\    };
         \\}
         \\
-        \\export fn entry() {
+        \\export fn entry() void {
         \\    var allocator: ContextAllocator = undefined;
         \\}
     ,
@@ -2455,7 +2455,7 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
         \\    Five,
         \\};
         \\
-        \\export fn entry() {
+        \\export fn entry() void {
         \\    var x = Small.One;
         \\}
     ,
@@ -2468,7 +2468,7 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
         \\    Three,
         \\};
         \\
-        \\export fn entry() {
+        \\export fn entry() void {
         \\    var x = Small.One;
         \\}
     ,
@@ -2482,7 +2482,7 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
         \\    Four,
         \\};
         \\
-        \\export fn entry() {
+        \\export fn entry() void {
         \\    var x: u2 = Small.Two;
         \\}
     ,
@@ -2496,7 +2496,7 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
         \\    Four,
         \\};
         \\
-        \\export fn entry() {
+        \\export fn entry() void {
         \\    var x = u3(Small.Two);
         \\}
     ,
@@ -2510,7 +2510,7 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
         \\    Four,
         \\};
         \\
-        \\export fn entry() {
+        \\export fn entry() void {
         \\    var y = u3(3);
         \\    var x = Small(y);
         \\}
@@ -2525,7 +2525,7 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
         \\    Four,
         \\};
         \\
-        \\export fn entry() {
+        \\export fn entry() void {
         \\    var y = Small.Two;
         \\}
     ,
@@ -2535,7 +2535,7 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
         \\const MultipleChoice = struct {
         \\    A: i32 = 20,
         \\};
-        \\export fn entry() {
+        \\export fn entry() void {
         \\        var x: MultipleChoice = undefined;
         \\}
     ,
@@ -2545,7 +2545,7 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
         \\const MultipleChoice = union {
         \\    A: i32 = 20,
         \\};
-        \\export fn entry() {
+        \\export fn entry() void {
         \\    var x: MultipleChoice = undefined;
         \\}
     ,
@@ -2554,7 +2554,7 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
 
     cases.add("enum with 0 fields",
         \\const Foo = enum {};
-        \\export fn entry() -> usize {
+        \\export fn entry() usize {
         \\    return @sizeOf(Foo);
         \\}
     ,
@@ -2562,7 +2562,7 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
 
     cases.add("union with 0 fields",
         \\const Foo = union {};
-        \\export fn entry() -> usize {
+        \\export fn entry() usize {
         \\    return @sizeOf(Foo);
         \\}
     ,
@@ -2576,7 +2576,7 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
         \\    D = 1000,
         \\    E = 60,
         \\};
-        \\export fn entry() {
+        \\export fn entry() void {
         \\    var x = MultipleChoice.C;
         \\}
     ,
@@ -2593,7 +2593,7 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
         \\    A: i32,
         \\    B: f64,
         \\};
-        \\export fn entry() -> usize {
+        \\export fn entry() usize {
         \\    return @sizeOf(Payload);
         \\}
     ,
@@ -2604,7 +2604,7 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
         \\const Foo = union {
         \\    A: i32,
         \\};
-        \\export fn entry() {
+        \\export fn entry() void {
         \\    const x = @TagType(Foo);
         \\}
     ,
@@ -2615,7 +2615,7 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
         \\const Foo = union(enum(f32)) {
         \\    A: i32,
         \\};
-        \\export fn entry() {
+        \\export fn entry() void {
         \\    const x = @TagType(Foo);
         \\}
     ,
@@ -2625,7 +2625,7 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
         \\const Foo = union(u32) {
         \\    A: i32,
         \\};
-        \\export fn entry() {
+        \\export fn entry() void {
         \\    const x = @TagType(Foo);
         \\}
     ,
@@ -2639,7 +2639,7 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
         \\    D = 1000,
         \\    E = 60,
         \\};
-        \\export fn entry() {
+        \\export fn entry() void {
         \\    var x = MultipleChoice { .C = {} };
         \\}
     ,
@@ -2658,7 +2658,7 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
         \\    C: bool,
         \\    D: bool,
         \\};
-        \\export fn entry() {
+        \\export fn entry() void {
         \\    var a = Payload {.A = 1234};
         \\}
     ,
@@ -2671,7 +2671,7 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
         \\    B,
         \\    C,
         \\};
-        \\export fn entry() {
+        \\export fn entry() void {
         \\    var b = Letter.B;
         \\}
     ,
@@ -2682,7 +2682,7 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
         \\const Letter = struct {
         \\    A,
         \\};
-        \\export fn entry() {
+        \\export fn entry() void {
         \\    var a = Letter { .A = {} };
         \\}
     ,
@@ -2692,7 +2692,7 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
         \\const Letter = extern union {
         \\    A,
         \\};
-        \\export fn entry() {
+        \\export fn entry() void {
         \\    var a = Letter { .A = {} };
         \\}
     ,
@@ -2709,7 +2709,7 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
         \\    B: f64,
         \\    C: bool,
         \\};
-        \\export fn entry() {
+        \\export fn entry() void {
         \\    var a = Payload { .A = 1234 };
         \\}
     ,
@@ -2726,7 +2726,7 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
         \\    B: f64,
         \\    C: bool,
         \\};
-        \\export fn entry() {
+        \\export fn entry() void {
         \\    var a = Payload { .A = 1234 };
         \\}
     ,
@@ -2738,11 +2738,11 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
         \\    B: f64,
         \\    C: bool,
         \\};
-        \\export fn entry() {
+        \\export fn entry() void {
         \\    const a = Payload { .A = 1234 };
         \\    foo(a);
         \\}
-        \\fn foo(a: &const Payload) {
+        \\fn foo(a: &const Payload) void {
         \\    switch (*a) {
         \\        Payload.A => {},
         \\        else => unreachable,
@@ -2757,7 +2757,7 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
         \\    A = 10,
         \\    B = 11,
         \\};
-        \\export fn entry() {
+        \\export fn entry() void {
         \\    var x = Foo(0);
         \\}
     ,
@@ -2771,7 +2771,7 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
         \\    B,
         \\    C,
         \\};
-        \\export fn entry() {
+        \\export fn entry() void {
         \\    var x: Value = Letter.A;
         \\}
     ,
@@ -2785,10 +2785,10 @@ pub fn addCases(cases: &tests.CompileErrorContext) {
         \\    B,
         \\    C,
         \\};
-        \\export fn entry() {
+        \\export fn entry() void {
         \\    foo(Letter.A);
         \\}
-        \\fn foo(l: Letter) {
+        \\fn foo(l: Letter) void {
         \\    var x: Value = l;
         \\}
     ,