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

bring storage subs into solve again

Browse source
This commit is contained in:
Folkert 2022-03-11 10:28:10 +01:00
parent 78f5526db3
commit 973e3ac7ed
No known key found for this signature in database
GPG key ID: 1F17F6FFD112B97C
2 changed files with 34 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -11,7 +11,7 @@ use roc_can::module::{canonicalize_module_defs, Module};
use roc_collections::all::{default_hasher, BumpMap, MutMap, MutSet};
use roc_constrain::module::{
constrain_imports, constrain_module, pre_constrain_imports, ConstrainableImports,
ExposedModuleTypes, Import, SubsByModule,
ExposedModuleTypes, HackyImport, Import, SubsByModule,
};
use roc_module::ident::{Ident, ModuleName, QualifiedModuleName};
use roc_module::symbol::{
@ -730,6 +730,7 @@ enum BuildTask<'a> {
module: Module,
ident_ids: IdentIds,
imported_symbols: Vec<Import>,
imported_storage_subs: Vec<HackyImport>,
module_timing: ModuleTiming,
constraints: Constraints,
constraint: ConstraintSoa,
@ -3052,8 +3053,9 @@ impl<'a> BuildTask<'a> {
// (which would be more expensive for the main thread).
let ConstrainableImports {
imported_symbols,
imported_aliases: _,
imported_aliases: _, // TODO well then... do we even need those?
unused_imports,
hacky_symbols,
} = pre_constrain_imports(
home,
&module.references,
@ -3067,6 +3069,7 @@ impl<'a> BuildTask<'a> {
module,
ident_ids,
imported_symbols,
imported_storage_subs: hacky_symbols,
constraints,
constraint,
var_store,
@ -3084,6 +3087,7 @@ fn run_solve<'a>(
ident_ids: IdentIds,
mut module_timing: ModuleTiming,
imported_symbols: Vec<Import>,
imported_storage_subs: Vec<HackyImport>,
mut constraints: Constraints,
constraint: ConstraintSoa,
mut var_store: VarStore,
@ -3770,6 +3774,7 @@ fn run_task<'a>(
module,
module_timing,
imported_symbols,
imported_storage_subs,
constraints,
constraint,
var_store,
@ -3782,6 +3787,7 @@ fn run_task<'a>(
ident_ids,
module_timing,
imported_symbols,
imported_storage_subs,
constraints,
constraint,
var_store,