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

Merge remote-tracking branch 'origin/main' into https-packages

Browse source
This commit is contained in:
Richard Feldman 2022-11-25 19:50:06 -05:00
commit b2beeb770e
No known key found for this signature in database
GPG key ID: F1F21AA5B1D9E43B
85 changed files with 2666 additions and 1064 deletions
Download patch file Download diff file Expand all files Collapse all files

11
crates/repl_expect/src/run.rs
View file

@ -235,7 +235,7 @@ fn run_expect_pure<'a, W: std::io::Write>(
let sequence = ExpectSequence::new(shared_memory.ptr.cast());
let result: Result<(), String> = try_run_jit_function!(lib, expect.name, (), |v: ()| v);
let result: Result<(), (String, _)> = try_run_jit_function!(lib, expect.name, (), |v: ()| v);
let shared_memory_ptr: *const u8 = shared_memory.ptr.cast();
@ -249,7 +249,7 @@ fn run_expect_pure<'a, W: std::io::Write>(
let renderer = Renderer::new(arena, interns, render_target, module_id, filename, &source);
if let Err(roc_panic_message) = result {
if let Err((roc_panic_message, _roc_panic_tag)) = result {
renderer.render_panic(writer, &roc_panic_message, expect.region)?;
} else {
let mut offset = ExpectSequence::START_OFFSET;
@ -305,9 +305,10 @@ fn run_expect_fx<'a, W: std::io::Write>(
child_memory.set_shared_buffer(lib);
let result: Result<(), String> = try_run_jit_function!(lib, expect.name, (), |v: ()| v);
let result: Result<(), (String, _)> =
try_run_jit_function!(lib, expect.name, (), |v: ()| v);
if let Err(msg) = result {
if let Err((msg, _)) = result {
panic!("roc panic {}", msg);
}
@ -499,7 +500,7 @@ fn render_dbg_failure<'a>(
let data = expectations.get_mut(&module_id).unwrap();
let current = match data.dbgs.get(&dbg_symbol) {
None => panic!("region {failure_region:?} not in list of expects"),
None => panic!("region {failure_region:?} not in list of dbgs"),
Some(current) => current,
};
let failure_region = current.region;