diff options
| author | bors <bors@rust-lang.org> | 2018-04-17 16:51:55 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2018-04-17 16:51:55 +0000 |
| commit | 9379bcdd0b4ef06303e8c4e3e7c3fd79882372cc (patch) | |
| tree | 5877bf1dd379fc86c6cceee692cc54a941800347 /src/tools | |
| parent | 881a7cd86ef1001bdfa9590878ca24e57794302f (diff) | |
| parent | 92d29c1267cffd65e80648ea463221f765236ebb (diff) | |
| download | rust-9379bcdd0b4ef06303e8c4e3e7c3fd79882372cc.tar.gz rust-9379bcdd0b4ef06303e8c4e3e7c3fd79882372cc.zip | |
Auto merge of #50033 - GuillaumeGomez:rollup, r=GuillaumeGomez
Rollup of 4 pull requests Successful merges: - #49699 (Removed 'proc' from the reserved keywords list) - #49966 (Multiple query search) - #50013 (Remove no longer necessary comparison to Vec::splice.) - #50032 (rustdoc: Don't include private paths in all.html) Failed merges:
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/rustdoc-js/tester.js | 5 |
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) { |
