roc-lang/roc
1
1
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2024-11-11 05:34:11 +03:00
Code Issues Packages Projects Releases Wiki Activity

Simplify instantiate aliases

Browse Source
This commit is contained in:
Ayaz Hafiz 2022-05-19 18:21:08 -04:00
parent 935ae50dd4
commit 4dede6e570
No known key found for this signature in database
GPG Key ID: 0E2A37416A25EF58
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
compiler/solve/src/solve.rs
View File

@ -299,7 +299,7 @@ impl Aliases {
arena: &bumpalo::Bump,
symbol: Symbol,
alias_variables: AliasVariables,
) -> Result<(Variable, AliasKind), ()> {
) -> (Variable, AliasKind) {
// hardcoded instantiations for builtin aliases
if let Some((var, kind)) = Self::instantiate_builtin_aliases_real_var(
self,
@ -309,12 +309,15 @@ impl Aliases {
symbol,
alias_variables,
) {
return Ok((var, kind));
return (var, kind);
}
let (typ, delayed_variables, &mut kind) =
match self.aliases.iter_mut().find(|(s, _, _, _)| *s == symbol) {
None => panic!("{:?}", &self.aliases),
None => internal_error!(
"Alias not registered in delayed aliases! {:?}",
&self.aliases
),
Some((_, typ, delayed_variables, kind)) => (typ, delayed_variables, kind),
};
@ -384,7 +387,7 @@ impl Aliases {
}
}
Ok((alias_variable, kind))
(alias_variable, kind)
}
}
@ -2002,7 +2005,7 @@ fn type_to_variable<'a>(
}
};
let instantiated = aliases.instantiate_real_var(
let (alias_variable, kind) = aliases.instantiate_real_var(
subs,
rank,
pools,
@ -2011,9 +2014,6 @@ fn type_to_variable<'a>(
alias_variables,
);
let (alias_variable, kind) = instantiated
.unwrap_or_else(|_| unreachable!("Alias {:?} is not available", symbol));
let content = Content::Alias(*symbol, alias_variables, alias_variable, kind);
register_with_known_var(subs, destination, rank, pools, content)