Auto merge of #8451 - ehuss:metadata-man, r=Eh2406

Update metadata man page. The man pages needed to be rebuilt after #8323.
rust-lang · Jul 5, 2020 · f236c35 · f236c35
2 parents fede83c + dec7872
commit f236c35
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 2 deletions.
diff --git a/src/doc/man/generated/cargo-metadata.html b/src/doc/man/generated/cargo-metadata.html
@@ -275,6 +275,15 @@ <h2 id="cargo_metadata_output_format">OUTPUT FORMAT</h2>
     "version": 1,
     /* The absolute path to the root of the workspace. */
     "workspace_root": "/path/to/my-package"
+    /* Workspace metadata.
+       This is null if no metadata is specified. */
+    "metadata": {
+        "docs": {
+            "rs": {
+                "all-features": true
+            }
+        }
+    }
 }</code></pre>
 </div>
 </div>

diff --git a/src/etc/man/cargo-metadata.1 b/src/etc/man/cargo-metadata.1
@@ -2,12 +2,12 @@
 .\"     Title: cargo-metadata
 .\"    Author: [see the "AUTHOR(S)" section]
 .\" Generator: Asciidoctor 2.0.10
-.\"      Date: 2020-02-24
+.\"      Date: 2020-07-04
 .\"    Manual: \ \&
 .\"    Source: \ \&
 .\"  Language: English
 .\"
-.TH "CARGO\-METADATA" "1" "2020-02-24" "\ \&" "\ \&"
+.TH "CARGO\-METADATA" "1" "2020-07-04" "\ \&" "\ \&"
 .ie \n(.g .ds Aq \(aq
 .el       .ds Aq '
 .ss \n[.ss] 0
@@ -289,6 +289,15 @@ The output has the following format:
     "version": 1,
     /* The absolute path to the root of the workspace. */
     "workspace_root": "/path/to/my\-package"
+    /* Workspace metadata.
+       This is null if no metadata is specified. */
+    "metadata": {
+        "docs": {
+            "rs": {
+                "all\-features": true
+            }
+        }
+    }
 }
 .fi
 .if n .RE