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

GH-66816: Remove disable attr before return #76052

Merged

Conversation

aszenz
Copy link
Contributor

@aszenz aszenz commented Aug 29, 2020

Passing --disable-per-crate-search removes the create search inputs so moved code around so that the search input is enabled
first before the function returns.

Fixes #66816

Passing --disable-per-crate-search removes the create search
inputs so moved code around so that the search input is enabled
first before the function returns
@rust-highfive
Copy link
Collaborator

Some changes occurred in HTML/CSS/JS.

cc @GuillaumeGomez

@rust-highfive
Copy link
Collaborator

r? @steveklabnik

(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 Aug 29, 2020
@@ -2740,6 +2740,10 @@ function defocusSearchBar() {
}

window.addSearchOptions = function(crates) {
if (search_input) {
Copy link
Member

Choose a reason for hiding this comment

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

Even if very unlikely, I don't like the idea to enable the search input if the other processing isn't done. So instead of just moving this call here, I suggest to put it inside a function and then call this function in the if (!elem) { block and at the end of the addSearchOptions. What do you think?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Thanks, yes I didn't think about the processing angle, made the change now.

Copy link
Member

Choose a reason for hiding this comment

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

👍

@GuillaumeGomez
Copy link
Member

Thanks!

@bors: r+ rollup

@bors
Copy link
Contributor

bors commented Aug 29, 2020

📌 Commit eb2bb99 has been approved by GuillaumeGomez

@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 Aug 29, 2020
matklad added a commit to matklad/rust that referenced this pull request Aug 31, 2020
…ribute_before_return, r=GuillaumeGomez

rust-langGH-66816:  Remove disable attr before return

Passing --disable-per-crate-search removes the create search inputs so moved code around so that the search input is enabled
first before the function returns.

Fixes rust-lang#66816
This was referenced Aug 31, 2020
bors added a commit to rust-lang-ci/rust that referenced this pull request Aug 31, 2020
Rollup of 9 pull requests

Successful merges:

 - rust-lang#75969 (Switch to intra-doc links in core/src/{convert,iter}/mod.rs)
 - rust-lang#76023 (Liballoc extend use intra doc link)
 - rust-lang#76033 (Add missing hyphen)
 - rust-lang#76052 (rust-langGH-66816:  Remove disable attr before return)
 - rust-lang#76055 (Keep doc standard for Vec DrainFilter)
 - rust-lang#76058 (Use assertions on Vec doc)
 - rust-lang#76069 (Use explicit intra-doc link in path for Vec resize)
 - rust-lang#76117 (Update README.md)
 - rust-lang#76134 (Update MinGW instructions to include ninja)

Failed merges:

r? @ghost
@bors bors merged commit 300d7f6 into rust-lang:master Aug 31, 2020
@aszenz aszenz deleted the GH-66816_removes_disable_attribute_before_return branch August 31, 2020 13:08
jyn514 added a commit to jyn514/docs.rs that referenced this pull request Aug 31, 2020
@jyn514
Copy link
Member

jyn514 commented Aug 31, 2020

Thank you so much for this! I'd nearly forgotten it was broken 😅

@jyn514 jyn514 added the T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. label Aug 31, 2020
jyn514 added a commit to jyn514/docs.rs that referenced this pull request Sep 5, 2020
jyn514 added a commit to rust-lang/docs.rs that referenced this pull request Sep 10, 2020
@cuviper cuviper added this to the 1.48.0 milestone Nov 17, 2023
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.

Passing --disable-per-crate-search to rustdoc disables search altogether
7 participants