about summary refs log tree commit diff
path: root/src/librustdoc/html/static
diff options
context:
space:
mode:
authorYuki Okushi <jtitor@2k36.org>2021-07-01 05:21:00 +0900
committerGitHub <noreply@github.com>2021-07-01 05:21:00 +0900
commitf458d8f669b9d61e52e289750c6b0773b8ab070b (patch)
treed777fab2b7b623a2e402e37985f84fb260b4bc1f /src/librustdoc/html/static
parente52a0ec5b8adedab4c72f005f39d283f8d32520b (diff)
parent855923c895681976d7a3ce6ff376f9b4c3b21ae8 (diff)
downloadrust-f458d8f669b9d61e52e289750c6b0773b8ab070b.tar.gz
rust-f458d8f669b9d61e52e289750c6b0773b8ab070b.zip
Rollup merge of #86746 - GuillaumeGomez:query-type-filter, r=notriddle
Fix rustdoc query type filter

I realized while reviewing #86659 that the type filter was broken on search so I'd prefer it to get merged before merging #86659.

r? `@notriddle`
Diffstat (limited to 'src/librustdoc/html/static')
-rw-r--r--src/librustdoc/html/static/search.js3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/librustdoc/html/static/search.js b/src/librustdoc/html/static/search.js
index 0aebb0e9d65..f6343e4c3d2 100644
--- a/src/librustdoc/html/static/search.js
+++ b/src/librustdoc/html/static/search.js
@@ -801,7 +801,8 @@ window.initSearch = function(rawSearchIndex) {
                     results_returned[fullId].lev =
                         Math.min(results_returned[fullId].lev, returned);
                 }
-                if (index !== -1 || lev <= MAX_LEV_DISTANCE) {
+                if (typePassesFilter(typeFilter, ty.ty) &&
+                        (index !== -1 || lev <= MAX_LEV_DISTANCE)) {
                     if (index !== -1 && paths.length < 2) {
                         lev = 0;
                     }