diff options
| author | bors <bors@rust-lang.org> | 2019-11-15 09:37:24 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-11-15 09:37:24 +0000 |
| commit | ce36ab2b064c2aa716084d79717c64cc04bb6532 (patch) | |
| tree | 77f5ba79a6eda736ab42329b9294a8e4c91fe259 /src/librustdoc/html/static | |
| parent | 9e8c4e6fb1c952048fb823e59f4c9c6487bf9a58 (diff) | |
| parent | a173353daa657d90fff06e6223f48ee383bf9d13 (diff) | |
Auto merge of #66438 - JohnTitor:rollup-qpv3wia, r=JohnTitor
Rollup of 12 pull requests Successful merges: - #65557 (rename Error::iter_chain() and remove Error::iter_sources()) - #66013 (Avoid hashing the key twice in `get_query()`.) - #66306 (Remove cannot mutate statics in initializer of another static error) - #66338 (Update mdbook.) - #66388 (Do not ICE on recovery from unmet associated type bound obligation) - #66390 (Fix ICE when trying to suggest `Type<>` instead of `Type()`) - #66391 (Do not ICE in `if` without `else` in `async fn`) - #66398 (Remove some stack frames from `.async` calls) - #66410 (miri: helper methods for max values of machine's usize/isize) - #66418 (Link to tracking issue in HIR const-check error code description) - #66419 (Don't warn labels beginning with `_` on unused_labels lint) - #66428 (Cleanup unused function) Failed merges: r? @ghost
Diffstat (limited to 'src/librustdoc/html/static')
| -rw-r--r-- | src/librustdoc/html/static/main.js | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/librustdoc/html/static/main.js b/src/librustdoc/html/static/main.js index 04c0a0f005b..752b93f2ac5 100644 --- a/src/librustdoc/html/static/main.js +++ b/src/librustdoc/html/static/main.js @@ -1081,14 +1081,13 @@ function getSearchElement() { val = paths[paths.length - 1]; var contains = paths.slice(0, paths.length > 1 ? paths.length - 1 : 1); + var lev; + var lev_distance; for (j = 0; j < nSearchWords; ++j) { - var lev; - var lev_distance; ty = searchIndex[j]; if (!ty || (filterCrates !== undefined && ty.crate !== filterCrates)) { continue; } - var lev_distance; var lev_add = 0; if (paths.length > 1) { lev = checkPath(contains, paths[paths.length - 1], ty); @@ -1633,7 +1632,7 @@ function getSearchElement() { } var filterCrates = getFilterCrates(); - showResults(execSearch(query, index, filterCrates), filterCrates); + showResults(execSearch(query, index, filterCrates)); } function buildIndex(rawSearchIndex) { |
