Skip to content

Commit b65ebc6

Browse files
committed
Tweak/fix metadata resolve docs.
Due to how markdown works there can't be blank lines in the embedded HTML.
1 parent 2fb093b commit b65ebc6

File tree

3 files changed

+25
-34
lines changed

3 files changed

+25
-34
lines changed

src/doc/man/cargo-metadata.adoc

+8-11
Original file line numberDiff line numberDiff line change
@@ -199,17 +199,14 @@ The output has the following format:
199199
"workspace_members": [
200200
"my-package 0.1.0 (path+file:///path/to/my-package)",
201201
],
202-
/* The resolved dependency graph, with the concrete versions and features
203-
selected. The set depends on the enabled features.
204-
205-
All platform-specific dependencies are listed regardless of the current
206-
target.
207-
208-
This is null if --no-deps is specified.
209-
By default, this includes all dependencies for all target platforms.
210-
The `--filter-platform` flag may be used to narrow to a specific
211-
target triple.
212-
*/
202+
// The resolved dependency graph, with the concrete versions and features
203+
// selected. The set depends on the enabled features.
204+
//
205+
// This is null if --no-deps is specified.
206+
//
207+
// By default, this includes all dependencies for all target platforms.
208+
// The `--filter-platform` flag may be used to narrow to a specific
209+
// target triple.
213210
"resolve": {
214211
/* Array of nodes within the dependency graph.
215212
Each node is a package.

src/doc/man/generated/cargo-metadata.html

+9-12
Original file line numberDiff line numberDiff line change
@@ -206,17 +206,14 @@ <h2 id="cargo_metadata_output_format">OUTPUT FORMAT</h2>
206206
"workspace_members": [
207207
"my-package 0.1.0 (path+file:///path/to/my-package)",
208208
],
209-
/* The resolved dependency graph, with the concrete versions and features
210-
selected. The set depends on the enabled features.
211-
212-
All platform-specific dependencies are listed regardless of the current
213-
target.
214-
215-
This is null if --no-deps is specified.
216-
By default, this includes all dependencies for all target platforms.
217-
The `--filter-platform` flag may be used to narrow to a specific
218-
target triple.
219-
*/
209+
// The resolved dependency graph, with the concrete versions and features
210+
// selected. The set depends on the enabled features.
211+
//
212+
// This is null if --no-deps is specified.
213+
//
214+
// By default, this includes all dependencies for all target platforms.
215+
// The `--filter-platform` flag may be used to narrow to a specific
216+
// target triple.
220217
"resolve": {
221218
/* Array of nodes within the dependency graph.
222219
Each node is a package.
@@ -491,4 +488,4 @@ <h2 id="cargo_metadata_see_also">SEE ALSO</h2>
491488
<p><a href="index.html">cargo(1)</a></p>
492489
</div>
493490
</div>
494-
</div>
491+
</div>

src/etc/man/cargo-metadata.1

+8-11
Original file line numberDiff line numberDiff line change
@@ -220,17 +220,14 @@ The output has the following format:
220220
"workspace_members": [
221221
"my\-package 0.1.0 (path+file:///path/to/my\-package)",
222222
],
223-
/* The resolved dependency graph, with the concrete versions and features
224-
selected. The set depends on the enabled features.
225-
226-
All platform\-specific dependencies are listed regardless of the current
227-
target.
228-
229-
This is null if \-\-no\-deps is specified.
230-
By default, this includes all dependencies for all target platforms.
231-
The `\-\-filter\-platform` flag may be used to narrow to a specific
232-
target triple.
233-
*/
223+
// The resolved dependency graph, with the concrete versions and features
224+
// selected. The set depends on the enabled features.
225+
//
226+
// This is null if \-\-no\-deps is specified.
227+
//
228+
// By default, this includes all dependencies for all target platforms.
229+
// The `\-\-filter\-platform` flag may be used to narrow to a specific
230+
// target triple.
234231
"resolve": {
235232
/* Array of nodes within the dependency graph.
236233
Each node is a package.

0 commit comments

Comments
 (0)