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

Explicit is_inside_lambda_set not needed

Browse source
This commit is contained in:
Ayaz Hafiz 2022-12-13 09:00:46 -06:00
parent 79ee266f66
commit 63b0eb49d8
No known key found for this signature in database
GPG key ID: 0E2A37416A25EF58
1 changed files with 4 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -322,7 +322,6 @@ pub struct Env<'a> {
pub subs: &'a mut Subs,
seen_recursion: VecSet<(Variable, Variable)>,
fixed_variables: VecSet<Variable>,
is_inside_lambda_set: bool,
}
impl<'a> Env<'a> {
@ -331,7 +330,6 @@ impl<'a> Env<'a> {
subs,
seen_recursion: Default::default(),
fixed_variables: Default::default(),
is_inside_lambda_set: false,
}
}
@ -1479,21 +1477,14 @@ fn separate_union_lambdas<M: MetaCollector>(
// foo ({} -[ bar U64 ]-> {}) ] -> {}
let subs_snapshot = env.subs.snapshot();
let pool_snapshot = pool.len();
let outcome = unify_pool(env, pool, var1, var2, mode);
let outcome: Outcome<M> = unify_pool(env, pool, var1, var2, mode);
if !outcome.mismatches.is_empty() {
// Rolling back will also pull apart any nested lambdas that
// were joined into the same set.
env.subs.rollback_to(subs_snapshot);
pool.truncate(pool_snapshot);
if env.is_inside_lambda_set {
// If the lambdas being compared are nested, mismatches mean that the
// transitively-outer lambdas should be treated as disjoint in
// their ultimate lambda set.
// As such, do not unify, even disjointly, at this level;
// force the transient parent to be treated disjointly.
return Err(outcome);
} else {
continue 'try_next_right;
}
continue 'try_next_right;
} else {
let outcome = unify_pool(env, pool, var1, var2, mode);
whole_outcome.union(outcome);