language-servers/roc
1
0
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2025-09-28 22:34:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

cleanup

Browse source
This commit is contained in:
Folkert 2022-03-05 14:55:45 +01:00
parent 97b0e3df9b
commit 48b0bbe874
No known key found for this signature in database
GPG key ID: 1F17F6FFD112B97C
1 changed files with 12 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

31
compiler/constrain/src/expr.rs
View file

@ -1659,33 +1659,26 @@ fn instantiate_rigids(
}
// wildcards are always freshly introduced in this annotation
for (i, wildcard) in introduced_vars.wildcards.iter().enumerate() {
ftv.insert(format!("*{}", i).into(), *wildcard);
new_rigids.push(*wildcard);
}
new_rigids.extend(introduced_vars.wildcards.iter().copied());
// inferred vars are always freshly introduced in this annotation
new_rigids.extend(introduced_vars.inferred.iter().copied());
// lambda set vars are always freshly introduced in this annotation
for var in introduced_vars.lambda_sets.iter() {
new_rigids.push(*var);
}
// lambda set vars are always freshly introduced in this annotation
for var in introduced_vars.inferred.iter() {
new_rigids.push(*var);
}
new_rigids.extend(introduced_vars.lambda_sets.iter().copied());
// Instantiate rigid variables
if !rigid_substitution.is_empty() {
annotation.substitute(&rigid_substitution);
}
if let Some(new_headers) = crate::pattern::headers_from_annotation(
&loc_pattern.value,
&Loc::at(loc_pattern.region, &annotation),
) {
for (symbol, loc_type) in new_headers {
headers.insert(symbol, loc_type);
}
let loc_annotation_ref = Loc::at(loc_pattern.region, &annotation);
if let Pattern::Identifier(symbol) = loc_pattern.value {
headers.insert(symbol, Loc::at(loc_pattern.region, annotation.clone()));
} else if let Some(new_headers) =
crate::pattern::headers_from_annotation(&loc_pattern.value, &loc_annotation_ref)
{
headers.extend(new_headers)
}
annotation