Add rust_metadata to SerializedPackage

flip1995 · flip1995 · commit 390af27128ed · 2021-10-12T14:07:19.000+02:00
After the rust_version field was stabilized in #9732 this adds the rust_version as output to the `cargo metadata` command, so tools like Clippy can read and use it as well.
diff --git a/src/cargo/core/package.rs b/src/cargo/core/package.rs
@@ -102,6 +102,7 @@ pub struct SerializedPackage {
     #[serde(skip_serializing_if = "Option::is_none")]
     metabuild: Option<Vec<String>>,
     default_run: Option<String>,
+    rust_version: Option<String>,
 }
 
 impl Package {
@@ -268,6 +269,7 @@ impl Package {
             metabuild: self.manifest().metabuild().cloned(),
             publish: self.publish().as_ref().cloned(),
             default_run: self.manifest().default_run().map(|s| s.to_owned()),
+            rust_version: self.rust_version().map(|s| s.to_owned()),
         }
     }
 }
diff --git a/src/doc/man/cargo-metadata.md b/src/doc/man/cargo-metadata.md
@@ -182,6 +182,8 @@ The output has the following format:
             ],
             /* Optional string that is the default binary picked by cargo run. */
             "default_run": null,
+            /* Optional string that is the minimum supported rust version */
+            "rust_version": "1.56",
             /* Array of keywords from the manifest. */
             "keywords": [
                 "cli"
diff --git a/src/doc/man/generated_txt/cargo-metadata.txt b/src/doc/man/generated_txt/cargo-metadata.txt
@@ -177,6 +177,8 @@ OUTPUT FORMAT
                        ],
                        /* Optional string that is the default binary picked by cargo run. */
                        "default_run": null,
+                       /* Optional string that is the minimum supported rust version */
+                       "rust_version": "1.56",
                        /* Array of keywords from the manifest. */
                        "keywords": [
                            "cli"
diff --git a/src/doc/src/commands/cargo-metadata.md b/src/doc/src/commands/cargo-metadata.md
@@ -182,6 +182,8 @@ The output has the following format:
             ],
             /* Optional string that is the default binary picked by cargo run. */
             "default_run": null,
+            /* Optional string that is the minimum supported rust version */
+            "rust_version": "1.56",
             /* Array of keywords from the manifest. */
             "keywords": [
                 "cli"
diff --git a/src/etc/man/cargo-metadata.1 b/src/etc/man/cargo-metadata.1
@@ -179,6 +179,8 @@ The output has the following format:
             ],
             /* Optional string that is the default binary picked by cargo run. */
             "default_run": null,
+            /* Optional string that is the minimum supported rust version */
+            "rust_version": "1.56",
             /* Array of keywords from the manifest. */
             "keywords": [
                 "cli"
diff --git a/tests/testsuite/alt_registry.rs b/tests/testsuite/alt_registry.rs
@@ -823,6 +823,7 @@ fn alt_reg_metadata() {
                         "keywords": [],
                         "readme": null,
                         "repository": null,
+                        "rust_version": null,
                         "homepage": null,
                         "documentation": null,
                         "edition": "2015",
@@ -880,6 +881,7 @@ fn alt_reg_metadata() {
                         "keywords": [],
                         "readme": null,
                         "repository": null,
+                        "rust_version": null,
                         "homepage": null,
                         "documentation": null,
                         "edition": "2015",
@@ -905,6 +907,7 @@ fn alt_reg_metadata() {
                         "keywords": [],
                         "readme": null,
                         "repository": null,
+                        "rust_version": null,
                         "homepage": null,
                         "documentation": null,
                         "edition": "2015",
@@ -930,6 +933,7 @@ fn alt_reg_metadata() {
                         "keywords": [],
                         "readme": null,
                         "repository": null,
+                        "rust_version": null,
                         "homepage": null,
                         "documentation": null,
                         "edition": "2015",
@@ -980,6 +984,7 @@ fn alt_reg_metadata() {
                         "keywords": [],
                         "readme": null,
                         "repository": null,
+                        "rust_version": null,
                         "homepage": null,
                         "documentation": null,
                         "edition": "2015",
@@ -1018,6 +1023,7 @@ fn alt_reg_metadata() {
                         "keywords": [],
                         "readme": null,
                         "repository": null,
+                        "rust_version": null,
                         "homepage": null,
                         "documentation": null,
                         "edition": "2015",
@@ -1115,6 +1121,7 @@ fn unknown_registry() {
                   "keywords": [],
                   "readme": null,
                   "repository": null,
+                  "rust_version": null,
                   "homepage": null,
                   "documentation": null,
                   "edition": "2015",
@@ -1140,6 +1147,7 @@ fn unknown_registry() {
                   "keywords": [],
                   "readme": null,
                   "repository": null,
+                  "rust_version": null,
                   "homepage": null,
                   "documentation": null,
                   "edition": "2015",
@@ -1178,6 +1186,7 @@ fn unknown_registry() {
                   "keywords": [],
                   "readme": null,
                   "repository": null,
+                  "rust_version": null,
                   "homepage": null,
                   "documentation": null,
                   "edition": "2015",
diff --git a/tests/testsuite/features_namespaced.rs b/tests/testsuite/features_namespaced.rs
@@ -715,6 +715,7 @@ fn json_exposed() {
                       "keywords": [],
                       "readme": null,
                       "repository": null,
+                      "rust_version": null,
                       "edition": "2015",
                       "links": null
                     }
diff --git a/tests/testsuite/git.rs b/tests/testsuite/git.rs
@@ -3147,6 +3147,7 @@ fn metadata_master_consistency() {
                   "keywords": [],
                   "readme": null,
                   "repository": null,
+                  "rust_version": null,
                   "homepage": null,
                   "documentation": null,
                   "edition": "2015",
@@ -3185,6 +3186,7 @@ fn metadata_master_consistency() {
                   "keywords": [],
                   "readme": null,
                   "repository": null,
+                  "rust_version": null,
                   "homepage": null,
                   "documentation": null,
                   "edition": "2015",
diff --git a/tests/testsuite/metadata.rs b/tests/testsuite/metadata.rs
diff --git a/tests/testsuite/read_manifest.rs b/tests/testsuite/read_manifest.rs
diff --git a/tests/testsuite/update.rs b/tests/testsuite/update.rs

Original file line number	Diff line number	Diff line change
`@@ -102,6 +102,7 @@ pub struct SerializedPackage {`
`102`	`102`	`#[serde(skip_serializing_if = "Option::is_none")]`
`103`	`103`	`metabuild: Option<Vec<String>>,`
`104`	`104`	`default_run: Option<String>,`
	`105`	`+ rust_version: Option<String>,`
`105`	`106`	`}`
`106`	`107`
`107`	`108`	`impl Package {`
`@@ -268,6 +269,7 @@ impl Package {`
`268`	`269`	`metabuild: self.manifest().metabuild().cloned(),`
`269`	`270`	`publish: self.publish().as_ref().cloned(),`
`270`	`271`	`default_run: self.manifest().default_run().map(\|s\| s.to_owned()),`
	`272`	`+ rust_version: self.rust_version().map(\|s\| s.to_owned()),`
`271`	`273`	`}`
`272`	`274`	`}`
`273`	`275`	`}`
Original file line number	Diff line number	Diff line change
`@@ -715,6 +715,7 @@ fn json_exposed() {`
`715`	`715`	`"keywords": [],`
`716`	`716`	`"readme": null,`
`717`	`717`	`"repository": null,`
	`718`	`+ "rust_version": null,`
`718`	`719`	`"edition": "2015",`
`719`	`720`	`"links": null`
`720`	`721`	`}`