From 99bd7bf03562dcc66027c59ed4f86cc4d2dcfcb0 Mon Sep 17 00:00:00 2001
From: Dmitry Shibanov <shibanov-1997@inbox.ru>
Date: Wed, 22 Jul 2020 13:17:15 +0300
Subject: [PATCH] Fix documentation for rust packages (#1236)

* fix documentation for rust

* remove output

* fix docs

* fix doc

Co-authored-by: Dmitry Shibanov <v-dmshib@microsoft.com>
---
 .../win/scripts/SoftwareReport/SoftwareReport.Common.psm1  | 2 +-
 .../scripts/SoftwareReport/SoftwareReport.Generator.ps1    | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.Common.psm1 b/images/win/scripts/SoftwareReport/SoftwareReport.Common.psm1
index 8e1560eef..2ca0b8e01 100644
--- a/images/win/scripts/SoftwareReport/SoftwareReport.Common.psm1
+++ b/images/win/scripts/SoftwareReport/SoftwareReport.Common.psm1
@@ -34,7 +34,7 @@ function Get-JavaVersionsList {
 
 function Get-RustVersion {
     $rustVersion = [regex]::matches($(rustc --version), "\d+\.\d+\.\d+").Value
-    return "Rust ${rustVersion}"
+    return $rustVersion
 }
 
 function Get-BindgenVersion {
diff --git a/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1 b/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1
index f922dcc4d..b0de49a54 100644
--- a/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1
+++ b/images/win/scripts/SoftwareReport/SoftwareReport.Generator.ps1
@@ -35,7 +35,6 @@ $markdown += New-MDHeader "Language and Runtime" -Level 3
 
 $markdown += New-MDList -Lines (Get-JavaVersionsList -DefaultVersion "1.8.0") -Style Unordered -NoNewLine
 $markdown += New-MDList -Style Unordered -Lines @(
-    (Get-RustVersion),
     (Get-PythonVersion),
     (Get-RubyVersion),
     (Get-GoVersion),
@@ -115,7 +114,11 @@ $markdown += New-MDList -Style Unordered -Lines @(
     (Get-GoogleCloudSDKVersion)
 )
 
-$markdown += New-MDHeader "Rust packages:" -Level 3
+$markdown += New-MDHeader "Rust Tools" -Level 3
+$markdown += New-MDList -Style Unordered -Lines @(
+    "Rust $(Get-RustVersion)"
+)
+$markdown += New-MDHeader "Packages" -Level 4
 $markdown += New-MDList -Style Unordered -Lines @(
     (Get-BindgenVersion),
     (Get-CbindgenVersion),