language-servers/roc
1
0
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2025-07-31 10:23:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Use UEnv where possible

Browse source
This commit is contained in:
Ayaz Hafiz 2023-06-22 14:12:05 -05:00
parent ad20a2ee41
commit adf961ba0b
No known key found for this signature in database
GPG key ID: 0E2A37416A25EF58
4 changed files with 23 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

26
crates/compiler/solve/src/solve.rs
View file

@ -14,7 +14,7 @@ use crate::Aliases;
use bumpalo::Bump;
use roc_can::abilities::{AbilitiesStore, MemberSpecializationInfo};
use roc_can::constraint::Constraint::{self, *};
use roc_can::constraint::{Constraints, Cycle, LetConstraint, OpportunisticResolve};
use roc_can::constraint::{Cycle, LetConstraint, OpportunisticResolve};
use roc_can::expected::{Expected, PExpected};
use roc_debug_flags::dbg_do;
#[cfg(debug_assertions)]
@ -30,8 +30,8 @@ use roc_types::subs::{
};
use roc_types::types::{Category, Polarity, Reason, RecordField, Type, TypeExtension, Types, Uls};
use roc_unify::unify::{
unify, unify_introduced_ability_specialization, Env as UEnv, Mode, Obligated,
SpecializationLsetCollector, Unified::*,
unify, unify_introduced_ability_specialization, Mode, Obligated, SpecializationLsetCollector,
Unified::*,
};
mod scope;
@ -484,7 +484,7 @@ fn solve(
);
match unify(
&mut UEnv::new(env.subs),
&mut env.uenv(),
actual,
expected,
Mode::EQ,
@ -591,7 +591,7 @@ fn solve(
);
match unify(
&mut UEnv::new(env.subs),
&mut env.uenv(),
actual,
expected,
Mode::EQ,
@ -698,7 +698,7 @@ fn solve(
};
match unify(
&mut UEnv::new(env.subs),
&mut env.uenv(),
actual,
expected,
mode,
@ -910,7 +910,7 @@ fn solve(
);
match unify(
&mut UEnv::new(env.subs),
&mut env.uenv(),
actual,
includes,
Mode::PRESENT,
@ -1044,7 +1044,7 @@ fn solve(
let snapshot = env.subs.snapshot();
let unify_cond_and_patterns_outcome = unify(
&mut UEnv::new(env.subs),
&mut env.uenv(),
branches_var,
real_var,
Mode::EQ,
@ -1094,7 +1094,7 @@ fn solve(
open_tag_union(env, branches_var);
let almost_eq = matches!(
unify(
&mut UEnv::new(env.subs),
&mut env.uenv(),
real_var,
branches_var,
Mode::EQ,
@ -1112,7 +1112,7 @@ fn solve(
// Case 4: incompatible types, report type error.
// Re-run first failed unification to get the type diff.
match unify(
&mut UEnv::new(env.subs),
&mut env.uenv(),
real_var,
branches_var,
Mode::EQ,
@ -1311,7 +1311,7 @@ fn solve(
lambda_sets_to_specialize,
extra_metadata: _,
} = unify(
&mut UEnv::new(env.subs),
&mut env.uenv(),
actual,
Variable::LIST_U8,
Mode::EQ,
@ -1331,7 +1331,7 @@ fn solve(
// We explicitly match on the last unify to get the type in the case it errors.
match unify(
&mut UEnv::new(env.subs),
&mut env.uenv(),
actual,
Variable::STR,
Mode::EQ,
@ -1574,7 +1574,7 @@ fn check_ability_specialization(
deep_copy_var_in(env, Rank::toplevel(), root_signature_var, env.arena);
let snapshot = env.subs.snapshot();
let unified = unify_introduced_ability_specialization(
&mut UEnv::new(env.subs),
&mut env.uenv(),
root_signature_var,
symbol_loc_var.value,
Mode::EQ,