Skip to content

rustdoc-search: skip loading unneeded fnData #146070

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 1 commit into from
Sep 2, 2025
Merged

rustdoc-search: skip loading unneeded fnData #146070

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion src/librustdoc/html/static/js/rustdoc.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -289,7 +289,7 @@ declare namespace rustdoc {
exactModulePath: string,
entry: EntryData?,
path: PathData?,
type: FunctionData?,
functionData: FunctionData?,
deprecated: boolean,
parent: { path: PathData, name: string}?,
}
Expand Down
23 changes: 12 additions & 11 deletions src/librustdoc/html/static/js/search.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1802,14 +1802,15 @@ class DocSearch {

/**
* @param {number} id
* @param {boolean} loadFunctionData
* @returns {Promise<rustdoc.Row?>}
*/
async getRow(id) {
const [name_, entry, path, type] = await Promise.all([
async getRow(id, loadFunctionData) {
const [name_, entry, path, functionData] = await Promise.all([
this.getName(id),
this.getEntryData(id),
this.getPathData(id),
this.getFunctionData(id),
loadFunctionData ? this.getFunctionData(id) : null,
]);
if (!entry && !path) {
return null;
Expand Down Expand Up @@ -1853,7 +1854,7 @@ class DocSearch {
`${exactModulePathData.exactModulePath}::${exactModuleName}`),
entry,
path,
type,
functionData,
deprecated: entry ? entry.deprecated : false,
parent: parentName !== null && parentPath !== null ?
{ name: parentName, path: parentPath } :
Expand Down Expand Up @@ -2563,11 +2564,11 @@ class DocSearch {
name: item.parent.name,
ty: item.parent.path.ty,
} : undefined,
type: item.type && item.type.functionSignature ?
item.type.functionSignature :
type: item.functionData && item.functionData.functionSignature ?
item.functionData.functionSignature :
undefined,
paramNames: item.type && item.type.paramNames ?
item.type.paramNames :
paramNames: item.functionData && item.functionData.paramNames ?
item.functionData.paramNames :
undefined,
dist: result.dist,
path_dist: result.path_dist,
Expand Down Expand Up @@ -2642,7 +2643,7 @@ class DocSearch {
/**
* @type {rustdoc.Row?}
*/
const item = await this.getRow(result.id);
const item = await this.getRow(result.id, typeInfo !== null);
if (!item) {
continue;
}
Expand Down Expand Up @@ -3749,7 +3750,7 @@ class DocSearch {
is_alias: true,
elems: [], // only used in type-based queries
returned: [], // only used in type-based queries
original: await this.getRow(alias),
original: await this.getRow(alias, false),
};
};
/**
Expand Down Expand Up @@ -3804,7 +3805,7 @@ class DocSearch {
* @returns {Promise<rustdoc.PlainResultObject?>}
*/
const handleNameSearch = async id => {
const row = await this.getRow(id);
const row = await this.getRow(id, false);
if (!row || !row.entry) {
return null;
}
Expand Down
Loading