mirrors/zig
1
0
Fork 0
mirror of https://codeberg.org/ziglang/zig.git synced 2025-12-06 13:54:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge 964a3f51df into 53e615b920

Browse source
This commit is contained in:
Ryan Mehri 2025-11-24 19:23:28 -05:00 • committed by GitHub
commit 33a6b4ac70
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 23 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/Sema.zig
View file

@ -29142,7 +29142,7 @@ fn coerceExtra(
// E!T to T // E!T to T
if (inst_ty.zigTypeTag(zcu) == .error_union and if (inst_ty.zigTypeTag(zcu) == .error_union and
(try sema.coerceInMemoryAllowed(block, inst_ty.errorUnionPayload(zcu), dest_ty, false, target, dest_ty_src, inst_src, maybe_inst_val)) == .ok) (try sema.coerceInMemoryAllowed(block, dest_ty, inst_ty.errorUnionPayload(zcu), false, target, dest_ty_src, inst_src, null)) == .ok)
{ {
try sema.errNote(inst_src, msg, "cannot convert error union to payload type", .{}); try sema.errNote(inst_src, msg, "cannot convert error union to payload type", .{});
try sema.errNote(inst_src, msg, "consider using 'try', 'catch', or 'if'", .{}); try sema.errNote(inst_src, msg, "consider using 'try', 'catch', or 'if'", .{});
@ -29150,7 +29150,7 @@ fn coerceExtra(
// ?T to T // ?T to T
if (inst_ty.zigTypeTag(zcu) == .optional and if (inst_ty.zigTypeTag(zcu) == .optional and
(try sema.coerceInMemoryAllowed(block, inst_ty.optionalChild(zcu), dest_ty, false, target, dest_ty_src, inst_src, maybe_inst_val)) == .ok) (try sema.coerceInMemoryAllowed(block, dest_ty, inst_ty.optionalChild(zcu), false, target, dest_ty_src, inst_src, null)) == .ok)
{ {
try sema.errNote(inst_src, msg, "cannot convert optional to payload type", .{}); try sema.errNote(inst_src, msg, "cannot convert optional to payload type", .{});
try sema.errNote(inst_src, msg, "consider using '.?', 'orelse', or 'if'", .{}); try sema.errNote(inst_src, msg, "consider using '.?', 'orelse', or 'if'", .{});

12
test/cases/compile_errors/comptime_coercing_int_error_union_doesnt_crash.zig Normal file
View file

@ -0,0 +1,12 @@
const x = 0;
comptime {
x += foo();
}
fn foo() !usize {
return 0;
}
// error
//
// :3:13: error: expected type 'comptime_int', found 'error{}!usize'

9
test/cases/compile_errors/comptime_coercing_int_optional_doesnt_crash.zig Normal file
View file

@ -0,0 +1,9 @@
const x = 0;
const y: ?usize = null;
comptime {
x += y;
}
// error
//
// :4:10: error: expected type 'comptime_int', found '?usize'