CloudNebulaProject/ips
1
0
Fork 0
mirror of https://codeberg.org/Toasterson/ips.git synced 2026-04-10 13:20:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Refactor depend module

Browse source 
- Simplified `split_dir_base` signature by removing unnecessary lifetime annotation.
- Refactored `compute_python_runpaths` to eliminate mutable variable and streamline `insert_default_runpath`.
This commit is contained in:
Till Wegmueller 2025-08-30 23:26:17 +02:00
parent 29ef35f350
commit d78cd9f659
No known key found for this signature in database
1 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
libips/src/depend/mod.rs
View file

@ -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 let Some(idx) = path.rfind('/') {
if idx == 0 { if idx == 0 {
return (Some("/"), &path[1..]); 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> { fn compute_python_runpaths(version: (u8, u8), opts: &GenerateOptions) -> Vec<String> {
let (maj, min) = version; let (maj, min) = version;
let base = format!("/usr/lib/python{}.{}", maj, min); let base = format!("/usr/lib/python{}.{}", maj, min);
let mut defaults = vec![ let defaults = vec![
base.clone(), base.clone(),
format!("{}/vendor-packages", base), format!("{}/vendor-packages", base),
format!("{}/site-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 { if let Some(ref rp) = opts.runpath {
let provided: Vec<String> = rp.split(':').map(|s| s.to_string()).collect(); let provided: Vec<String> = rp.split(':').map(|s| s.to_string()).collect();
match insert_default_runpath(&defaults, &provided) { insert_default_runpath(&defaults, &provided).unwrap_or_else(|_| provided)
Ok(v) => v,
Err(_) => provided,
}
} else { } else {
defaults defaults
} }