Nixyri/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2024-11-15 00:26:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Sema: add error note for !?Type types when optional type is expected

Browse Source
This commit is contained in:
r00ster91 2023-07-21 02:58:41 +02:00 committed by wooster0
parent 31689d0dd9
commit 8579904ddd
2 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/Sema.zig
View File

@ -2228,8 +2228,19 @@ fn failWithModRemNegative(sema: *Sema, block: *Block, src: LazySrcLoc, lhs_ty: T
});
}
fn failWithExpectedOptionalType(sema: *Sema, block: *Block, src: LazySrcLoc, optional_ty: Type) CompileError {
return sema.fail(block, src, "expected optional type, found '{}'", .{optional_ty.fmt(sema.mod)});
fn failWithExpectedOptionalType(sema: *Sema, block: *Block, src: LazySrcLoc, non_optional_ty: Type) CompileError {
const mod = sema.mod;
const msg = msg: {
const msg = try sema.errMsg(block, src, "expected optional type, found '{}'", .{
non_optional_ty.fmt(mod),
});
errdefer msg.destroy(sema.gpa);
if (non_optional_ty.zigTypeTag(mod) == .ErrorUnion) {
try sema.errNote(block, src, msg, "consider using 'try', 'catch', or 'if'", .{});
}
break :msg msg;
};
return sema.failWithOwnedErrorMsg(block, msg);
}
fn failWithArrayInitNotSupported(sema: *Sema, block: *Block, src: LazySrcLoc, ty: Type) CompileError {
@ -9038,7 +9049,7 @@ fn analyzeOptionalPayloadPtr(
const opt_type = optional_ptr_ty.childType(zcu);
if (opt_type.zigTypeTag(zcu) != .Optional) {
return sema.fail(block, src, "expected optional type, found '{}'", .{opt_type.fmt(zcu)});
return sema.failWithExpectedOptionalType(block, src, opt_type);
}
const child_type = opt_type.optionalChild(zcu);

1
test/cases/compile_errors/while_expected_optional_got_error_union.zig
View File

@ -12,3 +12,4 @@ fn bar() anyerror!i32 {
// target=native
//
// :2:15: error: expected optional type, found 'anyerror!i32'
// :2:15: note: consider using 'try', 'catch', or 'if'