Skip to content

Fix bug where rustdoc-js tester would not pick the right search.js file if there is more than one #145359

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
merged 2 commits into from
Aug 20, 2025
Merged

Fix bug where rustdoc-js tester would not pick the right search.js file if there is more than one #145359

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
77d6ee0
Fix bug where `rustdoc-js` tester would not pick the right `search.js…
GuillaumeGomez Aug 13, 2025
2ebe679
Strenghten rustdoc js tester file macthing regex
GuillaumeGomez Aug 16, 2025
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
22 changes: 20 additions & 2 deletions src/tools/rustdoc-js/tester.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -405,6 +405,24 @@ async function runChecks(testFile, doSearch, parseQuery) {
return res;
}

function mostRecentMatch(staticFiles, regex) {
const matchingEntries = fs.readdirSync(staticFiles)
.filter(f => f.match(regex))
.map(f => {
const stats = fs.statSync(path.join(staticFiles, f));
return {
path: f,
time: stats.mtimeMs,
};
});
if (matchingEntries.length === 0) {
throw "No static file matching regex";
}
// We sort entries in descending order.
matchingEntries.sort((a, b) => b.time - a.time);
return matchingEntries[0].path;
}

/**
* Load searchNNN.js and search-indexNNN.js.
*
Expand All @@ -417,9 +435,9 @@ async function runChecks(testFile, doSearch, parseQuery) {
*/
async function loadSearchJS(doc_folder, resource_suffix) {
const staticFiles = path.join(doc_folder, "static.files");
const stringdexJs = fs.readdirSync(staticFiles).find(f => f.match(/stringdex.*\.js$/));
const stringdexJs = mostRecentMatch(staticFiles, /stringdex.*\.js$/);
const stringdexModule = require(path.join(staticFiles, stringdexJs));
const searchJs = fs.readdirSync(staticFiles).find(f => f.match(/search.*\.js$/));
const searchJs = mostRecentMatch(staticFiles, /search-[0-9a-f]{8}.*\.js$/);
const searchModule = require(path.join(staticFiles, searchJs));
globalThis.nonnull = (x, msg) => {
if (x === null) {
Expand Down
Loading