Fix failure to parse real-world vswhere output

Cargo.toml

@@ -1,36 +1,33 @@
 [package]
 name = "vswhere"
-version = "0.1.0"
+version = "0.2.0"
 authors = ["FaultyRAM <explodingpsu@gmail.com>"]
 description = "Provides support for invoking and capturing the output of the vswhere utility."
 repository = "https://github.com/FaultyRAM/vswhere-rs"
 readme = "README.md"
 keywords = ["vs2017", "detection", "query"]
 categories = ["development-tools::build-utils"]
 license = "Apache-2.0 OR MIT"
+edition = "2018"
 
 [target.'cfg(target_os = "windows")'.dependencies.chrono]
 version = "0.4"
 features = ["serde"]
 
 [target.'cfg(target_os = "windows")'.dependencies.semver]
-version = "0.9"
+version = "0.10"
 features = ["serde"]
 
 [target.'cfg(target_os = "windows")'.dependencies.serde]
 version = "1"
-
-[target.'cfg(target_os = "windows")'.dependencies.serde_derive]
-version = "1"
+features = ["derive"]
 
 [target.'cfg(target_os = "windows")'.dependencies.serde_json]
 version = "1"
 
 [target.'cfg(target_os = "windows")'.dependencies.url]
-version = "1"
-
-[target.'cfg(target_os = "windows")'.dependencies.url_serde]
-version = "0.2"
+version = "2"
+features = ["serde"]
 
 [target.'cfg(target_os = "windows")'.dependencies.winapi]
 version = "0.3"

src/lib.rs

@@ -9,36 +9,6 @@
 //! Provides support for invoking and capturing the output of the vswhere utility.
 
 #![cfg(target_os = "windows")]
-#![forbid(warnings)]
-#![forbid(future_incompatible)]
-#![deny(unused)]
-#![forbid(box_pointers)]
-#![forbid(missing_copy_implementations)]
-#![forbid(missing_debug_implementations)]
-#![forbid(missing_docs)]
-#![forbid(trivial_casts)]
-#![forbid(trivial_numeric_casts)]
-#![forbid(unused_import_braces)]
-#![deny(unused_qualifications)]
-#![forbid(unused_results)]
-#![forbid(variant_size_differences)]
-#![cfg_attr(feature = "cargo-clippy", forbid(clippy))]
-#![cfg_attr(feature = "cargo-clippy", deny(clippy_pedantic))]
-#![cfg_attr(feature = "cargo-clippy", forbid(clippy_cargo))]
-#![cfg_attr(feature = "cargo-clippy", forbid(clippy_complexity))]
-#![cfg_attr(feature = "cargo-clippy", deny(clippy_correctness))]
-#![cfg_attr(feature = "cargo-clippy", deny(clippy_perf))]
-#![cfg_attr(feature = "cargo-clippy", forbid(clippy_style))]
-
-extern crate chrono;
-extern crate semver;
-extern crate serde;
-#[macro_use]
-extern crate serde_derive;
-extern crate serde_json;
-extern crate url;
-extern crate url_serde;
-extern crate winapi;
 
 use chrono::offset::Utc;
 use chrono::DateTime;
@@ -78,7 +48,6 @@ pub struct Config {
     latest: bool,
 }
 
-#[cfg_attr(feature = "cargo-clippy", allow(similar_names))]
 #[derive(Clone, Debug, Deserialize, Eq, PartialEq, Serialize)]
 #[serde(rename_all = "camelCase")]
 /// Information about a Visual Studio installation.
@@ -94,20 +63,16 @@ pub struct InstallInfo {
     display_name: String,
     description: String,
     channel_id: String,
-    channel_path: PathBuf,
-    #[serde(with = "url_serde")]
+    channel_path: Option<PathBuf>,
     channel_uri: Url,
     engine_path: PathBuf,
-    #[serde(with = "url_serde")]
     release_notes: Url,
-    #[serde(with = "url_serde")]
     third_party_notices: Url,
     update_date: DateTime<Utc>,
     catalog: InstallCatalog,
     properties: InstallProperties,
 }
 
-#[cfg_attr(feature = "cargo-clippy", allow(similar_names))]
 #[derive(Clone, Debug, Deserialize, Eq, PartialEq, Serialize)]
 #[serde(rename_all = "camelCase")]
 /// Catalog information for a Visual Studio installation.
@@ -128,7 +93,7 @@ pub struct InstallCatalog {
     product_name: String,
     product_patch_version: String,
     product_pre_release_milestone_suffix: String,
-    product_release: String,
+    product_release: Option<String>,
     product_semantic_version: Version,
     required_engine_version: FourPointVersion,
 }
@@ -171,7 +136,6 @@ fn deserialize_uppercase_bool<'de, D: Deserializer<'de>>(
     deserializer.deserialize_str(UppercaseBoolVisitor)
 }
 
-#[cfg_attr(feature = "cargo-clippy", allow(trivially_copy_pass_by_ref))]
 fn serialize_uppercase_bool<S: Serializer>(
     boolean: &bool,
     serializer: S,
@@ -518,8 +482,8 @@ impl InstallInfo {
 
     /// Returns the filesystem path to the catalog file for the release channel that a Visual
     /// Studio instance is associated with.
-    pub fn channel_path(&self) -> &Path {
-        &self.channel_path
+    pub fn channel_path(&self) -> Option<&Path> {
+        self.channel_path.as_deref()
     }
 
     /// Returns the URL from where release channel updates are fetched.
@@ -630,8 +594,8 @@ impl InstallCatalog {
     }
 
     /// {TODO}
-    pub fn product_release(&self) -> &str {
-        &self.product_release
+    pub fn product_release(&self) -> Option<&str> {
+        self.product_release.as_deref()
     }
 
     /// Returns the semver-compliant version number for a Visual Studio instance.
@@ -669,7 +633,7 @@ impl InstallProperties {
 
 #[cfg(test)]
 mod tests {
-    use {Config, FourPointVersion};
+    use crate::{Config, FourPointVersion, InstallInfo};
 
     #[test]
     fn test_default() {
@@ -709,4 +673,59 @@ mod tests {
             .run_default_path()
             .expect("failed");
     }
+
+    #[test]
+    fn test_real_world_json() {
+        const JSON: &str = r#"
+[
+  {
+    "instanceId": "a55eaca4",
+    "installDate": "2019-11-24T18:43:52Z",
+    "installationName": "VisualStudio/16.6.1+30128.74",
+    "installationPath": "C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\Community",
+    "installationVersion": "16.6.30128.74",
+    "productId": "Microsoft.VisualStudio.Product.Community",
+    "productPath": "C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\Community\\Common7\\IDE\\devenv.exe",
+    "state": 4294967295,
+    "isComplete": true,
+    "isLaunchable": true,
+    "isPrerelease": false,
+    "isRebootRequired": false,
+    "displayName": "Visual Studio Community 2019",
+    "description": "Мощная интегрированная среда разработки, бесплатная для студентов, участников проектов с открытым кодом и отдельных пользователей.",
+    "channelId": "VisualStudio.16.Release",
+    "channelUri": "https://aka.ms/vs/16/release/channel",
+    "enginePath": "C:\\Program Files (x86)\\Microsoft Visual Studio\\Installer\\resources\\app\\ServiceHub\\Services\\Microsoft.VisualStudio.Setup.Service",
+    "releaseNotes": "https://go.microsoft.com/fwlink/?LinkId=660893#16.6.1",
+    "thirdPartyNotices": "https://go.microsoft.com/fwlink/?LinkId=660909",
+    "updateDate": "2020-06-06T18:41:05.3535489Z",
+    "catalog": {
+      "buildBranch": "d16.6",
+      "buildVersion": "16.6.30128.74",
+      "id": "VisualStudio/16.6.1+30128.74",
+      "localBuild": "build-lab",
+      "manifestName": "VisualStudio",
+      "manifestType": "installer",
+      "productDisplayVersion": "16.6.1",
+      "productLine": "Dev16",
+      "productLineVersion": "2019",
+      "productMilestone": "RTW",
+      "productMilestoneIsPreRelease": "False",
+      "productName": "Visual Studio",
+      "productPatchVersion": "1",
+      "productPreReleaseMilestoneSuffix": "1.0",
+      "productSemanticVersion": "16.6.1+30128.74",
+      "requiredEngineVersion": "2.6.2109.55756"
+    },
+    "properties": {
+      "campaignId": "",
+      "channelManifestId": "VisualStudio.16.Release/16.6.1+30128.74",
+      "nickname": "",
+      "setupEngineFilePath": "C:\\Program Files (x86)\\Microsoft Visual Studio\\Installer\\vs_installershell.exe"
+    }
+  }
+]
+"#;
+        let _: Vec<InstallInfo> = serde_json::from_str(JSON).expect("failed");
+    }
 }