Skip to content

Commit

Permalink
Rollup merge of rust-lang#82802 - jyn514:build-rustdoc-fullmake, r=Ma…
Browse files Browse the repository at this point in the history
…rk-Simulacrum

Build rustdoc for run-make tests, not just run-make-fulldeps

Rustdoc almost never needs a full stage 2 compiler, and requiring
rustdoc tests to be in run-make-fulldeps adds a lot of compile time for
no reason.

This is the same change from rust-lang#81197, but separated into its own PR. I ran into this again today while working on rust-lang/docs.rs#1302.
r? `@Mark-Simulacrum`
  • Loading branch information
Dylan-DPC committed Mar 9, 2021
2 parents f5b1793 + a05a890 commit 16e14ce
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/bootstrap/test.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1076,7 +1076,7 @@ note: if you're sure you want to do this, please open an issue as to why. In the

// Avoid depending on rustdoc when we don't need it.
if mode == "rustdoc"
|| (mode == "run-make" && suite.ends_with("fulldeps"))
|| mode == "run-make"
|| (mode == "ui" && is_rustdoc)
|| mode == "js-doc-test"
|| mode == "rustdoc-json"
Expand Down

0 comments on commit 16e14ce

Please sign in to comment.