about summary refs log tree commit diff
path: root/src/tools
diff options
context:
space:
mode:
authorGuillaume Gomez <guillaume1.gomez@gmail.com>2018-04-17 18:43:15 +0200
committerGitHub <noreply@github.com>2018-04-17 18:43:15 +0200
commit7a6fad32af2fe280005dadd8c74266af3a676ace (patch)
tree254190b63c71aa464bba8ed78cdf90558868d85e /src/tools
parent7a39e90afc0ee2ca79b44d8a940d33ba7d417a3e (diff)
parentc83c7c91f5eaeef349d356bfb3272d619ac54401 (diff)
downloadrust-7a6fad32af2fe280005dadd8c74266af3a676ace.tar.gz
rust-7a6fad32af2fe280005dadd8c74266af3a676ace.zip
Rollup merge of #49966 - GuillaumeGomez:comma-search, r=QuietMisdreavus
Multiple query search

Part of #49757.

r? @QuietMisdreavus
Diffstat (limited to 'src/tools')
-rw-r--r--src/tools/rustdoc-js/tester.js5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/tools/rustdoc-js/tester.js b/src/tools/rustdoc-js/tester.js
index 7c9ee2a4943..1e6c4336a9e 100644
--- a/src/tools/rustdoc-js/tester.js
+++ b/src/tools/rustdoc-js/tester.js
@@ -157,7 +157,8 @@ function main(argv) {
     // execQuery first parameter is built in getQuery (which takes in the search input).
     // execQuery last parameter is built in buildIndex.
     // buildIndex requires the hashmap from search-index.
-    var functionsToLoad = ["levenshtein", "validateResult", "getQuery", "buildIndex", "execQuery"];
+    var functionsToLoad = ["levenshtein", "validateResult", "getQuery", "buildIndex", "execQuery",
+                           "execSearch"];
 
     finalJS += 'window = { "currentCrate": "std" };\n';
     finalJS += loadThings(arraysToLoad, 'array', extractArrayVariable, mainJs);
@@ -174,7 +175,7 @@ function main(argv) {
                                'exports.QUERY = QUERY;exports.EXPECTED = EXPECTED;');
         const expected = loadedFile.EXPECTED;
         const query = loadedFile.QUERY;
-        var results = loaded.execQuery(loaded.getQuery(query), index);
+        var results = loaded.execSearch(loaded.getQuery(query), index);
         process.stdout.write('Checking "' + file + '" ... ');
         var error_text = [];
         for (var key in expected) {