Merge pull request #824 from dtolnay-contrib/versionmeta

Author: shepmaster

top-crates/Cargo.lock

@@ -12,6 +12,7 @@ repository = "https://github.com/integer32llc/rust-playground"
 cargo = "0.62.0"
 itertools = "0.10.0"
 reqwest = { version = "0.11.0", features = ["blocking"] }
+semver = { version = "1.0.11", features = ["serde"] }
 serde = "1.0.1"
 serde_derive = "1.0.1"
 serde_json = "1.0.0"

top-crates/Cargo.toml

@@ -13,6 +13,7 @@ use cargo::{
     util::{Config, VersionExt},
 };
 use itertools::Itertools;
+use semver::Version;
 use serde::{Deserialize, Serialize};
 use std::{
     collections::{BTreeMap, BTreeSet, HashSet},
@@ -39,7 +40,7 @@ struct Crate {
 #[derive(Debug, Serialize)]
 pub struct CrateInformation {
     pub name: String,
-    pub version: String,
+    pub version: Version,
     pub id: String,
 }
 
@@ -58,18 +59,25 @@ pub struct DependencySpec {
     #[serde(skip_serializing_if = "String::is_empty")]
     pub package: String,
     #[serde(serialize_with = "exact_version")]
-    pub version: String,
+    pub version: Version,
     #[serde(skip_serializing_if = "Vec::is_empty")]
     pub features: Vec<String>,
     #[serde(skip_serializing_if = "is_true")]
     pub default_features: bool,
 }
 
-fn exact_version<S>(version: &String, serializer: S) -> Result<S::Ok, S::Error>
+fn exact_version<S>(version: &Version, serializer: S) -> Result<S::Ok, S::Error>
 where
     S: serde::Serializer,
 {
-    format!("={}", version).serialize(serializer)
+    semver::Comparator {
+        op: semver::Op::Exact,
+        major: version.major,
+        minor: Some(version.minor),
+        patch: Some(version.patch),
+        pre: version.pre.clone(),
+    }
+    .serialize(serializer)
 }
 
 fn is_true(b: &bool) -> bool {
@@ -385,15 +393,15 @@ pub fn generate_info(
                 exposed_name.clone(),
                 DependencySpec {
                     package: name.to_string(),
-                    version: version.to_string(),
+                    version: version.clone(),
                     features,
                     default_features,
                 },
             );
 
             infos.push(CrateInformation {
                 name: name.to_string(),
-                version: version.to_string(),
+                version: version.clone(),
                 id: exposed_name,
             });