fix search bar bug #50118
Merged
fix search bar bug #50118
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
GuillaumeGomez
force-pushed
the
search-bar-bug
branch
from
85384e5 to
01c97ea
Compare
src/librustdoc/html/static/main.js
Outdated
There was a problem hiding this comment.
Will this bite us if this block is entered from !query.query? Can query.query be undefined here?
There was a problem hiding this comment.
Based on this code, I'd say no. This is why I'm complaining about such conditions: it's difficult to understand what we're checking. I think the "real" condition here is if (query.query.length === 0 || query.id === currentResults) {.
pietroalbini
added
the
S-waiting-on-author
|
Makes sense. Thanks for the clarification! @bors r+ rollup |
|
📌 Commit 01c97ea has been approved by |
bors
added
S-waiting-on-bors
|
☔ The latest upstream changes (presumably #49757) made this pull request unmergeable. Please resolve the merge conflicts. |
bors
added
S-waiting-on-author
|
🔒 Merge conflict |
GuillaumeGomez
force-pushed
the
search-bar-bug
branch
from
01c97ea to
f33af5c
Compare
|
Fixed merge conflict. @bors r=QuietMisdreavus |
|
📌 Commit f33af5c has been approved by |
bors
added
S-waiting-on-bors
|
@bors: rollup |
kennytm
added a commit
to kennytm/rust
that referenced
this pull request
Apr 24, 2018
…ietMisdreavus fix search bar bug Fixes rust-lang#50064. r? @QuietMisdreavus
bors
added a commit
that referenced
this pull request
Apr 24, 2018
Rollup of 11 pull requests Successful merges: - #49461 (std: Child::kill() returns error if process has already exited) - #49727 (Add Cell::update) - #49812 (Fix revision support for UI tests.) - #49829 (Add doc links to `std::os` extension traits) - #49906 (Stabilize `std::hint::unreachable_unchecked`.) - #49970 (Deprecate Read::chars and char::decode_utf8) - #49985 (don't see issue #0) - #50118 (fix search bar bug) - #50139 (encourage descriptive issue titles) - #50174 (Use FxHashMap in syntax_pos::symbol::Interner::intern.) - #50185 (core: Fix overflow in `int::mod_euc` when `self < 0 && rhs == MIN`) Failed merges:
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #50064.
r? @QuietMisdreavus