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

test cleanup

Browse source
This commit is contained in:
Folkert 2022-03-11 22:15:36 +01:00
parent 82e4ab67b3
commit 01b810266b
No known key found for this signature in database
GPG key ID: 1F17F6FFD112B97C
4 changed files with 19 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

32
compiler/load/tests/test_load.rs
View file

@ -18,7 +18,6 @@ mod test_load {
use bumpalo::Bump; use bumpalo::Bump;
use roc_can::def::Declaration::*; use roc_can::def::Declaration::*;
use roc_can::def::Def; use roc_can::def::Def;
use roc_collections::all::MutMap;
use roc_constrain::module::ExposedByModule; use roc_constrain::module::ExposedByModule;
use roc_load::file::LoadedModule; use roc_load::file::LoadedModule;
use roc_module::ident::ModuleName; use roc_module::ident::ModuleName;
@ -111,7 +110,6 @@ mod test_load {
let stdlib = roc_builtins::std::standard_stdlib(); let stdlib = roc_builtins::std::standard_stdlib();
let mut file_handles: Vec<_> = Vec::new(); let mut file_handles: Vec<_> = Vec::new();
let exposed_types = MutMap::default();
// create a temporary directory // create a temporary directory
let dir = tempdir()?; let dir = tempdir()?;
@ -146,7 +144,7 @@ mod test_load {
full_file_path, full_file_path,
arena.alloc(stdlib), arena.alloc(stdlib),
dir.path(), dir.path(),
exposed_types, Default::default(),
TARGET_INFO, TARGET_INFO,
) )
}; };
@ -325,7 +323,7 @@ mod test_load {
#[test] #[test]
fn interface_with_deps() { fn interface_with_deps() {
let subs_by_module = MutMap::default(); let subs_by_module = Default::default();
let src_dir = fixtures_dir().join("interface_with_deps"); let src_dir = fixtures_dir().join("interface_with_deps");
let filename = src_dir.join("Primary.roc"); let filename = src_dir.join("Primary.roc");
let arena = Bump::new(); let arena = Bump::new();
@ -373,7 +371,7 @@ mod test_load {
#[test] #[test]
fn load_unit() { fn load_unit() {
let subs_by_module = MutMap::default(); let subs_by_module = Default::default();
let loaded_module = load_fixture("no_deps", "Unit", subs_by_module); let loaded_module = load_fixture("no_deps", "Unit", subs_by_module);
expect_types( expect_types(
@ -386,7 +384,7 @@ mod test_load {
#[test] #[test]
fn import_alias() { fn import_alias() {
let subs_by_module = MutMap::default(); let subs_by_module = Default::default();
let loaded_module = load_fixture("interface_with_deps", "ImportAlias", subs_by_module); let loaded_module = load_fixture("interface_with_deps", "ImportAlias", subs_by_module);
expect_types( expect_types(
@ -399,7 +397,7 @@ mod test_load {
#[test] #[test]
fn load_and_typecheck() { fn load_and_typecheck() {
let subs_by_module = MutMap::default(); let subs_by_module = Default::default();
let loaded_module = load_fixture("interface_with_deps", "WithBuiltins", subs_by_module); let loaded_module = load_fixture("interface_with_deps", "WithBuiltins", subs_by_module);
expect_types( expect_types(
@ -419,7 +417,7 @@ mod test_load {
#[test] #[test]
fn iface_quicksort() { fn iface_quicksort() {
let subs_by_module = MutMap::default(); let subs_by_module = Default::default();
let loaded_module = load_fixture("interface_with_deps", "Quicksort", subs_by_module); let loaded_module = load_fixture("interface_with_deps", "Quicksort", subs_by_module);
expect_types( expect_types(
@ -435,7 +433,7 @@ mod test_load {
#[test] #[test]
fn quicksort_one_def() { fn quicksort_one_def() {
let subs_by_module = MutMap::default(); let subs_by_module = Default::default();
let loaded_module = load_fixture("app_with_deps", "QuicksortOneDef", subs_by_module); let loaded_module = load_fixture("app_with_deps", "QuicksortOneDef", subs_by_module);
expect_types( expect_types(
@ -448,7 +446,7 @@ mod test_load {
#[test] #[test]
fn app_quicksort() { fn app_quicksort() {
let subs_by_module = MutMap::default(); let subs_by_module = Default::default();
let loaded_module = load_fixture("app_with_deps", "Quicksort", subs_by_module); let loaded_module = load_fixture("app_with_deps", "Quicksort", subs_by_module);
expect_types( expect_types(
@ -464,7 +462,7 @@ mod test_load {
#[test] #[test]
fn load_astar() { fn load_astar() {
let subs_by_module = MutMap::default(); let subs_by_module = Default::default();
let loaded_module = load_fixture("interface_with_deps", "AStar", subs_by_module); let loaded_module = load_fixture("interface_with_deps", "AStar", subs_by_module);
expect_types( expect_types(
@ -482,7 +480,7 @@ mod test_load {
#[test] #[test]
fn load_principal_types() { fn load_principal_types() {
let subs_by_module = MutMap::default(); let subs_by_module = Default::default();
let loaded_module = load_fixture("no_deps", "Principal", subs_by_module); let loaded_module = load_fixture("no_deps", "Principal", subs_by_module);
expect_types( expect_types(
@ -496,7 +494,7 @@ mod test_load {
#[test] #[test]
fn iface_dep_types() { fn iface_dep_types() {
let subs_by_module = MutMap::default(); let subs_by_module = Default::default();
let loaded_module = load_fixture("interface_with_deps", "Primary", subs_by_module); let loaded_module = load_fixture("interface_with_deps", "Primary", subs_by_module);
expect_types( expect_types(
@ -518,7 +516,7 @@ mod test_load {
#[test] #[test]
fn app_dep_types() { fn app_dep_types() {
let subs_by_module = MutMap::default(); let subs_by_module = Default::default();
let loaded_module = load_fixture("app_with_deps", "Primary", subs_by_module); let loaded_module = load_fixture("app_with_deps", "Primary", subs_by_module);
expect_types( expect_types(
@ -540,7 +538,7 @@ mod test_load {
#[test] #[test]
fn imported_dep_regression() { fn imported_dep_regression() {
let subs_by_module = MutMap::default(); let subs_by_module = Default::default();
let loaded_module = load_fixture("interface_with_deps", "OneDep", subs_by_module); let loaded_module = load_fixture("interface_with_deps", "OneDep", subs_by_module);
expect_types( expect_types(
@ -590,7 +588,7 @@ mod test_load {
#[test] #[test]
#[should_panic(expected = "FILE NOT FOUND")] #[should_panic(expected = "FILE NOT FOUND")]
fn file_not_found() { fn file_not_found() {
let subs_by_module = MutMap::default(); let subs_by_module = Default::default();
let loaded_module = load_fixture("interface_with_deps", "invalid$name", subs_by_module); let loaded_module = load_fixture("interface_with_deps", "invalid$name", subs_by_module);
expect_types( expect_types(
@ -604,7 +602,7 @@ mod test_load {
#[test] #[test]
#[should_panic(expected = "FILE NOT FOUND")] #[should_panic(expected = "FILE NOT FOUND")]
fn imported_file_not_found() { fn imported_file_not_found() {
let subs_by_module = MutMap::default(); let subs_by_module = Default::default();
let loaded_module = load_fixture("no_deps", "MissingDep", subs_by_module); let loaded_module = load_fixture("no_deps", "MissingDep", subs_by_module);
expect_types( expect_types(

3
compiler/solve/tests/solve_expr.rs
View file

@ -10,7 +10,6 @@ mod helpers;
#[cfg(test)] #[cfg(test)]
mod solve_expr { mod solve_expr {
use crate::helpers::with_larger_debug_stack; use crate::helpers::with_larger_debug_stack;
use roc_collections::all::MutMap;
use roc_types::pretty_print::{content_to_string, name_all_type_vars}; use roc_types::pretty_print::{content_to_string, name_all_type_vars};
// HELPERS // HELPERS
@ -47,7 +46,7 @@ mod solve_expr {
module_src = &temp; module_src = &temp;
} }
let exposed_types = MutMap::default(); let exposed_types = Default::default();
let loaded = { let loaded = {
let dir = tempdir()?; let dir = tempdir()?;
let filename = PathBuf::from("Test.roc"); let filename = PathBuf::from("Test.roc");

5
compiler/test_gen/src/helpers/llvm.rs
View file

@ -3,7 +3,7 @@ use inkwell::module::Module;
use libloading::Library; use libloading::Library;
use roc_build::link::module_to_dylib; use roc_build::link::module_to_dylib;
use roc_build::program::FunctionIterator; use roc_build::program::FunctionIterator;
use roc_collections::all::{MutMap, MutSet}; use roc_collections::all::MutSet;
use roc_gen_llvm::llvm::externs::add_default_roc_externs; use roc_gen_llvm::llvm::externs::add_default_roc_externs;
use roc_mono::ir::OptLevel; use roc_mono::ir::OptLevel;
use roc_region::all::LineInfo; use roc_region::all::LineInfo;
@ -51,14 +51,13 @@ fn create_llvm_module<'a>(
module_src = &temp; module_src = &temp;
} }
let exposed_types = MutMap::default();
let loaded = roc_load::file::load_and_monomorphize_from_str( let loaded = roc_load::file::load_and_monomorphize_from_str(
arena, arena,
filename, filename,
module_src, module_src,
stdlib, stdlib,
src_dir, src_dir,
exposed_types, Default::default(),
target_info, target_info,
); );

4
compiler/test_mono/src/tests.rs
View file

@ -96,15 +96,13 @@ fn compiles_to_ir(test_name: &str, src: &str) {
module_src = &temp; module_src = &temp;
} }
let exposed_types = MutMap::default();
let loaded = roc_load::file::load_and_monomorphize_from_str( let loaded = roc_load::file::load_and_monomorphize_from_str(
arena, arena,
filename, filename,
module_src, module_src,
&stdlib, &stdlib,
src_dir, src_dir,
exposed_types, Default::default(),
TARGET_INFO, TARGET_INFO,
); );