language-servers/roc
1
0
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2025-09-26 13:29:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Fix usages of panic

Browse source
This commit is contained in:
Ayaz Hafiz 2022-11-22 17:27:25 -06:00
parent 12d013c062
commit 291615072b
No known key found for this signature in database
GPG key ID: 0E2A37416A25EF58
2 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
crates/compiler/gen_llvm/src/run_roc.rs
View file

@ -119,7 +119,7 @@ macro_rules! run_jit_function {
$transform(success) $transform(success)
} }
Err(error_msg) => { Err((error_msg, _)) => {
eprintln!("This Roc code crashed with: \"{error_msg}\""); eprintln!("This Roc code crashed with: \"{error_msg}\"");
Expr::MalformedClosure Expr::MalformedClosure

9
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 sequence = ExpectSequence::new(shared_memory.ptr.cast());
let result: Result<(), String> = try_run_jit_function!(lib, expect.name, (), |v: ()| v); let result: Result<(), (String, u32)> = try_run_jit_function!(lib, expect.name, (), |v: ()| v);
let shared_memory_ptr: *const u8 = shared_memory.ptr.cast(); 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); 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)?; renderer.render_panic(writer, &roc_panic_message, expect.region)?;
} else { } else {
let mut offset = ExpectSequence::START_OFFSET; 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); child_memory.set_shared_buffer(lib);
let result: Result<(), String> = try_run_jit_function!(lib, expect.name, (), |v: ()| v); let result: Result<(), (String, u32)> =
try_run_jit_function!(lib, expect.name, (), |v: ()| v);
if let Err(msg) = result { if let Err((msg, _)) = result {
panic!("roc panic {}", msg); panic!("roc panic {}", msg);
} }