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

Extract load_deps from load

Browse source
This commit is contained in:
Richard Feldman 2020-07-28 20:48:22 -04:00
parent 6dd6afbeac
commit 167d7eb719
1 changed files with 29 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -161,25 +161,14 @@ pub async fn load<'a>(
stdlib: &StdLib,
src_dir: PathBuf,
filename: PathBuf,
mut exposed_types: SubsByModule,
exposed_types: SubsByModule,
) -> Result<LoadedModule, LoadingProblem> {
use self::MaybeShared::*;
let mut type_problems = Vec::new();
let mut can_problems = Vec::new();
let env = Env {
src_dir: src_dir.clone(),
};
let (msg_tx, mut msg_rx): (MsgSender, MsgReceiver) = mpsc::channel(1024);
let (msg_tx, msg_rx): (MsgSender, MsgReceiver) = mpsc::channel(1024);
let mut module_ids = ModuleIds::default();
let mut root_exposed_ident_ids: IdentIdsByModule = IdentIds::exposed_builtins(0);
// This is the "final" list of IdentIds, after canonicalization and constraint gen
// have completed for a given module.
let mut constrained_ident_ids = IdentIds::exposed_builtins(0);
let mut headers_parsed = MutSet::default();
// Load the root module synchronously; we can't proceed until we have its id.
let root_id = load_filename(
filename,
@ -187,8 +176,35 @@ pub async fn load<'a>(
Unique(&mut module_ids, &mut root_exposed_ident_ids),
)?;
load_deps(root_id, msg_tx, msg_rx, stdlib, src_dir, module_ids, root_exposed_ident_ids, exposed_types).await
}
async fn load_deps<'a>(
root_id: ModuleId,
msg_tx: MsgSender,
mut msg_rx: MsgReceiver,
stdlib: &StdLib,
src_dir: PathBuf,
module_ids: ModuleIds,
root_exposed_ident_ids: IdentIdsByModule,
mut exposed_types: SubsByModule,
) -> Result<LoadedModule, LoadingProblem> {
use self::MaybeShared::*;
let mut type_problems = Vec::new();
let mut can_problems = Vec::new();
let mut headers_parsed = MutSet::default();
headers_parsed.insert(root_id);
let env = Env {
src_dir: src_dir.clone(),
};
// This is the "final" list of IdentIds, after canonicalization and constraint gen
// have completed for a given module.
let mut constrained_ident_ids = IdentIds::exposed_builtins(0);
// From now on, these will be used by multiple threads; time to make an Arc<Mutex<_>>!
let arc_modules = Arc::new(Mutex::new(module_ids));
let ident_ids_by_module: Arc<Mutex<IdentIdsByModule>> =