language-servers/roc
1
0
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2025-09-26 13:29:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

stylistic improvements

Browse source
This commit is contained in:
Anton-4 2024-03-09 20:47:19 +01:00
parent 71b97572ae
commit 76c47c5d6f
No known key found for this signature in database
GPG key ID: 0971D718C0A9B937
6 changed files with 83 additions and 66 deletions
Download patch file Download diff file Expand all files Collapse all files

10
crates/repl_expect/src/lib.rs
View file

@ -150,7 +150,7 @@ mod test {
let interns = loaded.interns.clone();
let (lib, expects_by_module, layout_interner) = expect_mono_module_to_dylib(
let (dy_lib, expects_by_module, layout_interner) = expect_mono_module_to_dylib(
arena,
target.clone(),
loaded,
@ -168,23 +168,23 @@ mod test {
let mut memory = crate::run::ExpectMemory::from_slice(&mut shared_buffer);
// communicate the mmapped name to zig/roc
let set_shared_buffer = run_roc_dylib!(lib, "set_shared_buffer", (*mut u8, usize), ());
let set_shared_buffer = run_roc_dylib!(dy_lib, "set_shared_buffer", (*mut u8, usize), ());
let mut result = RocCallResult::default();
unsafe { set_shared_buffer((shared_buffer.as_mut_ptr(), BUFFER_SIZE), &mut result) };
let mut writer = Vec::with_capacity(1024);
let global_layout_interner = layout_interner.into_global();
for (_, expects) in expects_by_module {
for (_, expect_funcs) in expects_by_module {
let (_failed, _passed) = crate::run::run_expects_with_memory(
&mut writer,
RenderTarget::ColorTerminal,
arena,
interns,
&global_layout_interner,
&lib,
&dy_lib,
&mut expectations,
expects,
expect_funcs,
&mut memory,
)
.unwrap();

9
crates/repl_expect/src/run.rs
View file

@ -691,7 +691,8 @@ pub fn expect_mono_module_to_dylib<'a>(
procedures,
);
let mut result_expects: MutMap<ModuleId, ExpectFunctions> = MutMap::default();
let mut modules_expects: MutMap<ModuleId, ExpectFunctions> = MutMap::default();
for (module_id, expects) in toplevel_expects.into_iter() {
let expect_names = expect_names.get(&module_id).unwrap();
@ -720,12 +721,12 @@ pub fn expect_mono_module_to_dylib<'a>(
env.arena,
);
let expects = ExpectFunctions {
let expect_funs = ExpectFunctions {
pure: expects_pure,
fx: expects_fx,
};
result_expects.insert(module_id, expects);
modules_expects.insert(module_id, expect_funs);
}
env.dibuilder.finalize();
@ -753,5 +754,5 @@ pub fn expect_mono_module_to_dylib<'a>(
}
llvm_module_to_dylib(env.module, &target, opt_level)
.map(|lib| (lib, result_expects, layout_interner))
.map(|dy_lib| (dy_lib, modules_expects, layout_interner))
}