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

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

Browse source
This commit is contained in:
Folkert 2021-07-30 14:25:50 +02:00
commit 13b05e54e8
81 changed files with 427 additions and 390 deletions
Download patch file Download diff file Expand all files Collapse all files

4
compiler/unify/src/unify.rs
View file

@ -188,7 +188,7 @@ fn unify_alias(
// Alias wins
merge(
subs,
&ctx,
ctx,
Alias(
symbol,
args.to_owned(),
@ -220,7 +220,7 @@ fn unify_alias(
}
if problems.is_empty() {
problems.extend(merge(subs, &ctx, other_content.clone()));
problems.extend(merge(subs, ctx, other_content.clone()));
}
if problems.is_empty() {