From d78cd9f659dd6bf536fdb743c0ad6411a5a0deab Mon Sep 17 00:00:00 2001
From: Till Wegmueller <toasterson@gmail.com>
Date: Sat, 30 Aug 2025 23:26:17 +0200
Subject: [PATCH] Refactor `depend` module

- Simplified `split_dir_base` signature by removing unnecessary lifetime annotation.
- Refactored `compute_python_runpaths` to eliminate mutable variable and streamline `insert_default_runpath`.
---
 libips/src/depend/mod.rs | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/libips/src/depend/mod.rs b/libips/src/depend/mod.rs
index ca857da..0f5b1bd 100644
--- a/libips/src/depend/mod.rs
+++ b/libips/src/depend/mod.rs
@@ -490,7 +490,7 @@ fn normalize_bin_path(path: &str) -> String {
     }
 }
 
-fn split_dir_base<'a>(path: &'a str) -> (Option<&'a str>, &'a str) {
+fn split_dir_base(path: &str) -> (Option<&str>, &str) {
     if let Some(idx) = path.rfind('/') {
         if idx == 0 {
             return (Some("/"), &path[1..]);
@@ -539,7 +539,7 @@ fn infer_python_version_from_paths(installed_path: &str, shebang_path: Option<&s
 fn compute_python_runpaths(version: (u8, u8), opts: &GenerateOptions) -> Vec<String> {
     let (maj, min) = version;
     let base = format!("/usr/lib/python{}.{}", maj, min);
-    let mut defaults = vec![
+    let defaults = vec![
         base.clone(),
         format!("{}/vendor-packages", base),
         format!("{}/site-packages", base),
@@ -547,10 +547,7 @@ fn compute_python_runpaths(version: (u8, u8), opts: &GenerateOptions) -> Vec<Str
     ];
     if let Some(ref rp) = opts.runpath {
         let provided: Vec<String> = rp.split(':').map(|s| s.to_string()).collect();
-        match insert_default_runpath(&defaults, &provided) {
-            Ok(v) => v,
-            Err(_) => provided,
-        }
+        insert_default_runpath(&defaults, &provided).unwrap_or_else(|_| provided)
     } else {
         defaults
     }