Skip to content

Commit b1e2ca9

Browse files
committed
update run-make test
1 parent 0ff6d88 commit b1e2ca9

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

src/librustdoc/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -577,7 +577,7 @@ fn opts() -> Vec<RustcOptGroup> {
577577
"",
578578
"merge-doctests",
579579
"Force all doctests to be compiled as a single binary, instead of one binary per test. If merging fails, rustdoc will emit a hard error.",
580-
"",
580+
"yes|no|auto",
581581
),
582582
opt(
583583
Unstable,

tests/run-make/rustdoc-default-output/output-default.stdout

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,10 @@ Options:
154154
Comma separated list of types of output for rustdoc to
155155
emit
156156
--no-run Compile doctests without running them
157+
--merge-doctests yes|no|auto
158+
Force all doctests to be compiled as a single binary,
159+
instead of one binary per test. If merging fails,
160+
rustdoc will emit a hard error.
157161
--remap-path-prefix FROM=TO
158162
Remap source names in compiler messages
159163
--show-type-layout

0 commit comments

Comments
 (0)