language-servers/roc
1
0
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2025-07-27 16:33:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Shove more into a common env

Browse source
This commit is contained in:
Ayaz Hafiz 2023-06-22 14:06:55 -05:00
parent f8e377a055
commit 15eef74a83
No known key found for this signature in database
GPG key ID: 0E2A37416A25EF58
2 changed files with 40 additions and 105 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -484,7 +484,11 @@ fn solve(
);
match unify(
<<<<<<< HEAD
&mut env.uenv(),
=======
&mut UEnv::new(env.subs),
>>>>>>> e28273793 (Shove more into a common env)
actual,
expected,
Mode::EQ,
@ -591,7 +595,11 @@ fn solve(
);
match unify(
<<<<<<< HEAD
&mut env.uenv(),
=======
&mut UEnv::new(env.subs),
>>>>>>> e28273793 (Shove more into a common env)
actual,
expected,
Mode::EQ,
@ -698,7 +706,11 @@ fn solve(
};
match unify(
<<<<<<< HEAD
&mut env.uenv(),
=======
&mut UEnv::new(env.subs),
>>>>>>> e28273793 (Shove more into a common env)
actual,
expected,
mode,
@ -910,7 +922,11 @@ fn solve(
);
match unify(
<<<<<<< HEAD
&mut env.uenv(),
=======
&mut UEnv::new(env.subs),
>>>>>>> e28273793 (Shove more into a common env)
actual,
includes,
Mode::PRESENT,
@ -1044,7 +1060,11 @@ fn solve(
let snapshot = env.subs.snapshot();
let unify_cond_and_patterns_outcome = unify(
<<<<<<< HEAD
&mut env.uenv(),
=======
&mut UEnv::new(env.subs),
>>>>>>> e28273793 (Shove more into a common env)
branches_var,
real_var,
Mode::EQ,
@ -1094,7 +1114,11 @@ fn solve(
open_tag_union(env, branches_var);
let almost_eq = matches!(
unify(
<<<<<<< HEAD
&mut env.uenv(),
=======
&mut UEnv::new(env.subs),
>>>>>>> e28273793 (Shove more into a common env)
real_var,
branches_var,
Mode::EQ,
@ -1112,7 +1136,11 @@ fn solve(
// Case 4: incompatible types, report type error.
// Re-run first failed unification to get the type diff.
match unify(
<<<<<<< HEAD
&mut env.uenv(),
=======
&mut UEnv::new(env.subs),
>>>>>>> e28273793 (Shove more into a common env)
real_var,
branches_var,
Mode::EQ,
@ -1311,7 +1339,11 @@ fn solve(
lambda_sets_to_specialize,
extra_metadata: _,
} = unify(
<<<<<<< HEAD
&mut env.uenv(),
=======
&mut UEnv::new(env.subs),
>>>>>>> e28273793 (Shove more into a common env)
actual,
Variable::LIST_U8,
Mode::EQ,
@ -1331,7 +1363,11 @@ fn solve(
// We explicitly match on the last unify to get the type in the case it errors.
match unify(
<<<<<<< HEAD
&mut env.uenv(),
=======
&mut UEnv::new(env.subs),
>>>>>>> e28273793 (Shove more into a common env)
actual,
Variable::STR,
Mode::EQ,
@ -1574,7 +1610,11 @@ 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(
<<<<<<< HEAD
&mut env.uenv(),
=======
&mut UEnv::new(env.subs),
>>>>>>> e28273793 (Shove more into a common env)
root_signature_var,
symbol_loc_var.value,
Mode::EQ,