mirror of
https://github.com/roc-lang/roc.git
synced 2025-09-26 13:29:12 +00:00
fix merge conflict
This commit is contained in:
parent
b9ebd4fa27
commit
c484df99ff
1 changed files with 10 additions and 3 deletions
|
@ -1036,9 +1036,16 @@ fn render_expect_failure<'a>(
|
|||
})
|
||||
.collect();
|
||||
|
||||
let expressions =
|
||||
roc_repl_expect::get_values(target_info, arena, subs, start, start_offset, &variables)
|
||||
.unwrap();
|
||||
let expressions = roc_repl_expect::get_values(
|
||||
target_info,
|
||||
arena,
|
||||
subs,
|
||||
interns,
|
||||
start,
|
||||
start_offset,
|
||||
&variables,
|
||||
)
|
||||
.unwrap();
|
||||
|
||||
use roc_fmt::annotation::Formattable;
|
||||
use roc_reporting::error::r#type::error_type_to_doc;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue