mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2025-12-06 06:13:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

stage2: order of error set merging should match stage1

Browse Source
This commit is contained in:
Mitchell Hashimoto 2022-02-27 19:13:52 -08:00 committed by Andrew Kelley
parent 6dae1de017
commit 0eb3cb9e8c
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Sema.zig
View File

@ -17763,7 +17763,7 @@ fn resolvePeerTypes(
} }
// Merge errors // Merge errors
err_set_ty = try err_set_ty.?.errorSetMerge(sema.arena, candidate_ty); err_set_ty = try candidate_ty.errorSetMerge(sema.arena, err_set_ty.?);
chosen = candidate; chosen = candidate;
chosen_i = candidate_i + 1; chosen_i = candidate_i + 1;
continue; continue;
@ -17850,7 +17850,7 @@ fn resolvePeerTypes(
} }
// Not a superset, create merged error set // Not a superset, create merged error set
err_set_ty = try err_set_ty.?.errorSetMerge(sema.arena, eu_set_ty); err_set_ty = try eu_set_ty.errorSetMerge(sema.arena, err_set_ty.?);
chosen = candidate; chosen = candidate;
chosen_i = candidate_i + 1; chosen_i = candidate_i + 1;
continue; continue;

24
test/behavior/cast.zig
View File

@ -669,16 +669,16 @@ test "peer type resolution: disjoint error sets" {
const a: error{ One, Two } = undefined; const a: error{ One, Two } = undefined;
const b: error{Three} = undefined; const b: error{Three} = undefined;
// note: order of error set members doesn't member, may want to sort // note: order of error set made to match stage1 during stage2 dev
{ {
const ty = @TypeOf(a, b); const ty = @TypeOf(a, b);
const error_set_info = @typeInfo(ty); const error_set_info = @typeInfo(ty);
try expect(error_set_info == .ErrorSet); try expect(error_set_info == .ErrorSet);
try expect(error_set_info.ErrorSet.?.len == 3); try expect(error_set_info.ErrorSet.?.len == 3);
try expect(mem.eql(u8, error_set_info.ErrorSet.?[0].name, "One")); try expect(mem.eql(u8, error_set_info.ErrorSet.?[0].name, "Three"));
try expect(mem.eql(u8, error_set_info.ErrorSet.?[1].name, "Two")); try expect(mem.eql(u8, error_set_info.ErrorSet.?[1].name, "One"));
try expect(mem.eql(u8, error_set_info.ErrorSet.?[2].name, "Three")); try expect(mem.eql(u8, error_set_info.ErrorSet.?[2].name, "Two"));
} }
{ {
@ -686,9 +686,9 @@ test "peer type resolution: disjoint error sets" {
const error_set_info = @typeInfo(ty); const error_set_info = @typeInfo(ty);
try expect(error_set_info == .ErrorSet); try expect(error_set_info == .ErrorSet);
try expect(error_set_info.ErrorSet.?.len == 3); try expect(error_set_info.ErrorSet.?.len == 3);
try expect(mem.eql(u8, error_set_info.ErrorSet.?[0].name, "Three")); try expect(mem.eql(u8, error_set_info.ErrorSet.?[0].name, "One"));
try expect(mem.eql(u8, error_set_info.ErrorSet.?[1].name, "One")); try expect(mem.eql(u8, error_set_info.ErrorSet.?[1].name, "Two"));
try expect(mem.eql(u8, error_set_info.ErrorSet.?[2].name, "Two")); try expect(mem.eql(u8, error_set_info.ErrorSet.?[2].name, "Three"));
} }
} }
@ -701,7 +701,7 @@ test "peer type resolution: error union and error set" {
const a: error{Three} = undefined; const a: error{Three} = undefined;
const b: error{ One, Two }!u32 = undefined; const b: error{ One, Two }!u32 = undefined;
// note: order of error set members doesn't member, may want to sort // note: order of error set made to match stage1 during stage2 dev
{ {
const ty = @TypeOf(a, b); const ty = @TypeOf(a, b);
@ -710,9 +710,9 @@ test "peer type resolution: error union and error set" {
const error_set_info = @typeInfo(info.ErrorUnion.error_set); const error_set_info = @typeInfo(info.ErrorUnion.error_set);
try expect(error_set_info.ErrorSet.?.len == 3); try expect(error_set_info.ErrorSet.?.len == 3);
try expect(mem.eql(u8, error_set_info.ErrorSet.?[0].name, "Three")); try expect(mem.eql(u8, error_set_info.ErrorSet.?[0].name, "One"));
try expect(mem.eql(u8, error_set_info.ErrorSet.?[1].name, "One")); try expect(mem.eql(u8, error_set_info.ErrorSet.?[1].name, "Two"));
try expect(mem.eql(u8, error_set_info.ErrorSet.?[2].name, "Two")); try expect(mem.eql(u8, error_set_info.ErrorSet.?[2].name, "Three"));
} }
{ {
@ -737,7 +737,7 @@ test "peer type resolution: error union after non-error" {
const a: u32 = undefined; const a: u32 = undefined;
const b: error{ One, Two }!u32 = undefined; const b: error{ One, Two }!u32 = undefined;
// note: order of error set members doesn't member, may want to sort // note: order of error set made to match stage1 during stage2 dev
{ {
const ty = @TypeOf(a, b); const ty = @TypeOf(a, b);