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

Remove Lowercase from Alias and Opaque

Browse source
This commit is contained in:
Ayaz Hafiz 2022-04-29 11:36:31 -04:00
parent 452b882f12
commit 83c6c3a17d
No known key found for this signature in database
GPG key ID: 0E2A37416A25EF58
15 changed files with 91 additions and 97 deletions
Download patch file Download diff file Expand all files Collapse all files

33
compiler/solve/src/solve.rs
View file

@ -372,19 +372,24 @@ impl Aliases {
AliasKind::Opaque => {
// For opaques, the instantiation must be to an opaque type rather than just what's
// on the RHS.
let lambda_set_variables = new_lambda_set_variables
.iter()
.copied()
.map(Type::Variable)
.map(LambdaSet)
.collect();
let type_arguments = new_type_variables
.clone()
.iter()
.copied()
.map(Type::Variable)
.collect();
let opaq = Type::Alias {
symbol,
kind: *kind,
lambda_set_variables: new_lambda_set_variables
.iter()
.copied()
.map(Type::Variable)
.map(LambdaSet)
.collect(),
type_arguments: new_type_variables
.iter()
.map(|v| ("".into(), Type::Variable(*v)))
.collect(),
lambda_set_variables,
type_arguments,
actual: Box::new(typ.clone()),
};
@ -1971,9 +1976,7 @@ fn type_to_variable<'a>(
let length = type_arguments.len() + lambda_set_variables.len();
let new_variables = VariableSubsSlice::reserve_into_subs(subs, length);
for (target_index, (_, arg_type)) in
(new_variables.indices()).zip(type_arguments)
{
for (target_index, arg_type) in (new_variables.indices()).zip(type_arguments) {
let copy_var = helper!(arg_type);
subs.variables[target_index] = copy_var;
}
@ -2013,9 +2016,7 @@ fn type_to_variable<'a>(
let length = type_arguments.len() + lambda_set_variables.len();
let new_variables = VariableSubsSlice::reserve_into_subs(subs, length);
for (target_index, (_, arg_type)) in
(new_variables.indices()).zip(type_arguments)
{
for (target_index, arg_type) in (new_variables.indices()).zip(type_arguments) {
let copy_var = helper!(arg_type);
subs.variables[target_index] = copy_var;
}