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

Fix rustdoc argument error #98331

Merged
merged 4 commits into from
Jun 28, 2022
Merged

Conversation

GuillaumeGomez
Copy link
Member

Fixes #88756.

It's a take over of #88831. I cherry-picked the commits, fixed the merge conflict and the failing test.

cc @inashivb @jyn514

r? @notriddle

@GuillaumeGomez GuillaumeGomez added the T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. label Jun 21, 2022
@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jun 21, 2022
src/librustdoc/config.rs Outdated Show resolved Hide resolved
@notriddle
Copy link
Contributor

@bors r+

@bors
Copy link
Contributor

bors commented Jun 21, 2022

📌 Commit 85aee0832d7dfc8d23b57de38915fb9c0345307f has been approved by notriddle

@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 Jun 21, 2022
@notriddle
Copy link
Contributor

@bors r-

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jun 21, 2022
@GuillaumeGomez
Copy link
Member Author

Updated!

@notriddle
Copy link
Contributor

@bors r+

@bors
Copy link
Contributor

bors commented Jun 27, 2022

📌 Commit 768129d has been approved by notriddle

@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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jun 27, 2022
bors added a commit to rust-lang-ci/rust that referenced this pull request Jun 27, 2022
…askrgr

Rollup of 9 pull requests

Successful merges:

 - rust-lang#98331 (Fix rustdoc argument error)
 - rust-lang#98506 (Fix span issues in object safety suggestions)
 - rust-lang#98563 (interpret: refactor allocation info query)
 - rust-lang#98576 (small regions refactoring)
 - rust-lang#98577 (Fix "kind" for associated types in trait implementations in rustdoc JSON)
 - rust-lang#98578 (Remove eddyb from miri failure pings)
 - rust-lang#98579 (liballoc tests: avoid int2ptr cast)
 - rust-lang#98581 (Add triagebot mentions.)
 - rust-lang#98587 (libcore tests: avoid int2ptr casts)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 38bfa9c into rust-lang:master Jun 28, 2022
@rustbot rustbot added this to the 1.64.0 milestone Jun 28, 2022
@GuillaumeGomez GuillaumeGomez deleted the rustdoc-arg-error branch June 28, 2022 08:36
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. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

rustdoc: rustdoc -W help prints error unless a file argument is given
7 participants