refactor: refine rust codes (#453)

TEN-framework · Dec 23, 2024 · 1c7e278 · 1c7e278
1 parent 0336c73
commit 1c7e278
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 23 deletions.
diff --git a/core/src/ten_manager/src/cmd/cmd_install.rs b/core/src/ten_manager/src/cmd/cmd_install.rs
@@ -292,20 +292,12 @@ fn write_pkgs_into_lock(pkgs: &Vec<&PkgInfo>, app_dir: &Path) -> Result<()> {
 
 fn parse_pkg_name_version(
     pkg_name_version: &str,
-) -> Result<(String, String, VersionReq)> {
+) -> Result<(String, VersionReq)> {
     let parts: Vec<&str> = pkg_name_version.split('@').collect();
     if parts.len() == 2 {
-        Ok((
-            parts[0].to_string(),
-            parts[1].to_string(),
-            VersionReq::parse(parts[1])?,
-        ))
+        Ok((parts[0].to_string(), VersionReq::parse(parts[1])?))
     } else {
-        Ok((
-            pkg_name_version.to_string(),
-            VersionReq::STAR.to_string(),
-            VersionReq::STAR,
-        ))
+        Ok((pkg_name_version.to_string(), VersionReq::STAR))
     }
 }
 
@@ -540,11 +532,8 @@ pub async fn execute_cmd(
         // Case 1: tman install <package_type> <package_name>
 
         let desired_pkg_type_: PkgType = package_type_str.parse()?;
-        let (
-            desired_pkg_src_name_,
-            desired_pkg_src_version_str_,
-            desired_pkg_src_version_,
-        ) = parse_pkg_name_version(&command_data.package_name.unwrap())?;
+        let (desired_pkg_src_name_, desired_pkg_src_version_) =
+            parse_pkg_name_version(&command_data.package_name.unwrap())?;
 
         desired_pkg_type = Some(desired_pkg_type_);
         desired_pkg_src_name = Some(desired_pkg_src_name_.clone());
@@ -599,7 +588,6 @@ pub async fn execute_cmd(
                         name: desired_pkg_src_name_.clone(),
                     },
                     version_req: desired_pkg_src_version_.clone(),
-                    version_req_str: desired_pkg_src_version_str_,
                 },
             };
             extra_dependency_relationships.push(extra_dependency_relationship);

diff --git a/core/src/ten_manager/src/manifest_lock/mod.rs b/core/src/ten_manager/src/manifest_lock/mod.rs
@@ -280,7 +280,6 @@ impl<'a> From<&'a ManifestLockItem> for PkgInfo {
                                 name: dep.name,
                             },
                             version_req: VersionReq::STAR,
-                            version_req_str: VersionReq::STAR.to_string(),
                         })
                         .collect()
                 })

diff --git a/core/src/ten_manager/src/solver/introducer.rs b/core/src/ten_manager/src/solver/introducer.rs
@@ -69,7 +69,7 @@ pub fn extract_introducer_relations_from_raw_solver_results(
                     // The `version` declared in the `dependencies` section in
                     // manifest.json is always present.
                     requested_version_str =
-                        requested_dep_in_introducer.version_req_str.clone();
+                        requested_dep_in_introducer.version_req.to_string();
                 } else {
                     return Err(anyhow::anyhow!(
                         "Requested dependency [{}]{} not found in introducer, should not happen.", pkg_type_str, name
@@ -107,7 +107,7 @@ pub fn get_dependency_chain(
         )
         .unwrap();
     chain.push((
-        requested_dep_in_introducer.version_req_str.clone(),
+        requested_dep_in_introducer.version_req.to_string(),
         conflict_pkg_identity.clone(),
     ));
 

diff --git a/core/src/ten_rust/src/pkg_info/dependencies.rs b/core/src/ten_rust/src/pkg_info/dependencies.rs
@@ -24,7 +24,6 @@ pub struct PkgDependency {
     // The `version_req_str` is the original value in string form, while
     // `version_req` is the result after being converted to `VersionReq`.
     pub version_req: VersionReq,
-    pub version_req_str: String,
 }
 
 impl PkgDependency {
@@ -35,7 +34,6 @@ impl PkgDependency {
     ) -> Self {
         PkgDependency {
             type_and_name: PkgTypeAndName { pkg_type, name },
-            version_req_str: version_req.to_string(),
             version_req,
         }
     }
@@ -57,7 +55,6 @@ impl TryFrom<&ManifestDependency> for PkgDependency {
                 name: manifest_dep.name.clone(),
             },
             version_req: VersionReq::parse(&manifest_dep.version)?,
-            version_req_str: manifest_dep.version.clone(),
         })
     }
 }