language-servers/roc
1
0
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2025-09-29 06:44:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

Merge remote-tracking branch 'origin/trunk' into alias-nominal-equality

Browse source
This commit is contained in:
Folkert 2021-07-31 22:59:01 +02:00
commit a47f9baef4
16 changed files with 352 additions and 237 deletions
Download patch file Download diff file Expand all files Collapse all files

10
compiler/solve/src/solve.rs
View file

@ -528,11 +528,10 @@ fn solve(
.get(next_rank)
.iter()
.filter(|var| {
let current = subs.get_without_compacting(
roc_types::subs::Variable::clone(var),
);
let current_rank =
subs.get_rank(roc_types::subs::Variable::clone(var));
current.rank.into_usize() > next_rank.into_usize()
current_rank.into_usize() > next_rank.into_usize()
})
.collect::<Vec<_>>();
@ -561,8 +560,7 @@ fn solve(
let failing: Vec<_> = rigid_vars
.iter()
.filter(|&var| {
!subs.redundant(*var)
&& subs.get_without_compacting(*var).rank != Rank::NONE
!subs.redundant(*var) && subs.get_rank(*var) != Rank::NONE
})
.collect();

2
compiler/solve/tests/solve_expr.rs
View file

@ -115,7 +115,7 @@ mod solve_expr {
let content = {
debug_assert!(exposed_to_host.len() == 1);
let (_symbol, variable) = exposed_to_host.into_iter().next().unwrap();
subs.get(variable).content
subs.get_content_without_compacting(variable)
};
let actual_str = content_to_string(content, subs, home, &interns);