diff --git a/crates/bindgen/src/load.rs b/crates/bindgen/src/load.rs index c66e2216d1..528d3ac17c 100644 --- a/crates/bindgen/src/load.rs +++ b/crates/bindgen/src/load.rs @@ -4,13 +4,13 @@ use roc_load::{LoadedModule, Threading}; use roc_reporting::report::RenderTarget; use roc_target::{Architecture, TargetInfo}; use std::io; -use std::path::{Path, PathBuf}; +use std::path::PathBuf; use strum::IntoEnumIterator; use target_lexicon::Triple; pub fn load_types( full_file_path: PathBuf, - dir: &Path, + dir: PathBuf, threading: Threading, ) -> Result, io::Error> { let target_info = (&Triple::host()).into(); diff --git a/crates/bindgen/tests/helpers/mod.rs b/crates/bindgen/tests/helpers/mod.rs index 410d3eac90..d1cf822fb8 100644 --- a/crates/bindgen/tests/helpers/mod.rs +++ b/crates/bindgen/tests/helpers/mod.rs @@ -33,7 +33,7 @@ pub fn generate_bindings(decl_src: &str) -> String { let mut file = File::create(file_path).unwrap(); writeln!(file, "{}", &src).unwrap(); - let result = load_types(full_file_path, dir.path(), Threading::Single); + let result = load_types(full_file_path, dir.path().to_path_buf(), Threading::Single); dir.close().expect("Unable to close tempdir"); diff --git a/crates/compiler/load/src/lib.rs b/crates/compiler/load/src/lib.rs index cbc256b51e..cee9864eac 100644 --- a/crates/compiler/load/src/lib.rs +++ b/crates/compiler/load/src/lib.rs @@ -89,15 +89,15 @@ pub fn load_and_monomorphize_from_str<'a>( } } -pub fn load_and_monomorphize<'a>( - arena: &'a Bump, +pub fn load_and_monomorphize( + arena: &Bump, filename: PathBuf, src_dir: PathBuf, exposed_types: ExposedByModule, target_info: TargetInfo, render: RenderTarget, threading: Threading, -) -> Result, LoadingProblem<'a>> { +) -> Result, LoadingProblem<'_>> { use LoadResult::*; let load_start = LoadStart::from_path(arena, src_dir, filename, render)?; @@ -116,15 +116,15 @@ pub fn load_and_monomorphize<'a>( } } -pub fn load_and_typecheck<'a>( - arena: &'a Bump, +pub fn load_and_typecheck( + arena: &Bump, filename: PathBuf, src_dir: PathBuf, exposed_types: ExposedByModule, target_info: TargetInfo, render: RenderTarget, threading: Threading, -) -> Result> { +) -> Result> { use LoadResult::*; let load_start = LoadStart::from_path(arena, src_dir, filename, render)?; diff --git a/crates/compiler/load_internal/tests/test_load.rs b/crates/compiler/load_internal/tests/test_load.rs index 35909a02f4..ac15c4ae41 100644 --- a/crates/compiler/load_internal/tests/test_load.rs +++ b/crates/compiler/load_internal/tests/test_load.rs @@ -30,23 +30,22 @@ use roc_target::TargetInfo; use roc_types::pretty_print::name_and_print_var; use roc_types::pretty_print::DebugPrint; use std::collections::HashMap; -use std::path::{Path, PathBuf}; +use std::path::PathBuf; -fn load_and_typecheck<'a>( - arena: &'a Bump, +fn load_and_typecheck( + arena: &Bump, filename: PathBuf, - src_dir: &Path, + src_dir: PathBuf, exposed_types: ExposedByModule, target_info: TargetInfo, -) -> Result> { +) -> Result { use LoadResult::*; - let load_start = LoadStart::from_path(arena, filename, RenderTarget::Generic)?; + let load_start = LoadStart::from_path(arena, src_dir, filename, RenderTarget::Generic)?; match roc_load_internal::file::load( arena, load_start, - src_dir, exposed_types, Phase::SolveTypes, target_info, @@ -167,7 +166,7 @@ fn multiple_modules_help<'a>( load_and_typecheck( arena, full_file_path, - dir.path(), + dir.path().to_path_buf(), Default::default(), TARGET_INFO, ) @@ -184,13 +183,7 @@ fn load_fixture( let src_dir = fixtures_dir().join(dir_name); let filename = src_dir.join(format!("{}.roc", module_name)); let arena = Bump::new(); - let loaded = load_and_typecheck( - &arena, - filename, - src_dir.as_path(), - subs_by_module, - TARGET_INFO, - ); + let loaded = load_and_typecheck(&arena, filename, src_dir, subs_by_module, TARGET_INFO); let mut loaded_module = match loaded { Ok(x) => x, Err(roc_load_internal::file::LoadingProblem::FormattedReport(report)) => { @@ -346,13 +339,7 @@ fn interface_with_deps() { let src_dir = fixtures_dir().join("interface_with_deps"); let filename = src_dir.join("Primary.roc"); let arena = Bump::new(); - let loaded = load_and_typecheck( - &arena, - filename, - src_dir.as_path(), - subs_by_module, - TARGET_INFO, - ); + let loaded = load_and_typecheck(&arena, filename, src_dir, subs_by_module, TARGET_INFO); let mut loaded_module = loaded.expect("Test module failed to load"); let home = loaded_module.module_id; diff --git a/crates/compiler/solve/tests/solve_expr.rs b/crates/compiler/solve/tests/solve_expr.rs index 47568cf4e6..ffb5f7a1dc 100644 --- a/crates/compiler/solve/tests/solve_expr.rs +++ b/crates/compiler/solve/tests/solve_expr.rs @@ -98,7 +98,7 @@ mod solve_expr { arena, file_path, module_src, - dir.path(), + dir.path().to_path_buf(), exposed_types, roc_target::TargetInfo::default_x86_64(), roc_reporting::report::RenderTarget::Generic, @@ -6572,7 +6572,7 @@ mod solve_expr { A := {} id1 = \@A {} -> @A {} #^^^{-1} - + id2 = \@A {} -> id1 (@A {}) #^^^{-1} ^^^ @@ -6919,7 +6919,7 @@ mod solve_expr { Ok u -> [Pair u (List.drop inp 1)] _ -> [] - main = any + main = any "# ), "Parser U8", diff --git a/crates/compiler/test_derive/src/encoding.rs b/crates/compiler/test_derive/src/encoding.rs index 592673dac5..ed03d51ab1 100644 --- a/crates/compiler/test_derive/src/encoding.rs +++ b/crates/compiler/test_derive/src/encoding.rs @@ -234,7 +234,7 @@ where &arena, encode_path().file_name().unwrap().into(), source, - encode_path().parent().unwrap(), + encode_path().parent().unwrap().to_path_buf(), Default::default(), target_info, roc_reporting::report::RenderTarget::ColorTerminal, diff --git a/crates/compiler/test_gen/src/helpers/llvm.rs b/crates/compiler/test_gen/src/helpers/llvm.rs index 5f94857cdb..8fa04da09c 100644 --- a/crates/compiler/test_gen/src/helpers/llvm.rs +++ b/crates/compiler/test_gen/src/helpers/llvm.rs @@ -34,12 +34,12 @@ fn create_llvm_module<'a>( target: &Triple, opt_level: OptLevel, ) -> (&'static str, String, &'a Module<'a>) { - use std::path::{Path, PathBuf}; + use std::path::PathBuf; let target_info = roc_target::TargetInfo::from(target); let filename = PathBuf::from("Test.roc"); - let src_dir = Path::new("fake/test/path"); + let src_dir = PathBuf::from("fake/test/path"); let module_src; let temp; diff --git a/crates/compiler/test_mono/src/tests.rs b/crates/compiler/test_mono/src/tests.rs index b5d9d85804..2876d797a9 100644 --- a/crates/compiler/test_mono/src/tests.rs +++ b/crates/compiler/test_mono/src/tests.rs @@ -73,12 +73,12 @@ fn promote_expr_to_module(src: &str) -> String { fn compiles_to_ir(test_name: &str, src: &str) { use bumpalo::Bump; - use std::path::{Path, PathBuf}; + use std::path::PathBuf; let arena = &Bump::new(); let filename = PathBuf::from("Test.roc"); - let src_dir = Path::new("fake/test/path"); + let src_dir = PathBuf::from("fake/test/path"); let module_src; let temp; diff --git a/crates/reporting/tests/test_reporting.rs b/crates/reporting/tests/test_reporting.rs index df051983fd..bb8dca4f68 100644 --- a/crates/reporting/tests/test_reporting.rs +++ b/crates/reporting/tests/test_reporting.rs @@ -86,7 +86,7 @@ mod test_reporting { let result = roc_load::load_and_typecheck( arena, full_file_path, - dir.path(), + dir.path().to_path_buf(), exposed_types, roc_target::TargetInfo::default_x86_64(), RenderTarget::Generic,