mirror of
https://github.com/roc-lang/roc.git
synced 2025-10-02 16:21:11 +00:00
Merge remote-tracking branch 'origin/main' into glue-getters-rtfeldman
This commit is contained in:
commit
d224992bc1
90 changed files with 4544 additions and 4425 deletions
|
@ -7,8 +7,8 @@ static BUILD_ONCE: std::sync::Once = std::sync::Once::new();
|
|||
|
||||
#[cfg(all(target_os = "linux"))]
|
||||
fn build_host() {
|
||||
use roc_build::link::preprocessed_host_filename;
|
||||
use roc_linker::{build_and_preprocess_host, ExposedSymbols};
|
||||
use roc_build::program::build_and_preprocess_host;
|
||||
use roc_linker::preprocessed_host_filename;
|
||||
|
||||
let platform_main_roc = std::env::current_dir()
|
||||
.unwrap()
|
||||
|
@ -47,7 +47,7 @@ fn valgrind_test(source: &str) {
|
|||
|
||||
#[cfg(target_os = "linux")]
|
||||
fn valgrind_test_linux(source: &str) {
|
||||
use roc_cli::build::BuiltFile;
|
||||
use roc_build::program::BuiltFile;
|
||||
|
||||
// the host is identical for all tests so we only want to build it once
|
||||
BUILD_ONCE.call_once(build_host);
|
||||
|
@ -83,7 +83,7 @@ fn valgrind_test_linux(source: &str) {
|
|||
|
||||
let arena = bumpalo::Bump::new();
|
||||
let assume_prebuilt = true;
|
||||
let res_binary_path = roc_cli::build::build_str_test(
|
||||
let res_binary_path = roc_build::program::build_str_test(
|
||||
&arena,
|
||||
&app_module_path,
|
||||
&app_module_source,
|
||||
|
@ -103,7 +103,7 @@ fn valgrind_test_linux(source: &str) {
|
|||
|
||||
run_with_valgrind(&binary_path);
|
||||
}
|
||||
Err(roc_cli::build::BuildFileError::LoadingProblem(
|
||||
Err(roc_build::program::BuildFileError::LoadingProblem(
|
||||
roc_load::LoadingProblem::FormattedReport(report),
|
||||
)) => {
|
||||
eprintln!("{}", report);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue