language-servers/roc
1
0
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2025-10-03 08:34:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Merge remote-tracking branch 'origin/trunk' into specialize-separately

Browse source
This commit is contained in:
Richard Feldman 2020-06-13 20:59:11 -04:00
commit 245a9fc951
40 changed files with 2118 additions and 1621 deletions
Download patch file Download diff file Expand all files Collapse all files

11
compiler/constrain/src/uniq.rs
View file

@ -148,7 +148,7 @@ fn constrain_pattern(
match &pattern.value {
Identifier(symbol) => {
state.headers.insert(
symbol.clone(),
*symbol,
Located {
region: pattern.region,
value: expected.get_type(),
@ -223,10 +223,9 @@ fn constrain_pattern(
let expected = PExpected::NoExpectation(pat_type.clone());
if !state.headers.contains_key(&symbol) {
state.headers.insert(
symbol.clone(),
Located::at(pattern.region, pat_type.clone()),
);
state
.headers
.insert(*symbol, Located::at(pattern.region, pat_type.clone()));
}
field_types.insert(label.clone(), pat_type.clone());
@ -1396,7 +1395,7 @@ fn constrain_var(
Lookup(symbol_for_lookup, expected, region)
}
Some(Usage::Access(_, _, _)) | Some(Usage::Update(_, _, _)) => {
applied_usage_constraint.insert(symbol_for_lookup.clone());
applied_usage_constraint.insert(symbol_for_lookup);
let mut variables = Vec::new();
let (free, rest, inner_type) =