Commit bd32a0f3db2d03749e7aef22cbc2aa6f85b689d1 | zig

author	William Sengir <william@sengir.com> 2022-05-11 03:34:44-07:00
committer	William Sengir <william@sengir.com> 2022-05-11 03:47:03-07:00
log	bd32a0f3db2d03749e7aef22cbc2aa6f85b689d1
tree	63bf26f353e75d1ec7a606992df7a1b48fcde279
parent	6608fa135321c2caa989a4e0357307874c644b6b
signature	Commit is signed but in an unrecognized format.

1 files changed, 12 insertions(+), 6 deletions(-)

src/Sema.zig+12-6

 @@ -14215,12 +14215,18 @@ fn zirErrSetCast(sema: *Sema, block: *Block, extended: Zir.Inst.Extended.InstDat
         if (!dest_ty.isAnyError()) {
             const error_name = val.castTag(.@"error").?.data.name;
             if (!dest_ty.errorSetHasField(error_name)) {
-                return sema.fail(
+                const msg = msg: {
-                    block,
+                    const msg = try sema.errMsg(
-                    src,
+                        block,
-                    "error.{s} not a member of error set '{}'",
+                        src,
-                    .{ error_name, dest_ty.fmt(sema.mod) },
+                        "error.{s} not a member of error set '{}'",
-                );
+                        .{ error_name, dest_ty.fmt(sema.mod) },
+                    );
+                    errdefer msg.destroy(sema.gpa);
+                    try sema.addDeclaredHereNote(msg, dest_ty);
+                    break :msg msg;
+                };
+                return sema.failWithOwnedErrorMsg(block, msg);
             }
         }