language-servers/roc
1
0
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2025-09-26 13:29:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Allow rigid able to unify with flex able when rigid bounds are a superset

Browse source
This commit is contained in:
Ayaz Hafiz 2022-10-12 16:32:59 -05:00
parent 0a96a93a67
commit 3bd10698cf
No known key found for this signature in database
GPG key ID: 0E2A37416A25EF58
2 changed files with 27 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

14
crates/compiler/unify/src/unify.rs
View file

@ -2900,6 +2900,11 @@ fn unify_rigid<M: MetaCollector>(
}
}
#[inline(always)]
fn abilities_are_superset(superset: &[Symbol], subset: &[Symbol]) -> bool {
subset.iter().all(|ability| superset.contains(ability))
}
#[inline(always)]
#[must_use]
fn unify_rigid_able<M: MetaCollector>(
@ -2920,9 +2925,8 @@ fn unify_rigid_able<M: MetaCollector>(
env.subs.get_subs_slice(*other_abilities_slice),
);
// Invariant: abilities are inserted in sorted order.
if abilities == other_abilities {
// The ability bounds are the same, so rigid wins!
if abilities_are_superset(abilities, other_abilities) {
// The rigid has all the ability bounds of the flex, so rigid wins!
merge(env, ctx, RigidAbleVar(*name, abilities_slice))
} else {
// Mismatch for now.
@ -3066,8 +3070,8 @@ fn unify_flex_able<M: MetaCollector>(
env.subs.get_subs_slice(*other_abilities_slice),
);
// Invariant: abilities are inserted in sorted order.
if abilities == other_abilities {
if abilities_are_superset(other_abilities, abilities) {
// Rigid has all the ability bounds of the flex, so rigid wins!
merge(env, ctx, *other)
} else {
mismatch!(%not_able, ctx.second, abilities, "RigidAble {:?} vs {:?}", abilities, other_abilities)