refactor: replace redundant clones with moves

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>

7 files changed, 22 insertions, 48 deletions

diff --git a/crates/shirabe/src/dependency_resolver/default_policy.rs b/crates/shirabe/src/dependency_resolver/default_policy.rs
index 24069466..d81c8621 100644
--- a/crates/shirabe/src/dependency_resolver/default_policy.rs
+++ b/crates/shirabe/src/dependency_resolver/default_policy.rs
@@ -99,7 +99,7 @@ impl DefaultPolicy {
 
     pub(crate) fn prune_to_best_version(&self, pool: &Pool, literals: Vec<i64>) -> Vec<i64> {
         if let Some(ref preferred_versions) = self.preferred_versions {
-            let name = pool.literal_to_package(literals[0]).get_name().to_string();
+            let name = pool.literal_to_package(literals[0]).get_name();
             if let Some(preferred_version) = preferred_versions.get(&name) {
                 let best_literals: Vec<i64> = literals
                     .iter()
@@ -174,8 +174,8 @@ impl DefaultPolicy {
 impl PolicyInterface for DefaultPolicy {
     fn version_compare(&self, a: BasePackageHandle, b: BasePackageHandle, operator: &str) -> bool {
         if self.prefer_stable {
-            let stab_a = a.get_stability().to_string();
-            let stab_b = b.get_stability().to_string();
+            let stab_a = a.get_stability();
+            let stab_b = b.get_stability();
             if stab_a != stab_b {
                 let (mut stab_a, mut stab_b) = (stab_a, stab_b);
                 if self.prefer_lowest
@@ -198,17 +198,15 @@ impl PolicyInterface for DefaultPolicy {
         if (a.is_dev() && a.get_version().starts_with("dev-"))
             || (b.is_dev() && b.get_version().starts_with("dev-"))
         {
-            let constraint =
-                SimpleConstraint::new(operator.to_string(), b.get_version().to_string(), None);
-            let version =
-                SimpleConstraint::new("==".to_string(), a.get_version().to_string(), None);
+            let constraint = SimpleConstraint::new(operator.to_string(), b.get_version(), None);
+            let version = SimpleConstraint::new("==".to_string(), a.get_version(), None);
             return constraint.match_specific(&version, true);
         }
 
         CompilingMatcher::r#match(
-            &SimpleConstraint::new(operator.to_string(), b.get_version().to_string(), None).into(),
+            &SimpleConstraint::new(operator.to_string(), b.get_version(), None).into(),
             SimpleConstraint::OP_EQ,
-            a.get_version().to_string(),
+            a.get_version(),
         )
     }
 
diff --git a/crates/shirabe/src/dependency_resolver/lock_transaction.rs b/crates/shirabe/src/dependency_resolver/lock_transaction.rs
index a9086983..a8253215 100644
--- a/crates/shirabe/src/dependency_resolver/lock_transaction.rs
+++ b/crates/shirabe/src/dependency_resolver/lock_transaction.rs
@@ -199,7 +199,7 @@ impl LockTransaction {
             return present_package.clone();
         }
 
-        package.clone()
+        package
     }
 
     pub fn get_aliases(
diff --git a/crates/shirabe/src/dependency_resolver/pool.rs b/crates/shirabe/src/dependency_resolver/pool.rs
index 1b072b47..adf42f54 100644
--- a/crates/shirabe/src/dependency_resolver/pool.rs
+++ b/crates/shirabe/src/dependency_resolver/pool.rs
@@ -321,7 +321,7 @@ impl Pool {
                 || CompilingMatcher::r#match(
                     constraint.unwrap(),
                     SimpleConstraint::OP_EQ,
-                    candidate_version.to_string(),
+                    candidate_version,
                 );
         }
 
diff --git a/crates/shirabe/src/dependency_resolver/pool_builder.rs b/crates/shirabe/src/dependency_resolver/pool_builder.rs
index 83307d8c..c56090f5 100644
--- a/crates/shirabe/src/dependency_resolver/pool_builder.rs
+++ b/crates/shirabe/src/dependency_resolver/pool_builder.rs
@@ -757,7 +757,7 @@ impl PoolBuilder {
                     if name_owned != package.get_name() {
                         format!("{} (via replace of {})", package.get_name(), name_owned)
                     } else {
-                        package.get_name().to_string()
+                        package.get_name()
                     }
                 },
                 &self.skipped_load[name],
diff --git a/crates/shirabe/src/dependency_resolver/pool_optimizer.rs b/crates/shirabe/src/dependency_resolver/pool_optimizer.rs
index f188d1b8..16013e34 100644
--- a/crates/shirabe/src/dependency_resolver/pool_optimizer.rs
+++ b/crates/shirabe/src/dependency_resolver/pool_optimizer.rs
@@ -605,7 +605,7 @@ impl PoolOptimizer {
                     let version_str = package_index
                         .get(require)
                         .and_then(|m| m.get(&id))
-                        .map(|p| p.get_version().to_string());
+                        .map(|p| p.get_version());
                     if let Some(version_str) = version_str
                         && !CompilingMatcher::r#match(
                             link_constraint,
diff --git a/crates/shirabe/src/dependency_resolver/problem.rs b/crates/shirabe/src/dependency_resolver/problem.rs
index a2072372..a944ff0c 100644
--- a/crates/shirabe/src/dependency_resolver/problem.rs
+++ b/crates/shirabe/src/dependency_resolver/problem.rs
@@ -634,12 +634,7 @@ impl Problem {
                     .iter()
                     .filter(|p| {
                         root_reqs[package_name].matches(
-                            &SimpleConstraint::new(
-                                "==".to_string(),
-                                p.get_version().to_string(),
-                                None,
-                            )
-                            .into(),
+                            &SimpleConstraint::new("==".to_string(), p.get_version(), None).into(),
                         )
                     })
                     .collect();
@@ -678,12 +673,8 @@ impl Problem {
                         .iter()
                         .filter(|p| {
                             temp_reqs[&name].matches(
-                                &SimpleConstraint::new(
-                                    "==".to_string(),
-                                    p.get_version().to_string(),
-                                    None,
-                                )
-                                .into(),
+                                &SimpleConstraint::new("==".to_string(), p.get_version(), None)
+                                    .into(),
                             )
                         })
                         .collect();
@@ -719,19 +710,14 @@ impl Problem {
             if let Some(ref lp) = locked_package {
                 let fixed_constraint = AnyConstraint::from(SimpleConstraint::new(
                     "==".to_string(),
-                    lp.get_version().to_string(),
+                    lp.get_version(),
                     None,
                 ));
                 let filtered: Vec<&BasePackageHandle> = packages
                     .iter()
                     .filter(|p| {
                         fixed_constraint.matches(
-                            &SimpleConstraint::new(
-                                "==".to_string(),
-                                p.get_version().to_string(),
-                                None,
-                            )
-                            .into(),
+                            &SimpleConstraint::new("==".to_string(), p.get_version(), None).into(),
                         )
                     })
                     .collect();
@@ -1080,7 +1066,7 @@ impl Problem {
             let entry = prepared
                 .entry(pkg_name.clone())
                 .or_insert_with(|| PreparedEntry {
-                    name: package.get_pretty_name().to_string(),
+                    name: package.get_pretty_name(),
                     versions: IndexMap::new(),
                 });
             entry.name = package.get_pretty_name().to_string();
@@ -1200,7 +1186,7 @@ impl Problem {
                 }
             }
 
-            let mut version: String = selected.get_pretty_version().to_string();
+            let mut version: String = selected.get_pretty_version();
             let extra = selected.get_extra();
             if selected.as_complete().is_some()
                 && extra.contains_key("config.platform")
diff --git a/crates/shirabe/src/dependency_resolver/rule.rs b/crates/shirabe/src/dependency_resolver/rule.rs
index e1572b0b..4ed8619c 100644
--- a/crates/shirabe/src/dependency_resolver/rule.rs
+++ b/crates/shirabe/src/dependency_resolver/rule.rs
@@ -146,7 +146,7 @@ impl Rule {
                 _ => None,
             },
             r if r == RULE_FIXED => match self.get_reason_data() {
-                ReasonData::Fixed { package } => Some(package.get_name().to_string()),
+                ReasonData::Fixed { package } => Some(package.get_name()),
                 _ => None,
             },
             r if r == RULE_PACKAGE_REQUIRES => match self.get_reason_data() {
@@ -216,12 +216,7 @@ impl Rule {
                             return true;
                         }
                         if !link.get_constraint().matches(
-                            &SimpleConstraint::new(
-                                "=".to_string(),
-                                p.get_version().to_string(),
-                                None,
-                            )
-                            .into(),
+                            &SimpleConstraint::new("=".to_string(), p.get_version(), None).into(),
                         ) {
                             return true;
                         }
@@ -256,12 +251,7 @@ impl Rule {
                             return true;
                         }
                         if !constraint.matches(
-                            &SimpleConstraint::new(
-                                "=".to_string(),
-                                p.get_version().to_string(),
-                                None,
-                            )
-                            .into(),
+                            &SimpleConstraint::new("=".to_string(), p.get_version(), None).into(),
                         ) {
                             return true;
                         }
@@ -475,7 +465,7 @@ impl Rule {
                     requires.push(pool.literal_to_package(*literal));
                 }
 
-                let text = link.get_pretty_string(source_package.clone());
+                let text = link.get_pretty_string(source_package);
                 if !requires.is_empty() {
                     format!(
                         "{} -> satisfiable by {}.",