bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

rustdoc: Separate filter-empty-string out into its own function

Browse source
This commit is contained in:
Michael Howell 2021-04-01 10:56:11 -07:00
parent 6530b3243a
commit 227f5ed679
2 changed files with 13 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/librustdoc/html/static/main.js
View file

@ -219,6 +219,15 @@ function hideThemeButtonState() {
var titleBeforeSearch = document.title; var titleBeforeSearch = document.title;
var searchTitle = null; 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() { function clearInputTimeout() {
if (searchTimeout !== null) { if (searchTimeout !== null) {
clearTimeout(searchTimeout); clearTimeout(searchTimeout);
@ -756,7 +765,7 @@ function hideThemeButtonState() {
results = {}, results_in_args = {}, results_returned = {}, results = {}, results_in_args = {}, results_returned = {},
split = valLower.split("::"); split = valLower.split("::");
split = split.filter(function(segment) { return segment !== ""; }); removeEmptyStringsFromArray(split);
function transformResults(results, isType) { function transformResults(results, isType) {
var out = []; var out = [];
@ -1338,7 +1347,7 @@ function hideThemeButtonState() {
var valGenerics = extractGenerics(val); var valGenerics = extractGenerics(val);
var paths = valLower.split("::"); var paths = valLower.split("::");
paths = paths.filter(function(segment) { return segment !== ""; }); removeEmptyStringsFromArray(paths);
val = paths[paths.length - 1]; val = paths[paths.length - 1];
var contains = paths.slice(0, paths.length > 1 ? paths.length - 1 : 1); var contains = paths.slice(0, paths.length > 1 ? paths.length - 1 : 1);

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. // execQuery last parameter is built in buildIndex.
// buildIndex requires the hashmap from search-index. // buildIndex requires the hashmap from search-index.
var functionsToLoad = ["buildHrefAndPath", "pathSplitter", "levenshtein", "validateResult", var functionsToLoad = ["buildHrefAndPath", "pathSplitter", "levenshtein", "validateResult",
"handleAliases", "getQuery", "buildIndex", "execQuery", "execSearch"]; "handleAliases", "getQuery", "buildIndex", "execQuery", "execSearch",
"removeEmptyStringsFromArray"];
ALIASES = {}; ALIASES = {};
finalJS += 'window = { "currentCrate": "' + crate + '", rootPath: "../" };\n'; finalJS += 'window = { "currentCrate": "' + crate + '", rootPath: "../" };\n';