encounter
/
decomp-toolkit
mirror of https://github.com/encounter/decomp-toolkit.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Clippy fixes

This commit is contained in:
Luke Street 2023-08-15 22:47:35 -04:00
parent 23a156a6d5
commit 933edcfb19
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/cmd/dol.rs
View File

@ -241,9 +241,7 @@ fn apply_selfile(obj: &mut ObjInfo, selfile: &Path) -> Result<()> {
demangled_name: symbol.demangled_name.clone(), demangled_name: symbol.demangled_name.clone(),
address: address as u64, address: address as u64,
section, section,
flags: ObjSymbolFlagSet( flags: ObjSymbolFlagSet(ObjSymbolFlags::Global | ObjSymbolFlags::ForceActive),
(ObjSymbolFlags::Global | ObjSymbolFlags::ForceActive).into(),
),
..*symbol ..*symbol
}, },
false, false,
@ -267,8 +265,8 @@ fn info(args: InfoArgs) -> Result<()> {
apply_signatures_post(&mut obj)?; apply_signatures_post(&mut obj)?;
if let Some(selfile) = args.selfile { if let Some(selfile) = &args.selfile {
apply_selfile(&mut obj, &selfile)?; apply_selfile(&mut obj, selfile)?;
} }
println!("{}:", obj.name); println!("{}:", obj.name);
@ -437,7 +435,7 @@ fn split(args: SplitArgs) -> Result<()> {
if let Some(hash) = &config.selfile_hash { if let Some(hash) = &config.selfile_hash {
verify_hash(selfile, hash)?; verify_hash(selfile, hash)?;
} }
apply_selfile(&mut obj, &selfile)?; apply_selfile(&mut obj, selfile)?;
} }
log::info!("Performing relocation analysis"); log::info!("Performing relocation analysis");

1
src/util/asm.rs
View File

@ -427,6 +427,7 @@ fn write_data<W: Write>(
break; break;
} }
if let Some((&sym_addr, vec)) = entry { if let Some((&sym_addr, vec)) = entry {
#[allow(clippy::comparison_chain)]
if current_address == sym_addr { if current_address == sym_addr {
for entry in vec { for entry in vec {
if entry.kind == SymbolEntryKind::End && begin { if entry.kind == SymbolEntryKind::End && begin {