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

fix alias error incorrectly reported

Browse source
This commit is contained in:
Folkert 2021-02-16 17:07:33 +01:00
parent 1ef0d82c5c
commit a08485b0ee
2 changed files with 27 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

41
cli/src/build.rs
View file

@ -117,22 +117,24 @@ pub fn build_file<'a>(
report_timing(buf, "Generate LLVM IR", code_gen_timing.code_gen); report_timing(buf, "Generate LLVM IR", code_gen_timing.code_gen);
report_timing(buf, "Emit .o file", code_gen_timing.emit_o_file); report_timing(buf, "Emit .o file", code_gen_timing.emit_o_file);
println!(
"\n\nCompilation finished! Here's how long each module took to compile:\n\n{}",
buf
);
println!("\nSuccess! 🎉\n\n\t➡ {}\n", app_o_file.display());
let compilation_end = compilation_start.elapsed().unwrap(); let compilation_end = compilation_start.elapsed().unwrap();
let size = std::fs::metadata(&app_o_file).unwrap().len(); let size = std::fs::metadata(&app_o_file).unwrap().len();
println!( if emit_debug_info {
"Finished compilation and code gen in {} ms\n\nProduced a app.o file of size {:?}\n", println!(
compilation_end.as_millis(), "\n\nCompilation finished! Here's how long each module took to compile:\n\n{}",
size, buf
); );
println!("\nSuccess! 🎉\n\n\t➡ {}\n", app_o_file.display());
println!(
"Finished compilation and code gen in {} ms\n\nProduced a app.o file of size {:?}\n",
compilation_end.as_millis(),
size,
);
}
// Step 2: link the precompiled host and compiled app // Step 2: link the precompiled host and compiled app
let mut host_input_path = PathBuf::from(cwd); let mut host_input_path = PathBuf::from(cwd);
@ -144,10 +146,13 @@ pub fn build_file<'a>(
let rebuild_host_start = SystemTime::now(); let rebuild_host_start = SystemTime::now();
rebuild_host(host_input_path.as_path()); rebuild_host(host_input_path.as_path());
let rebuild_host_end = rebuild_host_start.elapsed().unwrap(); let rebuild_host_end = rebuild_host_start.elapsed().unwrap();
println!(
"Finished rebuilding the host in {} ms\n", if emit_debug_info {
rebuild_host_end.as_millis() println!(
); "Finished rebuilding the host in {} ms\n",
rebuild_host_end.as_millis()
);
}
// TODO try to move as much of this linking as possible to the precompiled // TODO try to move as much of this linking as possible to the precompiled
// host, to minimize the amount of host-application linking required. // host, to minimize the amount of host-application linking required.
@ -168,7 +173,9 @@ pub fn build_file<'a>(
}); });
let link_end = link_start.elapsed().unwrap(); let link_end = link_start.elapsed().unwrap();
println!("Finished linking in {} ms\n", link_end.as_millis()); if emit_debug_info {
println!("Finished linking in {} ms\n", link_end.as_millis());
}
// Clean up the leftover .o file from the Roc, if possible. // Clean up the leftover .o file from the Roc, if possible.
// (If cleaning it up fails, that's fine. No need to take action.) // (If cleaning it up fails, that's fine. No need to take action.)

4
compiler/unify/src/unify.rs
View file

@ -190,7 +190,9 @@ fn unify_alias(
problems.extend(unify_pool(subs, pool, *l_var, *r_var)); problems.extend(unify_pool(subs, pool, *l_var, *r_var));
} }
problems.extend(merge(subs, &ctx, other_content.clone())); if problems.is_empty() {
problems.extend(merge(subs, &ctx, other_content.clone()));
}
if problems.is_empty() { if problems.is_empty() {
problems.extend(unify_pool(subs, pool, real_var, *other_real_var)); problems.extend(unify_pool(subs, pool, real_var, *other_real_var));