Commit 0bef271e75657195145a519199ce12b97db246f4 | zig

author	Joachim Schmidt <joachim.schmidt557@outlook.com> 2021-06-19 17:16:24+08:00
committer	Joachim Schmidt <joachim.schmidt557@outlook.com> 2021-08-04 09:27:48+02:00
log	0bef271e75657195145a519199ce12b97db246f4
tree	34cb8a6378e15d87345ab037ee836a3eacb2950c
parent	aad4598367b136a06e3569373be7da8febea7f31
signature	Commit is signed but in an unrecognized format.

1 files changed, 9 insertions(+), 2 deletions(-)

src/Sema.zig+9-2

 @@ -8398,8 +8398,15 @@ fn resolvePeerTypes(
             continue;
         }
-        // TODO error notes pointing out each type
+        const msg = msg: {
-        return sema.mod.fail(&block.base, src, "incompatible types: '{}' and '{}'", .{ chosen_ty, candidate_ty });
+            const msg = try sema.mod.errMsg(&block.base, src, "incompatible types: '{}' and '{}'", .{ chosen_ty, candidate_ty });
+            errdefer msg.destroy(sema.gpa);
+            // TODO add error notes
+            // try sema.mod.errNote(&block.base, chosen.src, msg, "type '{}' here", .{chosen_ty});
+            // try sema.mod.errNote(&block.base, candidate.src, msg, "type '{}' here", .{candidate_ty});
+            break :msg msg;
+        };
+        return sema.mod.failWithOwnedErrorMsg(&block.base, msg);
     }
     return sema.typeOf(chosen);