pkgforge
diff --git a/‎soar-cli/build.rs
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion b/‎soar-cli/build.rs
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/‎soar-cli/src/install.rs
Copy file name to clipboard
+11-6Lines changed: 11 additions & 6 deletions b/‎soar-cli/src/install.rs
Copy file name to clipboard
+11-6Lines changed: 11 additions & 6 deletions
diff --git a/‎soar-cli/src/list.rs
Copy file name to clipboard
+9-9Lines changed: 9 additions & 9 deletions b/‎soar-cli/src/list.rs
Copy file name to clipboard
+9-9Lines changed: 9 additions & 9 deletions
diff --git a/‎soar-cli/src/logging.rs
Copy file name to clipboard
+3-3Lines changed: 3 additions & 3 deletions b/‎soar-cli/src/logging.rs
Copy file name to clipboard
+3-3Lines changed: 3 additions & 3 deletions
diff --git a/‎soar-cli/src/progress.rs
Copy file name to clipboard
+2-2Lines changed: 2 additions & 2 deletions b/‎soar-cli/src/progress.rs
Copy file name to clipboard
+2-2Lines changed: 2 additions & 2 deletions
diff --git a/‎soar-cli/src/run.rs
Copy file name to clipboard
+2-2Lines changed: 2 additions & 2 deletions b/‎soar-cli/src/run.rs
Copy file name to clipboard
+2-2Lines changed: 2 additions & 2 deletions
diff --git a/‎soar-cli/src/state.rs
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion b/‎soar-cli/src/state.rs
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/‎soar-cli/src/update.rs
Copy file name to clipboard
+3-3Lines changed: 3 additions & 3 deletions b/‎soar-cli/src/update.rs
Copy file name to clipboard
+3-3Lines changed: 3 additions & 3 deletions
diff --git a/‎soar-cli/src/use.rs
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion b/‎soar-cli/src/use.rs
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/‎soar-cli/src/utils.rs
Copy file name to clipboard
+5-6Lines changed: 5 additions & 6 deletions b/‎soar-cli/src/utils.rs
Copy file name to clipboard
+5-6Lines changed: 5 additions & 6 deletions
@@ -16,6 +16,6 @@ fn main() {
             .to_string();
 
         println!("cargo:rerun-if-changed=build.rs");
-        println!("cargo:rustc-env=CARGO_PKG_VERSION=nightly-{}", commit_sha);
+        println!("cargo:rustc-env=CARGO_PKG_VERSION=nightly-{commit_sha}");
     }
 }
@@ -42,6 +42,11 @@ use crate::{
     },
 };
 
+// Represents an installed directory and its contents:
+// - The first element is the root installation path.
+// - The second element is a list of (file path, symlink target) pairs.
+type InstalledPath = (PathBuf, Vec<(PathBuf, PathBuf)>);
+
 #[derive(Clone)]
 pub struct InstallContext {
     pub multi_progress: Arc<MultiProgress>,
@@ -57,7 +62,7 @@ pub struct InstallContext {
     pub errors: Arc<Mutex<Vec<String>>>,
     pub retrying: Arc<AtomicU64>,
     pub failed: Arc<AtomicU64>,
-    pub installed_indices: Arc<Mutex<HashMap<usize, (PathBuf, Vec<(PathBuf, PathBuf)>)>>>,
+    pub installed_indices: Arc<Mutex<HashMap<usize, InstalledPath>>>,
     pub binary_only: bool,
 }
 
@@ -94,6 +99,7 @@ pub fn create_install_context(
     }
 }
 
+#[allow(clippy::too_many_arguments)]
 pub async fn install_packages(
     packages: &[String],
     force: bool,
@@ -293,7 +299,7 @@ pub async fn perform_installation(
     for handle in handles {
         handle
             .await
-            .map_err(|err| SoarError::Custom(format!("Join handle error: {}", err)))?;
+            .map_err(|err| SoarError::Custom(format!("Join handle error: {err}")))?;
     }
 
     ctx.total_progress_bar.finish_and_clear();
@@ -544,10 +550,9 @@ pub async fn install_single_package(
                         })?;
                         let mut stream_verifier =
                             pubkey.verify_stream(&signature).map_err(|err| {
-                                SoarError::Custom(format!(
-                                    "Failed to setup stream verifier: {}",
-                                    err
-                                ))
+                                SoarError::Custom(
+                                    format!("Failed to setup stream verifier: {err}",),
+                                )
                             })?;
 
                         let file = File::open(&original_file).with_context(|| {
 
@@ -185,7 +185,7 @@ pub async fn query_package(query: String) -> SoarResult<()> {
                         Colored(Yellow, &rank),
                         package
                             .download_count_week
-                            .map(|count| format!(" ({} weekly downloads)", count))
+                            .map(|count| format!(" ({count} weekly downloads)"))
                             .unwrap_or_default()
                     )
                 })
@@ -227,7 +227,7 @@ pub async fn query_package(query: String) -> SoarResult<()> {
                         .map(|homepage| format!("  - {}", Colored(Blue, homepage)))
                         .collect::<Vec<String>>()
                         .join("\n");
-                    format!("{}\n{}", key, values)
+                    format!("{key}\n{values}")
                 })
                 .unwrap_or_default(),
             package
@@ -240,7 +240,7 @@ pub async fn query_package(query: String) -> SoarResult<()> {
                         .map(|license| format!("  - {}", Colored(Blue, license)))
                         .collect::<Vec<String>>()
                         .join("\n");
-                    format!("{}\n{}", key, values)
+                    format!("{key}\n{values}")
                 })
                 .unwrap_or_default(),
             package
@@ -253,7 +253,7 @@ pub async fn query_package(query: String) -> SoarResult<()> {
                         .map(|maintainer| format!("  - {}", Colored(Blue, maintainer)))
                         .collect::<Vec<String>>()
                         .join("\n");
-                    format!("{}\n{}", key, values)
+                    format!("{key}\n{values}")
                 })
                 .unwrap_or_default(),
             package
@@ -266,7 +266,7 @@ pub async fn query_package(query: String) -> SoarResult<()> {
                         .map(|note| format!("  - {}", Colored(Blue, note)))
                         .collect::<Vec<String>>()
                         .join("\n");
-                    format!("{}\n{}", key, values)
+                    format!("{key}\n{values}")
                 })
                 .unwrap_or_default(),
             package
@@ -279,7 +279,7 @@ pub async fn query_package(query: String) -> SoarResult<()> {
                         .map(|snapshot| format!("  - {}", Colored(Blue, snapshot)))
                         .collect::<Vec<String>>()
                         .join("\n");
-                    format!("{}\n{}", key, values)
+                    format!("{key}\n{values}")
                 })
                 .unwrap_or_default(),
             package
@@ -292,7 +292,7 @@ pub async fn query_package(query: String) -> SoarResult<()> {
                         .map(|source| format!("  - {}", Colored(Blue, source)))
                         .collect::<Vec<String>>()
                         .join("\n");
-                    format!("{}\n{}", key, values)
+                    format!("{key}\n{values}")
                 })
                 .unwrap_or_default(),
             package
@@ -352,7 +352,7 @@ pub async fn query_package(query: String) -> SoarResult<()> {
                 .ghcr_pkg
                 .as_ref()
                 .map(|pkg| {
-                    let url = format!("https://{}", pkg);
+                    let url = format!("https://{pkg}");
                     format!(
                         "{}: {}",
                         Colored(Purple, "GHCR Package"),
@@ -605,7 +605,7 @@ pub async fn list_installed_packages(repo_name: Option<String>, count: bool) ->
         "Installed: {}{} ({})",
         installed_count,
         if installed_count != unique_count {
-            format!(", {} distinct", unique_count)
+            format!(", {unique_count} distinct")
         } else {
             String::new()
         },
 
@@ -19,7 +19,7 @@ struct MessageVisitor {
 impl tracing::field::Visit for MessageVisitor {
     fn record_debug(&mut self, field: &tracing::field::Field, value: &dyn std::fmt::Debug) {
         if field.name() == "message" {
-            self.message = Some(format!("{:?}", value));
+            self.message = Some(format!("{value:?}"));
         }
     }
 }
@@ -49,7 +49,7 @@ where
         }?;
 
         if let Some(message) = visitor.message {
-            writeln!(writer, "{}", message)
+            writeln!(writer, "{message}")
         } else {
             writeln!(writer)
         }
@@ -98,7 +98,7 @@ pub fn setup_logging(args: &Args) {
     };
 
     let builder = fmt::Subscriber::builder()
-        .with_env_filter(format!("soar={}", filter_level))
+        .with_env_filter(format!("soar={filter_level}"))
         .with_target(false)
         .with_thread_ids(false)
         .with_thread_names(false)
 
@@ -63,9 +63,9 @@ pub fn handle_install_progress(
             package.pkg_id
         );
         let prefix = if prefix.len() > fixed_width {
-            format!("{:.width$}", prefix, width = fixed_width)
+            format!("{prefix:.fixed_width$}")
         } else {
-            format!("{:<width$}", prefix, width = fixed_width)
+            format!("{prefix:<fixed_width$}")
         };
         pb.set_prefix(prefix);
 
 
@@ -34,8 +34,8 @@ pub async fn run_package(
 
     let query = PackageQuery::try_from(package_name.as_str())?;
     let package_name = &query.name.unwrap_or_else(|| package_name.to_string());
-    let repo_name = query.repo_name.as_deref().or_else(|| repo_name);
-    let pkg_id = query.pkg_id.as_deref().or_else(|| pkg_id);
+    let repo_name = query.repo_name.as_deref().or(repo_name);
+    let pkg_id = query.pkg_id.as_deref().or(pkg_id);
     let version = query.version.as_deref();
 
     let args = if command.len() > 1 {
 
@@ -64,7 +64,7 @@ impl AppState {
         for (task, repo) in tasks {
             match task
                 .await
-                .map_err(|err| SoarError::Custom(format!("Join handle error: {}", err)))?
+                .map_err(|err| SoarError::Custom(format!("Join handle error: {err}")))?
             {
                 Ok(Some(etag)) => {
                     self.validate_packages(repo, &etag).await?;
 
@@ -203,7 +203,7 @@ async fn perform_update(
     for handle in handles {
         handle
             .await
-            .map_err(|err| SoarError::Custom(format!("Join handle error: {}", err)))?;
+            .map_err(|err| SoarError::Custom(format!("Join handle error: {err}")))?;
     }
 
     ctx.total_progress_bar.finish_and_clear();
@@ -244,9 +244,9 @@ async fn spawn_update_task(
         target.package.pkg_id
     );
     let message = if message.len() > fixed_width {
-        format!("{:.width$}", message, width = fixed_width)
+        format!("{message:.fixed_width$}")
     } else {
-        format!("{:<width$}", message, width = fixed_width)
+        format!("{message:<fixed_width$}")
     };
     progress_bar.set_prefix(message);
 
 
@@ -117,7 +117,7 @@ pub async fn use_alternate_package(name: &str) -> SoarResult<()> {
         .load()?
         .items;
 
-    if pkg.iter().all(|p| has_desktop_integration(&p)) {
+    if pkg.iter().all(has_desktop_integration) {
         integrate_package(&install_dir, &selected_package, None, None, None, None).await?;
     }
 
 
@@ -29,7 +29,7 @@ use tracing::{error, info};
 pub static COLOR: LazyLock<RwLock<bool>> = LazyLock::new(|| RwLock::new(true));
 
 pub fn interactive_ask(ques: &str) -> SoarResult<String> {
-    print!("{}", ques);
+    print!("{ques}");
 
     std::io::stdout()
         .flush()
@@ -191,11 +191,10 @@ pub async fn mangle_package_symlinks(
             }
         };
 
-        let needs_original_symlink = match (provide.target.as_ref(), provide.strategy.clone()) {
-            (Some(_), Some(ProvideStrategy::KeepBoth)) => true,
-            (None, _) => true,
-            _ => false,
-        };
+        let needs_original_symlink = matches!(
+            (provide.target.as_ref(), provide.strategy.clone()),
+            (Some(_), Some(ProvideStrategy::KeepBoth)) | (None, _)
+        );
 
         if needs_original_symlink {
             let original_path = bin_dir.join(&provide.name);
Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,6 @@ fn main() {`
`16`	`16`	`.to_string();`
`17`	`17`
`18`	`18`	`println!("cargo:rerun-if-changed=build.rs");`
`19`		`- println!("cargo:rustc-env=CARGO_PKG_VERSION=nightly-{}", commit_sha);`
	`19`	`+ println!("cargo:rustc-env=CARGO_PKG_VERSION=nightly-{commit_sha}");`
`20`	`20`	`}`
`21`	`21`	`}`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ struct MessageVisitor {`
`19`	`19`	`impl tracing::field::Visit for MessageVisitor {`
`20`	`20`	`fn record_debug(&mut self, field: &tracing::field::Field, value: &dyn std::fmt::Debug) {`
`21`	`21`	`if field.name() == "message" {`
`22`		`- self.message = Some(format!("{:?}", value));`
	`22`	`+ self.message = Some(format!("{value:?}"));`
`23`	`23`	`}`
`24`	`24`	`}`
`25`	`25`	`}`
`@@ -49,7 +49,7 @@ where`
`49`	`49`	`}?;`
`50`	`50`
`51`	`51`	`if let Some(message) = visitor.message {`
`52`		`- writeln!(writer, "{}", message)`
	`52`	`+ writeln!(writer, "{message}")`
`53`	`53`	`} else {`
`54`	`54`	`writeln!(writer)`
`55`	`55`	`}`
`@@ -98,7 +98,7 @@ pub fn setup_logging(args: &Args) {`
`98`	`98`	`};`
`99`	`99`
`100`	`100`	`let builder = fmt::Subscriber::builder()`
`101`		`- .with_env_filter(format!("soar={}", filter_level))`
	`101`	`+ .with_env_filter(format!("soar={filter_level}"))`
`102`	`102`	`.with_target(false)`
`103`	`103`	`.with_thread_ids(false)`
`104`	`104`	`.with_thread_names(false)`
Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ impl AppState {`
`64`	`64`	`for (task, repo) in tasks {`
`65`	`65`	`match task`
`66`	`66`	`.await`
`67`		`- .map_err(\|err\| SoarError::Custom(format!("Join handle error: {}", err)))?`
	`67`	`+ .map_err(\|err\| SoarError::Custom(format!("Join handle error: {err}")))?`
`68`	`68`	`{`
`69`	`69`	`Ok(Some(etag)) => {`
`70`	`70`	`self.validate_packages(repo, &etag).await?;`
Original file line number	Diff line number	Diff line change
`@@ -117,7 +117,7 @@ pub async fn use_alternate_package(name: &str) -> SoarResult<()> {`
`117`	`117`	`.load()?`
`118`	`118`	`.items;`
`119`	`119`
`120`		`- if pkg.iter().all(\|p\| has_desktop_integration(&p)) {`
	`120`	`+ if pkg.iter().all(has_desktop_integration) {`
`121`	`121`	`integrate_package(&install_dir, &selected_package, None, None, None, None).await?;`
`122`	`122`	`}`
`123`	`123`