Fix compile errors in wasm tests

This commit is contained in:
Brian Carroll 2022-11-15 09:40:55 +00:00
parent ddddb7d4f1
commit 04fcf89653
No known key found for this signature in database
GPG key ID: 5C7B2EC4101703C0
5 changed files with 6 additions and 3 deletions

1
Cargo.lock generated
View file

@ -4880,6 +4880,7 @@ dependencies = [
"roc_types", "roc_types",
"roc_unify", "roc_unify",
"roc_utils", "roc_utils",
"roc_wasm_module",
"target-lexicon", "target-lexicon",
"tempfile", "tempfile",
"wasi_libc_sys", "wasi_libc_sys",

View file

@ -39,6 +39,7 @@ roc_target = { path = "../roc_target" }
roc_error_macros = { path = "../../error_macros" } roc_error_macros = { path = "../../error_macros" }
roc_std = { path = "../../roc_std" } roc_std = { path = "../../roc_std" }
roc_debug_flags = {path="../debug_flags"} roc_debug_flags = {path="../debug_flags"}
roc_wasm_module = {path="../../wasm_module"}
bumpalo = { version = "3.11.0", features = ["collections"] } bumpalo = { version = "3.11.0", features = ["collections"] }
libc = "0.2.135" libc = "0.2.135"
inkwell = { path = "../../vendor/inkwell" } inkwell = { path = "../../vendor/inkwell" }

View file

@ -1,7 +1,8 @@
use roc_error_macros::internal_error; use roc_error_macros::internal_error;
use roc_gen_wasm::{round_up_to_alignment, wasm32_sized::Wasm32Sized}; use roc_gen_wasm::wasm32_sized::Wasm32Sized;
use roc_mono::layout::Builtin; use roc_mono::layout::Builtin;
use roc_std::{RocDec, RocList, RocOrder, RocResult, RocStr, I128, U128}; use roc_std::{RocDec, RocList, RocOrder, RocResult, RocStr, I128, U128};
use roc_wasm_module::round_up_to_alignment;
use std::convert::TryInto; use std::convert::TryInto;
pub trait FromWasm32Memory: Wasm32Sized { pub trait FromWasm32Memory: Wasm32Sized {

View file

@ -2,9 +2,9 @@ use super::RefCount;
use crate::helpers::from_wasm32_memory::FromWasm32Memory; use crate::helpers::from_wasm32_memory::FromWasm32Memory;
use roc_collections::all::MutSet; use roc_collections::all::MutSet;
use roc_gen_wasm::wasm32_result::Wasm32Result; use roc_gen_wasm::wasm32_result::Wasm32Result;
use roc_gen_wasm::wasm_module::{Export, ExportType};
use roc_gen_wasm::DEBUG_SETTINGS; use roc_gen_wasm::DEBUG_SETTINGS;
use roc_load::{ExecutionMode, LoadConfig, Threading}; use roc_load::{ExecutionMode, LoadConfig, Threading};
use roc_wasm_module::{Export, ExportType};
use std::marker::PhantomData; use std::marker::PhantomData;
use std::path::PathBuf; use std::path::PathBuf;
use std::rc::Rc; use std::rc::Rc;

View file

@ -7,7 +7,6 @@ use std::process::Command;
use roc_builtins::bitcode::IntWidth; use roc_builtins::bitcode::IntWidth;
use roc_collections::{MutMap, MutSet}; use roc_collections::{MutMap, MutSet};
use roc_gen_wasm::wasm_module::WasmModule;
use roc_module::ident::{ForeignSymbol, ModuleName}; use roc_module::ident::{ForeignSymbol, ModuleName};
use roc_module::low_level::LowLevel; use roc_module::low_level::LowLevel;
use roc_module::symbol::{ use roc_module::symbol::{
@ -19,6 +18,7 @@ use roc_mono::ir::{
UpdateModeId, UpdateModeId,
}; };
use roc_mono::layout::{Builtin, CapturesNiche, LambdaName, Layout, STLayoutInterner}; use roc_mono::layout::{Builtin, CapturesNiche, LambdaName, Layout, STLayoutInterner};
use roc_wasm_module::WasmModule;
use wasm3::{Environment, Module}; use wasm3::{Environment, Module};
const LINKING_TEST_HOST_WASM: &str = "build/wasm_linking_test_host.wasm"; const LINKING_TEST_HOST_WASM: &str = "build/wasm_linking_test_host.wasm";