language-servers/roc
1
0
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2025-10-02 16:21:11 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

clarify old constraint gen is now just for the builtins

Browse source
This commit is contained in:
Folkert 2022-03-11 19:25:42 +01:00
parent aebb3a162e
commit 30e7d94c95
No known key found for this signature in database
GPG key ID: 1F17F6FFD112B97C
6 changed files with 31 additions and 108 deletions
Download patch file Download diff file Expand all files Collapse all files

14
compiler/load/src/file.rs
View file

@ -10,8 +10,8 @@ use roc_can::def::Declaration;
use roc_can::module::{canonicalize_module_defs, Module};
use roc_collections::all::{default_hasher, BumpMap, MutMap, MutSet};
use roc_constrain::module::{
constrain_imports, constrain_imports2, constrain_module, pre_constrain_imports,
ConstrainableImports, ExposedModuleTypes, HackyImport, Import, SubsByModule,
constrain_imports, constrain_module, pre_constrain_imports, ConstrainableImports,
ExposedModuleTypes, HackyImport, Import, SubsByModule,
};
use roc_module::ident::{Ident, ModuleName, QualifiedModuleName};
use roc_module::symbol::{
@ -3111,7 +3111,7 @@ fn run_solve<'a>(
});
}
let (mut rigid_vars, mut def_types) = constrain_imports2(imported_symbols, &mut var_store);
let (mut rigid_vars, mut def_types) = constrain_imports(imported_symbols, &mut var_store);
let constrain_end = SystemTime::now();
@ -3129,8 +3129,6 @@ fn run_solve<'a>(
let mut subs = Subs::new_from_varstore(var_store);
println!("new variables starting at {:?}", subs.len());
let mut import_variables = Vec::new();
if NEW_TYPES {
@ -3159,13 +3157,11 @@ fn run_solve<'a>(
let actual_constraint =
constraints.let_import_constraint(rigid_vars, def_types, constraint, &import_variables);
dbg!(&subs);
dbg!(&import_variables);
let (solved_subs, solved_env, problems) =
roc_solve::module::run_solve(&constraints, actual_constraint, rigid_variables, subs);
dbg!(&solved_subs, &solved_env);
let exposed_vars_by_symbol: Vec<_> = solved_env
.vars_by_symbol()
.filter(|(k, _)| exposed_symbols.contains(k))