language-servers/roc
1
0
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2025-10-01 07:41:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

make VariableSubsSlice an alias

Browse source
This commit is contained in:
Folkert 2021-11-25 20:29:34 +01:00
parent 69a80872e1
commit 612f868652
7 changed files with 50 additions and 108 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -842,7 +842,7 @@ fn unify_shared_tags_new(
all_fields = merge_sorted(
all_fields,
other1.into_iter().map(|(field_name, subs_slice)| {
let vec = subs.get_subs_slice(*subs_slice.as_subs_slice()).to_vec();
let vec = subs.get_subs_slice(subs_slice).to_vec();
(field_name, vec)
}),
@ -851,7 +851,7 @@ fn unify_shared_tags_new(
all_fields = merge_sorted(
all_fields,
other2.into_iter().map(|(field_name, subs_slice)| {
let vec = subs.get_subs_slice(*subs_slice.as_subs_slice()).to_vec();
let vec = subs.get_subs_slice(subs_slice).to_vec();
(field_name, vec)
}),
@ -969,8 +969,7 @@ fn unify_flat_type(
}
(Apply(l_symbol, l_args), Apply(r_symbol, r_args)) if l_symbol == r_symbol => {
let problems =
unify_zip_slices(subs, pool, *l_args.as_subs_slice(), *r_args.as_subs_slice());
let problems = unify_zip_slices(subs, pool, *l_args, *r_args);
if problems.is_empty() {
merge(subs, ctx, Structure(Apply(*r_symbol, *r_args)))
@ -981,8 +980,7 @@ fn unify_flat_type(
(Func(l_args, l_closure, l_ret), Func(r_args, r_closure, r_ret))
if l_args.len() == r_args.len() =>
{
let arg_problems =
unify_zip_slices(subs, pool, *l_args.as_subs_slice(), *r_args.as_subs_slice());
let arg_problems = unify_zip_slices(subs, pool, *l_args, *r_args);
let ret_problems = unify_pool(subs, pool, *l_ret, *r_ret);
let closure_problems = unify_pool(subs, pool, *l_closure, *r_closure);