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

Update nested if to better structure

Browse source
This commit is contained in:
Brendan Hansknecht 2021-09-11 22:54:05 -07:00
parent f6ca8048da
commit 7df5af246e
1 changed files with 17 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

26
linker/src/lib.rs
View file

@ -1134,12 +1134,13 @@ pub fn surgery(matches: &ArgMatches) -> io::Result<i32> {
); );
} }
Some(*target_offset as i64) Some(*target_offset as i64)
} else if let Ok(sym) = app_obj.symbol_by_index(index) { } else {
// TODO: Is there a better way to deal with all this nesting in rust. app_obj
// I really want the experimental multiple if let statement. .symbol_by_index(index)
// Not one of the apps symbols, check if it is from the roc host. .and_then(|sym| sym.name())
if let Ok(name) = sym.name() { .ok()
if let Some(address) = md.roc_symbol_vaddresses.get(name) { .and_then(|name| {
md.roc_symbol_vaddresses.get(name).map(|address| {
let vaddr = (*address + md.added_byte_count) as i64; let vaddr = (*address + md.added_byte_count) as i64;
if verbose { if verbose {
println!( println!(
@ -1147,16 +1148,11 @@ pub fn surgery(matches: &ArgMatches) -> io::Result<i32> {
name, vaddr name, vaddr
); );
} }
Some(vaddr) vaddr
} else { })
None })
}
} else {
None
}
} else {
None
}; };
if let Some(target_offset) = target_offset { if let Some(target_offset) = target_offset {
let virt_base = section_virtual_offset as usize + rel.0 as usize; let virt_base = section_virtual_offset as usize + rel.0 as usize;
let base = section_offset as usize + rel.0 as usize; let base = section_offset as usize + rel.0 as usize;