Added new metadata fields.

`cargo metadata` should now include all of the non-optional suggested fields in the API guidelines (see section C-METADATA.)

diff --git a/src/cargo/core/package.rs b/src/cargo/core/package.rs
index ded96734d065dcdc72816df098b05a7fbabc6d4e..39348facc1b01566b7754ab78b42266c6afb44f9 100644 (file)
--- a/src/cargo/core/package.rs
+++ b/src/cargo/core/package.rs
@@ -42,6 +42,11 @@ struct SerializedPackage<'a> {
     features: &'a FeatureMap,
     manifest_path: &'a str,
     metadata: Option<&'a toml::Value>,
+    authors: &'a [String],
+    categories: &'a [String],
+    keywords: &'a [String],
+    readme: Option<&'a str>,
+    repository: Option<&'a str>
 }
 
 impl ser::Serialize for Package {
@@ -55,6 +60,11 @@ impl ser::Serialize for Package {
         let license = manmeta.license.as_ref().map(String::as_ref);
         let license_file = manmeta.license_file.as_ref().map(String::as_ref);
         let description = manmeta.description.as_ref().map(String::as_ref);
+        let authors = manmeta.authors.as_ref();
+        let categories = manmeta.categories.as_ref();
+        let keywords = manmeta.keywords.as_ref();
+        let readme = manmeta.readme.as_ref().map(String::as_ref);
+        let repository = manmeta.repository.as_ref().map(String::as_ref);
 
         SerializedPackage {
             name: &*package_id.name(),
@@ -69,6 +79,11 @@ impl ser::Serialize for Package {
             features: summary.features(),
             manifest_path: &self.manifest_path.display().to_string(),
             metadata: self.manifest.custom_metadata(),
+            authors,
+            categories,
+            keywords,
+            readme,
+            repository,
         }.serialize(s)
     }
 }

diff --git a/tests/testsuite/metadata.rs b/tests/testsuite/metadata.rs
index 1eb1dd2e43a2b1fc754858035f9abbe1c322deed..0716df5854283bd5584fd1608ac212b4864d797c 100644 (file)
--- a/tests/testsuite/metadata.rs
+++ b/tests/testsuite/metadata.rs
@@ -16,14 +16,21 @@ fn cargo_metadata_simple() {
     {
         "packages": [
             {
+                "authors": [
+                    "wycats@example.com"
+                ],
+                "categories": [],
                 "name": "foo",
                 "version": "0.5.0",
                 "id": "foo[..]",
+                "keywords": [],
                 "source": null,
                 "dependencies": [],
                 "license": null,
                 "license_file": null,
                 "description": null,
+                "readme": null,
+                "repository": null,
                 "targets": [
                     {
                         "kind": [
@@ -100,9 +107,14 @@ crate-type = ["lib", "staticlib"]
     {
         "packages": [
             {
+                "authors": [],
+                "categories": [],
                 "name": "foo",
+                "readme": null,
+                "repository": null,
                 "version": "0.5.0",
                 "id": "foo[..]",
+                "keywords": [],
                 "source": null,
                 "dependencies": [],
                 "license": null,
@@ -172,9 +184,14 @@ optional_feat = []
     {
         "packages": [
             {
+                "authors": [],
+                "categories": [],
                 "name": "foo",
+                "readme": null,
+                "repository": null,
                 "version": "0.5.0",
                 "id": "foo[..]",
+                "keywords": [],
                 "source": null,
                 "dependencies": [],
                 "license": null,
@@ -260,11 +277,17 @@ fn cargo_metadata_with_deps_and_version() {
     {
         "packages": [
             {
+                "authors": [],
+                "categories": [],
                 "dependencies": [],
+                "description": null,
                 "features": {},
                 "id": "baz 0.0.1 (registry+[..])",
+                "keywords": [],
                 "manifest_path": "[..]Cargo.toml",
                 "name": "baz",
+                "readme": null,
+                "repository": null,
                 "source": "registry+[..]",
                 "license": null,
                 "license_file": null,
@@ -285,6 +308,8 @@ fn cargo_metadata_with_deps_and_version() {
                 "metadata": null
             },
             {
+                "authors": [],
+                "categories": [],
                 "dependencies": [
                     {
                         "features": [],
@@ -300,8 +325,11 @@ fn cargo_metadata_with_deps_and_version() {
                 ],
                 "features": {},
                 "id": "bar 0.0.1 (registry+[..])",
+                "keywords": [],
                 "manifest_path": "[..]Cargo.toml",
                 "name": "bar",
+                "readme": null,
+                "repository": null,
                 "source": "registry+[..]",
                 "license": null,
                 "license_file": null,
@@ -322,6 +350,8 @@ fn cargo_metadata_with_deps_and_version() {
                 "metadata": null
             },
             {
+                "authors": [],
+                "categories": [],
                 "dependencies": [
                     {
                         "features": [],
@@ -337,8 +367,11 @@ fn cargo_metadata_with_deps_and_version() {
                 ],
                 "features": {},
                 "id": "foo 0.5.0 (path+file:[..]foo)",
+                "keywords": [],
                 "manifest_path": "[..]Cargo.toml",
                 "name": "foo",
+                "readme": null,
+                "repository": null,
                 "source": null,
                 "license": "MIT",
                 "license_file": null,
@@ -417,9 +450,14 @@ name = "ex"
     {
         "packages": [
             {
+                "authors": [],
+                "categories": [],
                 "name": "foo",
+                "readme": null,
+                "repository": null,
                 "version": "0.1.0",
                 "id": "foo[..]",
+                "keywords": [],
                 "license": null,
                 "license_file": null,
                 "description": null,
@@ -491,9 +529,14 @@ crate-type = ["rlib", "dylib"]
     {
         "packages": [
             {
+                "authors": [],
+                "categories": [],
                 "name": "foo",
+                "readme": null,
+                "repository": null,
                 "version": "0.1.0",
                 "id": "foo[..]",
+                "keywords": [],
                 "license": null,
                 "license_file": null,
                 "description": null,
@@ -562,9 +605,16 @@ fn workspace_metadata() {
     {
         "packages": [
             {
+                "authors": [
+                    "wycats@example.com"
+                ],
+                "categories": [],
                 "name": "bar",
                 "version": "0.5.0",
                 "id": "bar[..]",
+                "readme": null,
+                "repository": null,
+                "keywords": [],
                 "source": null,
                 "dependencies": [],
                 "license": null,
@@ -583,9 +633,16 @@ fn workspace_metadata() {
                 "metadata": null
             },
             {
+                "authors": [
+                    "wycats@example.com"
+                ],
+                "categories": [],
                 "name": "baz",
+                "readme": null,
+                "repository": null,
                 "version": "0.5.0",
                 "id": "baz[..]",
+                "keywords": [],
                 "source": null,
                 "dependencies": [],
                 "license": null,
@@ -651,9 +708,16 @@ fn workspace_metadata_no_deps() {
     {
         "packages": [
             {
+                "authors": [
+                    "wycats@example.com"
+                ],
+                "categories": [],
                 "name": "bar",
+                "readme": null,
+                "repository": null,
                 "version": "0.5.0",
                 "id": "bar[..]",
+                "keywords": [],
                 "source": null,
                 "dependencies": [],
                 "license": null,
@@ -672,9 +736,16 @@ fn workspace_metadata_no_deps() {
                 "metadata": null
             },
             {
+                "authors": [
+                    "wycats@example.com"
+                ],
+                "categories": [],
                 "name": "baz",
+                "readme": null,
+                "repository": null,
                 "version": "0.5.0",
                 "id": "baz[..]",
+                "keywords": [],
                 "source": null,
                 "dependencies": [],
                 "license": null,
@@ -722,11 +793,16 @@ Caused by:
 const MANIFEST_OUTPUT: &str = r#"
 {
     "packages": [{
+        "authors": [
+            "wycats@example.com"
+        ],
+        "categories": [],
         "name":"foo",
         "version":"0.5.0",
         "id":"foo[..]0.5.0[..](path+file://[..]/foo)",
         "source":null,
         "dependencies":[],
+        "keywords": [],
         "license": null,
         "license_file": null,
         "description": null,
@@ -738,7 +814,9 @@ const MANIFEST_OUTPUT: &str = r#"
         }],
         "features":{},
         "manifest_path":"[..]Cargo.toml",
-        "metadata": null
+        "metadata": null,
+        "readme": null,
+        "repository": null
     }],
     "workspace_members": [ "foo 0.5.0 (path+file:[..]foo)" ],
     "resolve": null,
@@ -906,9 +984,14 @@ fn package_metadata() {
     {
         "packages": [
             {
+                "authors": [],
+                "categories": [],
                 "name": "foo",
+                "readme": null,
+                "repository": null,
                 "version": "0.1.0",
                 "id": "foo[..]",
+                "keywords": [],
                 "source": null,
                 "dependencies": [],
                 "license": null,

diff --git a/tests/testsuite/read_manifest.rs b/tests/testsuite/read_manifest.rs
index b033380416457ea27bf7a04bc125c05afe633b1e..b3d512d8e701a550d94ecae8bff2435695bdcc46 100644 (file)
--- a/tests/testsuite/read_manifest.rs
+++ b/tests/testsuite/read_manifest.rs
@@ -3,9 +3,16 @@ use hamcrest::assert_that;
 
 static MANIFEST_OUTPUT: &'static str = r#"
 {
+    "authors": [
+        "wycats@example.com"
+    ],
+    "categories": [],
     "name":"foo",
+    "readme": null,
+    "repository": null,
     "version":"0.5.0",
     "id":"foo[..]0.5.0[..](path+file://[..]/foo)",
+    "keywords": [],
     "license": null,
     "license_file": null,
     "description": null,