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

Extract finish()

Browse source
This commit is contained in:
Richard Feldman 2020-07-30 18:58:51 -04:00
parent 29b76965fe
commit f8590182f5
1 changed files with 33 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -413,7 +413,7 @@ fn load_deps<'a>(
exposed_vars_by_symbol,
src,
} => {
// We're done!
// We're done! There should be no more messages pending.
debug_assert!(msg_rx.is_empty());
// Shut down all the worker threads.
@ -423,30 +423,7 @@ fn load_deps<'a>(
.map_err(|_| LoadingProblem::MsgChannelDied)?;
}
state.type_problems.extend(problems);
let module_ids = Arc::try_unwrap(state.arc_modules)
.unwrap_or_else(|_| {
panic!("There were still outstanding Arc references to module_ids")
})
.into_inner()
.expect("Unwrapping mutex for module_ids");
let interns = Interns {
module_ids,
all_ident_ids: state.constrained_ident_ids,
};
return Ok(LoadedModule {
module_id: state.root_id,
interns,
solved,
can_problems: state.can_problems,
type_problems: state.type_problems,
declarations_by_id: state.declarations_by_id,
exposed_vars_by_symbol,
src: src.into(),
});
return Ok(finish(state, solved, problems, exposed_vars_by_symbol, src));
}
msg => {
// This is where most of the main thread's work gets done.
@ -826,6 +803,37 @@ fn update<'a>(
}
}
fn finish<'a>(
mut state: State<'a>,
solved: Solved<Subs>,
problems: Vec<solve::TypeError>,
exposed_vars_by_symbol: Vec<(Symbol, Variable)>,
src: &'a str,
) -> LoadedModule<'a> {
state.type_problems.extend(problems);
let module_ids = Arc::try_unwrap(state.arc_modules)
.unwrap_or_else(|_| panic!("There were still outstanding Arc references to module_ids"))
.into_inner()
.expect("Unwrapping mutex for module_ids");
let interns = Interns {
module_ids,
all_ident_ids: state.constrained_ident_ids,
};
LoadedModule {
module_id: state.root_id,
interns,
solved,
can_problems: state.can_problems,
type_problems: state.type_problems,
declarations_by_id: state.declarations_by_id,
exposed_vars_by_symbol,
src: src.into(),
}
}
/// Load a module by its module name, rather than by its filename
fn load_module<'a>(
arena: &'a Bump,