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

Remove problems from error type API surface

Browse source
This commit is contained in:
Ayaz Hafiz 2022-11-08 13:38:42 -06:00
parent b6322ff883
commit 09748aec48
No known key found for this signature in database
GPG key ID: 0E2A37416A25EF58
5 changed files with 32 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -419,35 +419,29 @@ fn unify_help<M: MetaCollector>(
ErrorTypeContext::None
};
let (type1, mut problems) =
env.subs
.var_to_error_type_contextual(var1, error_context, observed_pol);
let (type2, problems2) =
env.subs
.var_to_error_type_contextual(var2, error_context, observed_pol);
problems.extend(problems2);
let type1 = env
.subs
.var_to_error_type_contextual(var1, error_context, observed_pol);
let type2 = env
.subs
.var_to_error_type_contextual(var2, error_context, observed_pol);
env.subs.union(var1, var2, Content::Error.into());
if !problems.is_empty() {
Unified::BadType(vars, problems.remove(0))
} else {
let do_not_implement_ability = mismatches
.into_iter()
.filter_map(|mismatch| match mismatch {
Mismatch::DoesNotImplementAbiity(var, ab) => {
let (err_type, _new_problems) =
env.subs
.var_to_error_type_contextual(var, error_context, observed_pol);
Some((err_type, ab))
}
_ => None,
})
.collect();
let do_not_implement_ability = mismatches
.into_iter()
.filter_map(|mismatch| match mismatch {
Mismatch::DoesNotImplementAbiity(var, ab) => {
let err_type =
env.subs
.var_to_error_type_contextual(var, error_context, observed_pol);
Some((err_type, ab))
}
_ => None,
})
.collect();
Unified::Failure(vars, type1, type2, do_not_implement_ability)
}
Unified::Failure(vars, type1, type2, do_not_implement_ability)
}
}