Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bors merged 2 commits into from
Apr 5, 2021
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6530b32
rustdoc: use Array.prototype.filter instead of open-coding it
notriddle Mar 31, 2021
227f5ed
rustdoc: Separate filter-empty-string out into its own function
notriddle Apr 1, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 12 additions & 9 deletions src/librustdoc/html/static/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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 = [];
Expand Down Expand Up @@ -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)) {
Expand Down
3 changes: 2 additions & 1 deletion src/tools/rustdoc-js/tester.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down