Auto merge of #6965 - ehuss:doc-metadata-doctest, r=alexcrichton

Document new `doctest` field. Added in #6953.
rust-lang · May 20, 2019 · cfc61f3 · cfc61f3
2 parents d0735fc + 3105b7d
commit cfc61f3
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 5 deletions.
diff --git a/src/doc/man/cargo-metadata.adoc b/src/doc/man/cargo-metadata.adoc
@@ -130,7 +130,11 @@ The output has the following format:
                     /* Array of required features.
                        This property is not included if no required features are set.
                     */
-                    "required-features": ["feat1"]
+                    "required-features": ["feat1"],
+                    /* Whether or not this target has doc tests enabled, and
+                       the target is compatible with doc testing.
+                    */
+                    "doctest": false
                 }
             ],
             /* Set of features defined for the package.

diff --git a/src/doc/man/generated/cargo-metadata.html b/src/doc/man/generated/cargo-metadata.html
@@ -137,7 +137,11 @@ <h2 id="cargo_metadata_output_format">OUTPUT FORMAT</h2>
                     /* Array of required features.
                        This property is not included if no required features are set.
                     */
-                    "required-features": ["feat1"]
+                    "required-features": ["feat1"],
+                    /* Whether or not this target has doc tests enabled, and
+                       the target is compatible with doc testing.
+                    */
+                    "doctest": false
                 }
             ],
             /* Set of features defined for the package.

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 1.5.8
-.\"      Date: 2019-05-08
+.\"      Date: 2019-05-20
 .\"    Manual: \ \&
 .\"    Source: \ \&
 .\"  Language: English
 .\"
-.TH "CARGO\-METADATA" "1" "2019-05-08" "\ \&" "\ \&"
+.TH "CARGO\-METADATA" "1" "2019-05-20" "\ \&" "\ \&"
 .ie \n(.g .ds Aq \(aq
 .el       .ds Aq '
 .ss \n[.ss] 0
@@ -151,7 +151,11 @@ The output has the following format:
                     /* Array of required features.
                        This property is not included if no required features are set.
                     */
-                    "required\-features": ["feat1"]
+                    "required\-features": ["feat1"],
+                    /* Whether or not this target has doc tests enabled, and
+                       the target is compatible with doc testing.
+                    */
+                    "doctest": false
                 }
             ],
             /* Set of features defined for the package.