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

hook up aliases

Browse source
This commit is contained in:
Folkert 2022-03-15 22:23:40 +01:00
parent 7d8409f6a6
commit b3dce7317d
No known key found for this signature in database
GPG key ID: 1F17F6FFD112B97C
4 changed files with 30 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -153,7 +153,7 @@ impl Aliases {
subs: &mut Subs,
rank: Rank,
pools: &mut Pools,
_arena: &bumpalo::Bump,
arena: &bumpalo::Bump,
symbol: Symbol,
alias_variables: AliasVariables,
) -> Result<Variable, ()> {
@ -314,9 +314,10 @@ pub fn run(
env: &Env,
problems: &mut Vec<TypeError>,
mut subs: Subs,
aliases: &mut Aliases,
constraint: &Constraint,
) -> (Solved<Subs>, Env) {
let env = run_in_place(constraints, env, problems, &mut subs, constraint);
let env = run_in_place(constraints, env, problems, &mut subs, aliases, constraint);
(Solved(subs), env)
}
@ -327,6 +328,7 @@ pub fn run_in_place(
env: &Env,
problems: &mut Vec<TypeError>,
subs: &mut Subs,
aliases: &mut Aliases,
constraint: &Constraint,
) -> Env {
let mut pools = Pools::default();
@ -347,7 +349,7 @@ pub fn run_in_place(
rank,
&mut pools,
problems,
&mut Aliases::default(),
aliases,
subs,
constraint,
);