Use .rust.json files

Author: hallipr

eng/scripts/Language-Settings.ps1

@@ -169,7 +169,7 @@ function Get-rust-PackageInfoFromPackageFile([IO.FileInfo]$pkg, [string]$working
 }
 
 function Find-rust-Artifacts-For-Apireview([string]$ArtifactPath, [string]$packageName) {
-  [array]$files = Get-ChildItem -Path $ArtifactPath -Recurse -Filter "$packageName`_rust.json"
+  [array]$files = Get-ChildItem -Path $ArtifactPath -Recurse -Filter "$packageName.rust.json"
 
   if (!$files) {
     Write-Host "$($packageName) does not have api review json"

eng/scripts/Pack-Crates.ps1

@@ -146,34 +146,14 @@ function Add-CrateToLocalRegistry($LocalRegistryPath, $Package) {
   '{"files":{}}' | Out-File -FilePath "$LocalRegistryPath/$packageName-$packageVersion/.cargo-checksum.json" -Encoding utf8
 }
 
-# For all dependencies with paths, but no versions, add the version from the path
-function Add-PathVersions($packages) {
-  # Install PSToml if it's not already installed
-  if (-not (PowerShellGet\Get-InstalledModule -Name PSToml -ErrorAction SilentlyContinue)) {
-    PowerShellGet\Install-Module -Name PSToml -Scope CurrentUser -Force
-  }
+function Create-ApiViewFile($package) {
+  $packageName = $package.name
+  $command = "cargo run --manifest-path $RepoRoot/eng/tools/generate_api_report/Cargo.toml -- --package $packageName"
+  Invoke-LoggedCommand $command -GroupOutput | Out-Host
 
-  foreach ($package in $packages) {
-    $dirty = $false
-    $toml = Get-Content -Path $Package.manifest_path -Raw | ConvertFrom-Toml
-
-    foreach ($name in $toml.dependencies.Keys) {
-      # we want to look at the dependency as it was resolved by `cargo metadata`
-      # this will resolve workspace depdencies, but retain their path/no-version state
-      $dependency = $package.dependencies | Where-Object -Property name -EQ -Value $name | Select-Object -First 1
-      # If the dependency is a path dependency, set the version to the version of the package in the workspace
-      if ($dependency.path -and !$dependency.version) {
-        $tomlDependency = $toml.dependencies.$name
-        $dependencyVersion = $packages | Where-Object -Property name -EQ -Value $name | Select-Object -ExpandProperty version -First 1
-
-        $tomlDependency.version = $dependencyVersion
-        $dirty = $true
-      }
-    }
-    if ($dirty) {
-      $toml | ConvertTo-Toml -Depth 10 | Set-Content -Path $Package.manifest_path -Encoding utf8
-    }
-  }
+  $packagePath = Split-Path -Path $package.manifest_path -Parent
+
+  "$packagePath/review/$packageName.rust.json"
 }
 
 Push-Location $RepoRoot
@@ -189,15 +169,6 @@ try {
     Write-Host "  $packageName ($type)"
   }
 
-  function Create-ApiViewFile($package) {
-    $command = "cargo run --manifest-path $RepoRoot/eng/tools/generate_api_report/Cargo.toml -- --package $($package.name)"
-    Invoke-LoggedCommand $command -GroupOutput | Out-Host
-  
-    $packagePath = Split-Path -Path $package.manifest_path -Parent
-  
-    "$packagePath/review/$($package.name)_rust.json"
-  }
-
   foreach ($package in $packages) {
     Write-Host ""
 
@@ -222,7 +193,7 @@ try {
       $sourcePath = "$RepoRoot/target/package/$packageName-$packageVersion"
       $targetPath = "$OutputPath/$packageName"
       $targetContentsPath = "$targetPath/contents"
-      $targetApiReviewFile = "$targetPath/$packageName`_rust.json"
+      $targetApiReviewFile = "$targetPath/$packageName.rust.json"
 
       if (Test-Path -Path $targetContentsPath) {
         Remove-Item -Path $targetContentsPath -Recurse -Force

eng/tools/generate_api_report/src/main.rs

@@ -121,7 +121,7 @@ fn main() -> Result<(), Box<dyn Error>> {
     }
 
     // Create the package_name.rust.json in the review/ folder
-    let output_path_str = review_folder_path.join(format!("{}_rust.json", package_name));
+    let output_path_str = review_folder_path.join(format!("{}.rust.json", package_name));
     let output_path = Path::new(&output_path_str);
     let mut output_file = File::create(output_path)?;
     serde_json::to_writer(&mut output_file, &root)?;