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

cleanup

Browse source
This commit is contained in:
Folkert 2024-01-28 00:12:06 +01:00
parent bd0cb6338e
commit 4fe383eb43
No known key found for this signature in database
GPG key ID: 1F17F6FFD112B97C
1 changed files with 17 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

49
crates/glue/src/load.rs
View file

@ -220,7 +220,7 @@ fn call_roc_make_glue(
backend: CodeGenBackend, backend: CodeGenBackend,
roc_types: roc_std::RocList<roc_type::Types>, roc_types: roc_std::RocList<roc_type::Types>,
) -> roc_std::RocList<roc_type::File> { ) -> roc_std::RocList<roc_type::File> {
match backend { let roc_call_result = match backend {
CodeGenBackend::Assembly(_) => { CodeGenBackend::Assembly(_) => {
type MakeGlueReturnType = RocCallResult< type MakeGlueReturnType = RocCallResult<
roc_std::RocResult<roc_std::RocList<roc_type::File>, roc_std::RocStr>, roc_std::RocResult<roc_std::RocList<roc_type::File>, roc_std::RocStr>,
@ -235,24 +235,7 @@ fn call_roc_make_glue(
.unwrap_or_else(|_| panic!("Unable to load glue function")) .unwrap_or_else(|_| panic!("Unable to load glue function"))
}; };
let files = unsafe { make_glue(roc_types) }; unsafe { make_glue(roc_types) }
// Roc will free data passed into it. So forget that data.
// std::mem::forget(roc_types);
match Result::from(files) {
Err((msg, tag)) => match tag {
CrashTag::Roc => panic!(r#"Roc failed with message: "{msg}""#),
CrashTag::User => panic!(r#"User crash with message: "{msg}""#),
},
Ok(files_or_error) => match Result::from(files_or_error) {
Err(err) => {
eprintln!("Glue generation failed: {err}");
process::exit(1);
}
Ok(files) => files,
},
}
} }
CodeGenBackend::Llvm(_) => { CodeGenBackend::Llvm(_) => {
type MakeGlueReturnType = type MakeGlueReturnType =
@ -274,22 +257,24 @@ fn call_roc_make_glue(
// Roc will free data passed into it. So forget that data. // Roc will free data passed into it. So forget that data.
std::mem::forget(roc_types); std::mem::forget(roc_types);
match Result::from(files) { files
Err((msg, tag)) => match tag {
CrashTag::Roc => panic!(r#"Roc failed with message: "{msg}""#),
CrashTag::User => panic!(r#"User crash with message: "{msg}""#),
},
Ok(files_or_error) => match Result::from(files_or_error) {
Err(err) => {
eprintln!("Glue generation failed: {err}");
process::exit(1);
}
Ok(files) => files,
},
}
} }
CodeGenBackend::Wasm => todo!(), CodeGenBackend::Wasm => todo!(),
};
match Result::from(roc_call_result) {
Err((msg, tag)) => match tag {
CrashTag::Roc => panic!(r#"Roc failed with message: "{msg}""#),
CrashTag::User => panic!(r#"User crash with message: "{msg}""#),
},
Ok(files_or_error) => match Result::from(files_or_error) {
Err(err) => {
eprintln!("Glue generation failed: {err}");
process::exit(1);
}
Ok(files) => files,
},
} }
} }