refactor(cargo): Do not require parsing the manifest

The generated metadata already contains the relenvant data from the manifest, so there is no need to also parse the manifest. Note that virtual workspaces [1] also were not supported before as `CargoManifest.pkg` was not nullable. [1]: https://doc.rust-lang.org/cargo/reference/workspaces.html#virtual-workspace Signed-off-by: Sebastian Schuberth <[email protected]>
oss-review-toolkit · Apr 4, 2024 · d2ee0a9 · d2ee0a9
1 parent 864ec86
commit d2ee0a9
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 56 deletions.
diff --git a/plugins/package-managers/cargo/src/main/kotlin/Cargo.kt b/plugins/package-managers/cargo/src/main/kotlin/Cargo.kt
@@ -164,10 +164,6 @@ class Cargo(
     }
 
     override fun resolveDependencies(definitionFile: File, labels: Map<String, String>): List<ProjectAnalyzerResult> {
-        // Get the project name and version. If one of them is missing return null, because this is a workspace
-        // definition file that does not contain a project.
-        val pkgDefinition = definitionFile.reader().use { toml.decodeFromNativeReader<CargoManifest>(it) }
-
         val workingDir = definitionFile.parentFile
         val metadataProcess = run(workingDir, "metadata", "--format-version=1")
         val metadata = json.decodeFromString<CargoMetadata>(metadataProcess.stdout)
@@ -178,8 +174,8 @@ class Cargo(
             { parsePackage(it, hashes) }
         )
 
-        val projectId = metadata.workspaceMembers.single {
-            it.startsWith("${pkgDefinition.pkg.name} ${pkgDefinition.pkg.version}")
+        val projectId = requireNotNull(metadata.resolve.root) {
+            "Virtual workspaces are not supported."
         }
 
         val projectNode = metadata.packages.single { it.id == projectId }
@@ -190,8 +186,7 @@ class Cargo(
 
             val transitiveDependencies = directDependencies
                 .mapNotNull { dependency ->
-                    val version =
-                        getResolvedVersion(pkgDefinition.pkg.name, pkgDefinition.pkg.version, dependency.name, metadata)
+                    val version = getResolvedVersion(projectNode.name, projectNode.version, dependency.name, metadata)
                     version?.let { Pair(dependency.name, it) }
                 }
                 .mapTo(mutableSetOf()) {
@@ -207,12 +202,10 @@ class Cargo(
             getTransitiveDependencies(groupedDependencies["build"], "build-dependencies")
         )
 
-        val projectPkg = packages.values.single { pkg ->
-            pkg.id.name == pkgDefinition.pkg.name && pkg.id.version == pkgDefinition.pkg.version
-        }.let { it.copy(id = it.id.copy(type = managerName)) }
+        val projectPkg = packages.getValue(projectId).let { it.copy(id = it.id.copy(type = managerName)) }
 
-        val homepageUrl = pkgDefinition.pkg.homepage.orEmpty()
-        val authors = pkgDefinition.pkg.authors.mapNotNullTo(mutableSetOf(), ::parseAuthorString)
+        val homepageUrl = projectNode.homepage.orEmpty()
+        val authors = projectNode.authors.mapNotNullTo(mutableSetOf(), ::parseAuthorString)
 
         val project = Project(
             id = projectPkg.id,

diff --git a/plugins/package-managers/cargo/src/main/kotlin/CargoManifest.kt b/plugins/package-managers/cargo/src/main/kotlin/CargoManifest.kt