language-servers/roc
1
0
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2025-09-27 05:49:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Merge remote-tracking branch 'origin/trunk' into pretty-expect-output

Browse source
This commit is contained in:
Folkert 2022-07-15 09:12:04 +02:00
commit b9ebd4fa27
76 changed files with 2719 additions and 817 deletions
Download patch file Download diff file Expand all files Collapse all files

6
crates/compiler/load/src/lib.rs
View file

@ -92,7 +92,6 @@ pub fn load_and_monomorphize_from_str<'a>(
pub fn load_and_monomorphize(
arena: &Bump,
filename: PathBuf,
src_dir: PathBuf,
exposed_types: ExposedByModule,
target_info: TargetInfo,
render: RenderTarget,
@ -100,7 +99,7 @@ pub fn load_and_monomorphize(
) -> Result<MonomorphizedModule<'_>, LoadingProblem<'_>> {
use LoadResult::*;
let load_start = LoadStart::from_path(arena, src_dir, filename, render)?;
let load_start = LoadStart::from_path(arena, filename, render)?;
match load(
arena,
@ -119,7 +118,6 @@ pub fn load_and_monomorphize(
pub fn load_and_typecheck(
arena: &Bump,
filename: PathBuf,
src_dir: PathBuf,
exposed_types: ExposedByModule,
target_info: TargetInfo,
render: RenderTarget,
@ -127,7 +125,7 @@ pub fn load_and_typecheck(
) -> Result<LoadedModule, LoadingProblem<'_>> {
use LoadResult::*;
let load_start = LoadStart::from_path(arena, src_dir, filename, render)?;
let load_start = LoadStart::from_path(arena, filename, render)?;
match load(
arena,