Skip to content

Commit

Permalink
Rollup merge of #51302 - Mark-Simulacrum:rustdoc-fast, r=QuietMisdreavus
Browse files Browse the repository at this point in the history
Permit building rustdoc without compiler artifacts

None
  • Loading branch information
Mark-Simulacrum authored Jun 2, 2018
2 parents d297f68 + cf24a1d commit dcfe311
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
3 changes: 1 addition & 2 deletions src/bootstrap/test.rs
Original file line number Diff line number Diff line change
Expand Up @@ -952,8 +952,7 @@ impl Step for Compiletest {
if suite.ends_with("fulldeps") ||
// FIXME: Does pretty need librustc compiled? Note that there are
// fulldeps test suites with mode = pretty as well.
mode == "pretty" ||
mode == "rustdoc"
mode == "pretty"
{
builder.ensure(compile::Rustc { compiler, target });
}
Expand Down
1 change: 1 addition & 0 deletions src/test/rustdoc/rustc-macro-crate.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
// except according to those terms.

// no-prefer-dynamic
// ignore-stage1

#![crate_type = "proc-macro"]

Expand Down

0 comments on commit dcfe311

Please sign in to comment.