From 73cdd6c24309b3c473d2d93230f85fefc70bab64 Mon Sep 17 00:00:00 2001
From: Luke Street <luke@street.dev>
Date: Tue, 18 Nov 2025 22:39:37 -0700
Subject: [PATCH] clippy fixes

---
 src/util/config.rs | 10 ++--------
 src/util/split.rs  | 18 ++++++------------
 2 files changed, 8 insertions(+), 20 deletions(-)

diff --git a/src/util/config.rs b/src/util/config.rs
index 32a3df6..86a75bc 100644
--- a/src/util/config.rs
+++ b/src/util/config.rs
@@ -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) => {
diff --git a/src/util/split.rs b/src/util/split.rs
index a161acb..4c7b722 100644
--- a/src/util/split.rs
+++ b/src/util/split.rs
@@ -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!(