Skip to content

Commit

Permalink
Rollup merge of #80924 - teryror:issue-80893-fix, r=jyn514
Browse files Browse the repository at this point in the history
Fix rustdoc --test-builder argument parsing

My suggested fix to issue #80893. I can actually hook Miri in there now.

I also fixed what I believe to be a typo in the option's help text.
  • Loading branch information
Dylan-DPC authored Jan 13, 2021
2 parents d64e703 + f3c8f29 commit c64d3f0
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 5 deletions.
6 changes: 1 addition & 5 deletions src/librustdoc/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -412,11 +412,7 @@ fn opts() -> Vec<RustcOptGroup> {
)
}),
unstable("test-builder", |o| {
o.optflag(
"",
"test-builder",
"specified the rustc-like binary to use as the test builder",
)
o.optopt("", "test-builder", "The rustc-like binary to use as the test builder", "PATH")
}),
unstable("check", |o| o.optflag("", "check", "Run rustdoc checks")),
]
Expand Down
6 changes: 6 additions & 0 deletions src/test/rustdoc/issue-80893.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
// compile-flags: --test -Z unstable-options --test-builder true

/// ```no_run
/// This tests that `--test-builder` is accepted as a flag by rustdoc.
/// ```
pub struct Foo;

0 comments on commit c64d3f0

Please sign in to comment.