Pass --cfg=bootstrap for rustdoc for proc_macro crates#101921
Merged
bors merged 1 commit intorust-lang:masterfrom Sep 17, 2022
Merged
Pass --cfg=bootstrap for rustdoc for proc_macro crates#101921bors merged 1 commit intorust-lang:masterfrom
bors merged 1 commit intorust-lang:masterfrom
Conversation
This commit does three things: * First, it passes --cfg=bootstrap on stage 0 for rustdoc invocations on proc_macro crates. This mirrors what we do already for rustc invocations of those, and is needed because cargo doesn't respect RUSTFLAGS or RUSTDOCFLAGS when confronted with a proc macro. * Second, it marks the bootstrap config variable as expected. This is needed both on later stages where it's not set, but also on stage 0, where it is set. * Third, it adjusts the comment in the rustc wrapper to better reflect the reason why we set the bootstrap variable as expected: due to recent changes, setting it as expected is also required even if the cfg variable is passed: ebf4cc3 .
rustbot
added
the
T-bootstrap
Contributor
|
(rust-highfive has picked a reviewer for you, use r? to override) |
rust-highfive
added
the
S-waiting-on-review
Member
Author
Merged
Member
Author
|
Most importantly, now when you do |
Member
|
@bors r+ rollup |
Collaborator
bors
added
S-waiting-on-bors
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Sep 17, 2022
Rollup of 8 pull requests Successful merges: - rust-lang#101340 (Adding Fuchsia zxdb debugging walkthrough to docs) - rust-lang#101741 (Adding needs-unwind arg to applicable compiler ui tests) - rust-lang#101782 (Update `symbol_mangling` diagnostics migration) - rust-lang#101878 (More simple formatting) - rust-lang#101898 (Remove some unused CSS rules) - rust-lang#101911 (rustdoc: remove no-op CSS on `.source .content`) - rust-lang#101914 (rustdoc-json-types: Document that ResolvedPath can also be a union) - rust-lang#101921 (Pass --cfg=bootstrap for rustdoc for proc_macro crates) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This PR does three things:
expected: due to recent changes, setting it as expected
is also required even if the cfg variable is passed: ebf4cc3 .