language-servers/roc
1
0
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2025-07-24 15:03:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Clippy

Browse source
This commit is contained in:
Ayaz Hafiz 2022-06-28 17:38:12 -04:00 • committed by ayazhafiz
parent d63eb23664
commit eb400590cc
No known key found for this signature in database
GPG key ID: B443F7A3030C9AED
1 changed files with 20 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -981,16 +981,18 @@ impl Default for Sides {
}
}
struct SeparatedUnionLambdas {
only_in_left: Vec<(Symbol, VariableSubsSlice)>,
only_in_right: Vec<(Symbol, VariableSubsSlice)>,
joined: Vec<(Symbol, VariableSubsSlice)>,
}
fn separate_union_lambdas(
subs: &mut Subs,
pool: &mut Pool,
fields1: UnionLambdas,
fields2: UnionLambdas,
) -> (
Vec<(Symbol, VariableSubsSlice)>,
Vec<(Symbol, VariableSubsSlice)>,
Vec<(Symbol, VariableSubsSlice)>,
) {
) -> SeparatedUnionLambdas {
debug_assert!(fields1.is_sorted(subs));
debug_assert!(fields2.is_sorted(subs));
@ -1086,7 +1088,11 @@ fn separate_union_lambdas(
}
}
(only_in_left, only_in_right, joined)
SeparatedUnionLambdas {
only_in_left,
only_in_right,
joined,
}
}
fn unify_lambda_set_help<M: MetaCollector>(
@ -1117,22 +1123,26 @@ fn unify_lambda_set_help<M: MetaCollector>(
"Recursion var is present, but it doesn't have a recursive content!"
);
let (only_in_1, only_in_2, in_both) = separate_union_lambdas(subs, pool, solved1, solved2);
let SeparatedUnionLambdas {
only_in_left,
only_in_right,
joined,
} = separate_union_lambdas(subs, pool, solved1, solved2);
let all_lambdas = in_both
let all_lambdas = joined
.into_iter()
.map(|(name, slice)| (name, subs.get_subs_slice(slice).to_vec()));
let all_lambdas = merge_sorted_preserving_duplicates(
all_lambdas,
only_in_1.into_iter().map(|(name, subs_slice)| {
only_in_left.into_iter().map(|(name, subs_slice)| {
let vec = subs.get_subs_slice(subs_slice).to_vec();
(name, vec)
}),
);
let all_lambdas = merge_sorted_preserving_duplicates(
all_lambdas,
only_in_2.into_iter().map(|(name, subs_slice)| {
only_in_right.into_iter().map(|(name, subs_slice)| {
let vec = subs.get_subs_slice(subs_slice).to_vec();
(name, vec)
}),