encounter/decomp-toolkit
1
0
Fork 0
mirror of https://github.com/encounter/decomp-toolkit.git synced 2025-12-12 14:46:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

clippy fixes

Browse Source
This commit is contained in:
Luke Street
2025-11-18 22:39:37 -07:00
parent 667346cbe0
commit 73cdd6c243
2 changed files with 8 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/util/config.rs
View File

@@ -641,10 +641,7 @@ pub fn apply_splits<R>(r: &mut R, obj: &mut ObjInfo) -> Result<()>
where R: BufRead + ?Sized {
let mut state = SplitState::None;
for result in r.lines() {
let line = match result {
Ok(line) => line,
Err(e) => return Err(e.into()),
};
let line = result?;
let split_line = parse_split_line(&line, &state)?;
match (&mut state, split_line) {
(
@@ -745,10 +742,7 @@ pub fn read_splits_sections(path: &Utf8NativePath) -> Result<Option<Vec<SectionD
let mut sections = Vec::new();
let mut state = SplitState::None;
for result in file.lines() {
let line = match result {
Ok(line) => line,
Err(e) => return Err(e.into()),
};
let line = result?;
let split_line = parse_split_line(&line, &state)?;
match (&mut state, split_line) {
(SplitState::None | SplitState::Unit(_), SplitLine::SectionsStart) => {

18
src/util/split.rs
View File

@@ -521,8 +521,7 @@ fn validate_splits(obj: &ObjInfo) -> Result<()> {
if let Some((_, symbol)) = obj
.symbols
.for_section_range(section_index, ..addr)
.filter(|&(_, s)| s.size_known && s.size > 0 && !s.flags.is_stripped())
.next_back()
.rfind(|&(_, s)| s.size_known && s.size > 0 && !s.flags.is_stripped())
{
ensure!(
addr >= symbol.address as u32 + symbol.size as u32,
@@ -540,8 +539,7 @@ fn validate_splits(obj: &ObjInfo) -> Result<()> {
if let Some((_, symbol)) = obj
.symbols
.for_section_range(section_index, ..split.end)
.filter(|&(_, s)| s.size_known && s.size > 0 && !s.flags.is_stripped())
.next_back()
.rfind(|&(_, s)| s.size_known && s.size > 0 && !s.flags.is_stripped())
{
ensure!(
split.end >= symbol.address as u32 + symbol.size as u32,
@@ -764,8 +762,7 @@ fn trim_split_alignment(obj: &mut ObjInfo) -> Result<()> {
if let Some((_, symbol)) = obj
.symbols
.for_section_range(section_index, addr..split.end)
.filter(|&(_, s)| s.size_known && s.size > 0 && !s.flags.is_stripped())
.next_back()
.rfind(|&(_, s)| s.size_known && s.size > 0 && !s.flags.is_stripped())
{
split_end = symbol.address as u32 + symbol.size as u32;
}
@@ -1439,16 +1436,13 @@ pub fn end_for_section(obj: &ObjInfo, section_index: SectionIndex) -> Result<Sec
section_end -= 4;
}
loop {
let last_symbol = obj
.symbols
.for_section_range(section_index, ..section_end)
.filter(|(_, s)| {
let last_symbol =
obj.symbols.for_section_range(section_index, ..section_end).rfind(|(_, s)| {
s.kind == ObjSymbolKind::Object
&& s.size_known
&& s.size > 0
&& !s.flags.is_stripped()
})
.next_back();
});
match last_symbol {
Some((_, symbol)) if is_linker_generated_object(&symbol.name) => {
log::debug!(