Skip to content

Commit cf9c170

Browse files
Merge crate properties by path (#571)
## Usage and product changes When two library targets with the same crate name and path appear among the bazel rust targets, we assume them to refer to the same crate, but with different configuration (e.g., different set of enabled features). We were incorrectly using the properties file paths (unique per target) to merge the properties rather than the project paths. ## Motivation ## Implementation
1 parent 5c2d4dc commit cf9c170

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

tool/ide/RustManifestSyncer.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ class RustManifestSyncer : Callable<Unit> {
171171
private fun loadSyncProperties(bazelBin: File): List<TargetProperties> {
172172
return findSyncPropertiesFiles(bazelBin)
173173
.map { TargetProperties.fromPropertiesFile(it, workspaceRefs) }
174-
.groupBy { Pair(it.name, it.path) }.values
174+
.groupBy { Pair(it.name, it.cratePath) }.values
175175
.map { TargetProperties.mergeList(it) }
176176
.run { attachTestAndBuildProperties(this) }
177177
}

0 commit comments

Comments
 (0)