Merge pull request #1 from ziglang/master

Refresh from original.

1 files changed, 16 insertions, 4 deletions

diff --git a/test/compile_errors.zig b/test/compile_errors.zig
index c5575a0c0b..be839f0550 100644
--- a/test/compile_errors.zig
+++ b/test/compile_errors.zig
@@ -2,6 +2,18 @@ const tests = @import("tests.zig");
 
 pub fn addCases(cases: *tests.CompileErrorContext) void {
     cases.add(
+        "error note for function parameter incompatibility",
+        \\fn do_the_thing(func: fn (arg: i32) void) void {}
+        \\fn bar(arg: bool) void {}
+        \\export fn entry() void {
+        \\    do_the_thing(bar);
+        \\}
+    ,
+        ".tmp_source.zig:4:18: error: expected type 'fn(i32) void', found 'fn(bool) void",
+        ".tmp_source.zig:4:18: note: parameter 0: 'bool' cannot cast into 'i32'",
+    );
+
+    cases.add(
         "cast negative value to unsigned integer",
         \\comptime {
         \\    const value: i32 = -1;
@@ -5248,8 +5260,8 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
         \\export fn foo() void {
         \\    asm volatile ("" : : [bar]"r"(3) : "");
         \\}
-        ,
-            ".tmp_source.zig:2:35: error: expected sized integer or sized float, found comptime_int",
+    ,
+        ".tmp_source.zig:2:35: error: expected sized integer or sized float, found comptime_int",
     );
 
     cases.add(
@@ -5257,7 +5269,7 @@ pub fn addCases(cases: *tests.CompileErrorContext) void {
         \\export fn foo() void {
         \\    asm volatile ("" : : [bar]"r"(3.17) : "");
         \\}
-        ,
-            ".tmp_source.zig:2:35: error: expected sized integer or sized float, found comptime_float",
+    ,
+        ".tmp_source.zig:2:35: error: expected sized integer or sized float, found comptime_float",
     );
 }