Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bootstrap: don't complain about linkcheck if it is excluded #83683

Merged
merged 1 commit into from
Mar 31, 2021

Conversation

tblah
Copy link
Contributor

@tblah tblah commented Mar 30, 2021

We don't need to complain to the user about linkcheck having different
hosts and targets when it is already excluded.

Resolves #83661

@rust-highfive
Copy link
Collaborator

r? @Mark-Simulacrum

(rust-highfive has picked a reviewer for you, use r? to override)

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Mar 30, 2021
We don't need to complain to the user about linkcheck having different
hosts and targets when it is already excluded. This can be achieved by
moving the check to when the step is run instead of in should_run.
@tblah
Copy link
Contributor Author

tblah commented Mar 30, 2021

The second push cleans up the diff - I was too hasty.

@Mark-Simulacrum
Copy link
Member

Thanks for the quick fix!

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Mar 30, 2021

📌 Commit 8f97b94 has been approved by Mark-Simulacrum

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Mar 30, 2021
Dylan-DPC-zz pushed a commit to Dylan-DPC-zz/rust that referenced this pull request Mar 30, 2021
…mulacrum

bootstrap: don't complain about linkcheck if it is excluded

We don't need to complain to the user about linkcheck having different
hosts and targets when it is already excluded.

Resolves rust-lang#83661
bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 30, 2021
Rollup of 6 pull requests

Successful merges:

 - rust-lang#80720 (Make documentation of which items the prelude exports more readable.)
 - rust-lang#83654 (Do not emit a suggestion that causes the E0632 error)
 - rust-lang#83671 (Add a regression test for issue-75801)
 - rust-lang#83678 (Fix Self keyword doc URL conflict on case insensitive file systems (until definitely fixed on rustdoc))
 - rust-lang#83680 (Update for loop desugaring docs)
 - rust-lang#83683 (bootstrap: don't complain about linkcheck if it is excluded)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 7a587f0 into rust-lang:master Mar 31, 2021
@rustbot rustbot added this to the 1.53.0 milestone Mar 31, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Ineffective --exclude argument on ./x.py test
5 participants