Skip to content

Fully handle "?" shortcut - #75393

Merged
bors merged 1 commit into
rust-lang:masterfrom
GuillaumeGomez:fix-help-shortcut
Aug 11, 2020
Merged

Fully handle "?" shortcut#75393
bors merged 1 commit into
rust-lang:masterfrom
GuillaumeGomez:fix-help-shortcut

Conversation

@GuillaumeGomez

Copy link
Copy Markdown
Member

Fixes#75386.

cc @runiq

@rust-highfive

Copy link
Copy Markdown
Contributor

Some changes occurred in HTML/CSS/JS.

cc @GuillaumeGomez

@rust-highfive

Copy link
Copy Markdown
Contributor

r? @ollie27

(rust_highfive has picked a reviewer for you, use r? to override)

@rust-highfiverust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Aug 11, 2020
@GuillaumeGomez

Copy link
Copy Markdown
MemberAuthor

r? @jyn514

@rust-highfiverust-highfive assigned jyn514 and unassigned ollie27Aug 11, 2020
@GuillaumeGomez
GuillaumeGomezforce-pushed the fix-help-shortcut branch 2 times, most recently from e1d2090 to 81bb314CompareAugust 11, 2020 11:54
Comment threadsrc/librustdoc/html/static/main.js Outdated

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why not just remove this branch?

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've been switching between this and removing the condition for a while. You made the balance change haha.

@pickfirepickfire left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me but I didn't test it out.

@GuillaumeGomez

Copy link
Copy Markdown
MemberAuthor

I tested both and they worked on my computer. If an issue occurs, it's pretty simple to rollback.

@bors: r=pickfire rollup

@bors

bors commented Aug 11, 2020

Copy link
Copy Markdown
Collaborator

📌 Commit fdf2fe1 has been approved by pickfire

@borsbors 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 Aug 11, 2020
@tmandrytmandry mentioned this pull request Aug 11, 2020
bors added a commit to rust-lang-ci/rust that referenced this pull request Aug 11, 2020
Rollup of 7 pull requests
Successful merges:
- rust-lang#75036 (Prefer pattern matching over indexing)
- rust-lang#75378 (Introduce `rustc_lexer::is_ident` and use it in couple of places)
- rust-lang#75393 (Fully handle "?" shortcut)
- rust-lang#75403 (Update comment for function)
- rust-lang#75407 (Requested changes to [*mut T|*const T]::set_ptr_value)
- rust-lang#75408 (Update MinGW comments in ci.yml)
- rust-lang#75409 (Fix range term in alloc vec doc)
Failed merges:
r? @ghost
@ollie27ollie27 added the T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. label Aug 11, 2020
@bors
bors merged commit a421197 into rust-lang:masterAug 11, 2020
@GuillaumeGomez
GuillaumeGomez deleted the fix-help-shortcut branch August 11, 2020 22:00
@jyn514

Copy link
Copy Markdown
Member

Looks like everyone took care of this without me 😆

@cuvipercuviper added this to the 1.47.0 milestone May 2, 2024
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-rustdocRelevant 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: Help dialog doesn't open when the ? key is not behind Shift

7 participants

@GuillaumeGomez@rust-highfive@bors@jyn514@pickfire@cuviper@ollie27