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.

Sign up for GitHub

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

Jump to bottom

Fix rustdoc help options #99055

Merged
merged 2 commits into from
Jul 12, 2022
Merged

Fix rustdoc help options #99055

merged 2 commits into from
Jul 12, 2022

Conversation

GuillaumeGomez
Copy link
Member

Fixes #98976.

Since you're the one who found out about the problem and also provided the solution (thanks for both!):

r? @jyn514

@GuillaumeGomez GuillaumeGomez added the T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. label Jul 8, 2022
@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jul 8, 2022
jyn514
jyn514 approved these changes Jul 8, 2022
View reviewed changes
src/test/rustdoc-ui/c-help.rs Show resolved Hide resolved
src/test/rustdoc-ui/z-help.rs Show resolved Hide resolved
@GuillaumeGomez
Copy link
Member Author

Updated.

@rust-log-analyzer

This comment has been minimized.

Sign in to view
@GuillaumeGomez
Copy link
Member Author

Strange that it doesn't find the pattern. I'll check what I did wrong.

@jyn514 jyn514 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-review Status: Awaiting review from the assignee but also interested parties. labels Jul 8, 2022
@GuillaumeGomez GuillaumeGomez force-pushed the rustdoc-help-options branch 2 times, most recently from 8353eba to 53edb1e Compare July 8, 2022 15:36
@GuillaumeGomez
Copy link
Member Author

I needed to add a new check (regex-error-pattern) to allow regex checks. Should be fixed now.

@jyn514
Copy link
Member

jyn514 commented Jul 10, 2022

I don't think we should add regex support for compiletest just for this. You can use a different pattern for error-pattern instead, incremental=val or something like that.

@GuillaumeGomez
Copy link
Member Author

I thought the idea was to confirm that we had -Z/-C mostly. For example, it'd be possible to have -C incremental=val whereas -Z was used (proving that the wrong call is being performed in rustdoc). Don't know if that makes sense or if I'm being too cautious here?

@jyn514
Copy link
Member

jyn514 commented Jul 10, 2022

Hmm, fair enough. cc @Mark-Simulacrum just in case you happen to have strong opinions about adding a regex matcher to the UI test runner, but this seems fine to me.

@bors r+

@bors
Copy link
Contributor

bors commented Jul 10, 2022

📌 Commit 53edb1e has been approved by jyn514

It is now in the queue for this repository.

@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 Jul 10, 2022
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Jul 10, 2022
@matthiaskrgr
Rollup merge of rust-lang#99055 - GuillaumeGomez:rustdoc-help-options…
2d220f2 
…, r=jyn514

Fix rustdoc help options

Fixes rust-lang#98976.

Since you're the one who found out about the problem and also provided the solution (thanks for both!):

r? `@jyn514`
@matthiaskrgr matthiaskrgr mentioned this pull request Jul 10, 2022
Closed
@matthiaskrgr
Copy link
Member

@bors r-
failed in a rollup: #99127 (comment)

@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 Jul 10, 2022
@jyn514
Copy link
Member

jyn514 commented Jul 10, 2022

@bors rollup=never

@GuillaumeGomez
Copy link
Member Author

Updated the UI output.

@bors r=jyn514

@bors
Copy link
Contributor

bors commented Jul 11, 2022

📌 Commit b65d3a6 has been approved by jyn514

It is now in the queue for this repository.

@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 Jul 11, 2022
@jyn514
Copy link
Member

jyn514 commented Jul 11, 2022

@bors rollup=iffy

matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Jul 11, 2022
@matthiaskrgr
Rollup merge of rust-lang#99055 - GuillaumeGomez:rustdoc-help-options…
f240ca0 
…, r=jyn514

Fix rustdoc help options

Fixes rust-lang#98976.

Since you're the one who found out about the problem and also provided the solution (thanks for both!):

r? `@jyn514`
@matthiaskrgr matthiaskrgr mentioned this pull request Jul 11, 2022
Closed
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Jul 11, 2022
@matthiaskrgr
Rollup merge of rust-lang#99055 - GuillaumeGomez:rustdoc-help-options…
da85ea2 
…, r=jyn514

Fix rustdoc help options

Fixes rust-lang#98976.

Since you're the one who found out about the problem and also provided the solution (thanks for both!):

r? ``@jyn514``
@matthiaskrgr matthiaskrgr mentioned this pull request Jul 11, 2022
Closed
@matthiaskrgr matthiaskrgr mentioned this pull request Jul 11, 2022
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Jul 12, 2022
@bors
Auto merge of rust-lang#99165 - matthiaskrgr:rollup-rqpelfa, r=matthi…
b3f4c31 
…askrgr

Rollup of 8 pull requests

Successful merges:

 - rust-lang#97210 (Support `-A`, `-W`, `-D` and `-F` when running `./x.py clippy`)
 - rust-lang#99055 (Fix rustdoc help options)
 - rust-lang#99075 (Fix duplicated type annotation suggestion)
 - rust-lang#99124 (Fix sized check ICE in asm check)
 - rust-lang#99142 (fix(doctest): treat fatal parse errors as incomplete attributes)
 - rust-lang#99145 (Don't rerun the build script for the compiler each time on non-windows platforms)
 - rust-lang#99146 (Do not error during method probe on `Sized` predicates for types that aren't the method receiver)
 - rust-lang#99161 (compiletest: trim edition before passing as flag)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit c431e6f into rust-lang:master Jul 12, 2022
@rustbot rustbot added this to the 1.64.0 milestone Jul 12, 2022
@GuillaumeGomez GuillaumeGomez deleted the rustdoc-help-options branch July 12, 2022 09:05
@GuillaumeGomez GuillaumeGomez mentioned this pull request Jul 12, 2022
Merged
Dylan-DPC added a commit to Dylan-DPC/rust that referenced this pull request Jul 12, 2022
@Dylan-DPC
Rollup merge of rust-lang#99171 - GuillaumeGomez:rustdoc-ui-test-rege…
87e25e4 
…x, r=Dylan-DPC

Put back UI test regex

I just realized I overwrote these two commits in rust-lang#99055 when force pushing to fix the stdout output...

r? `@Dylan-DPC`
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jyn514 jyn514 jyn514 approved these changes

Assignees

@jyn514 jyn514

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
Milestone
1.64.0
Development

Successfully merging this pull request may close these issues.

rustdoc -Z help and -C help are still broken
7 participants
@GuillaumeGomez @rust-log-analyzer @jyn514 @bors @matthiaskrgr @rust-highfive @rustbot