mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rollup merge of #83717 - notriddle:main-js-slice-loop, r=GuillaumeGomez

Browse Source 
rustdoc: Separate filter-empty-string out into its own function
This commit is contained in:
Dylan DPC 2021-04-05 00:24:29 +02:00 committed by GitHub
commit 03bd4d29e9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/librustdoc/html/static/main.js
View File

@ -219,6 +219,15 @@ function hideThemeButtonState() {
var titleBeforeSearch = document.title;
var searchTitle = null;
function removeEmptyStringsFromArray(x) {
for (var i = 0, len = x.length; i < len; ++i) {
if (x[i] === "") {
x.splice(i, 1);
i -= 1;
}
}
}
function clearInputTimeout() {
if (searchTimeout !== null) {
clearTimeout(searchTimeout);
@ -756,7 +765,7 @@ function hideThemeButtonState() {
results = {}, results_in_args = {}, results_returned = {},
split = valLower.split("::");
split = split.filter(function(segment) { return segment !== ""; });
removeEmptyStringsFromArray(split);
function transformResults(results, isType) {
var out = [];
@ -1338,17 +1347,11 @@ function hideThemeButtonState() {
var valGenerics = extractGenerics(val);
var paths = valLower.split("::");
var j;
for (j = 0, len = paths.length; j < len; ++j) {
if (paths[j] === "") {
paths.splice(j, 1);
j -= 1;
}
}
removeEmptyStringsFromArray(paths);
val = paths[paths.length - 1];
var contains = paths.slice(0, paths.length > 1 ? paths.length - 1 : 1);
var lev;
var lev, j;
for (j = 0; j < nSearchWords; ++j) {
ty = searchIndex[j];
if (!ty || (filterCrates !== undefined && ty.crate !== filterCrates)) {

3
src/tools/rustdoc-js/tester.js
View File

@ -264,7 +264,8 @@ function loadMainJsAndIndex(mainJs, searchIndex, storageJs, crate) {
// execQuery last parameter is built in buildIndex.
// buildIndex requires the hashmap from search-index.
var functionsToLoad = ["buildHrefAndPath", "pathSplitter", "levenshtein", "validateResult",
"handleAliases", "getQuery", "buildIndex", "execQuery", "execSearch"];
"handleAliases", "getQuery", "buildIndex", "execQuery", "execSearch",
"removeEmptyStringsFromArray"];
ALIASES = {};
finalJS += 'window = { "currentCrate": "' + crate + '", rootPath: "../" };\n';