Mirrors/rust
1
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2026-05-28 20:16:58 +03:00
Code Issues Packages Projects Releases Wiki Activity

Rollup merge of #146070 - notriddle:skip-loading-function-data, r=GuillaumeGomez

Browse Source 
rustdoc-search: skip loading unneeded fnData

Fixes rust-lang/rust#146063 (probably)

Based on the test I ran, it seems like most of the CPU time is being spent loading function signature data. This PR should avoid that.

https://notriddle.com/rustdoc-html-demo-12/skip-loading-function-data/doc/std/index.html
This commit is contained in:
Guillaume Gomez
2025-09-02 17:08:55 +02:00
committed by GitHub
parent 7b2bfa361e ac89fcbc55
commit 353b4a0a10
2 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/librustdoc/html/static/js/rustdoc.d.ts
Vendored
+1 -1
View File
@@ -289,7 +289,7 @@ declare namespace rustdoc {
exactModulePath: string,
entry: EntryData?,
path: PathData?,
type: FunctionData?,
functionData: FunctionData?,
deprecated: boolean,
parent: { path: PathData, name: string}?,
}
src/librustdoc/html/static/js/search.js
+12 -11
View File
@@ -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;
@@ -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 } :
@@ -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,
@@ -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;
}
@@ -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),
};
};
/**
@@ -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;
}