[rustdoc search] Simplify itemTypes and filter "dependencies"#148440

GuillaumeGomez · 2025-11-03T13:13:23Z

We currently have a list of type filters, some constants to be able to index the list of type filters and finally a switch to include some types in a given filter (for example when we filter on constant, we also include associatedconstant items).

r? @notriddle

rustbot · 2025-11-03T13:13:26Z

Some changes occurred in HTML/CSS/JS.

cc @GuillaumeGomez, @jsha, @lolbinarycat

notriddle · 2025-11-05T02:42:07Z

src/librustdoc/html/static/js/search.js

    }
-    const index = itemTypes.findIndex(i => i === typename);
-    if (index < 0) {
+    // @ts-ignore


Suggested change

// @ts-ignore

// @ts-expected-error

It would also be nice if you said why the type error is ignored whenever you introduce a new one.

I think you made a typo: It's ts-expect-error

Oh right, the tsc error is:

src/librustdoc/html/static/js/search.js:1209:19 - error TS7053: Element implicitly has an 'any' type because expression of type 'string' can't be used to index type 'Readonly<{ keyword: 0; primitive: 1; mod: 2; externcrate: 3; import: 4; struct: 5; enum: 6; fn: 7; type: 8; static: 9; trait: 10; impl: 11; tymethod: 12; method: 13; structfield: 14; variant: 15; macro: 16; associatedtype: 17; ... 9 more ...; attribute: 27; }>'. No index signature with a parameter of type 'string' was found on type 'Readonly<{ keyword: 0; primitive: 1; mod: 2; externcrate: 3; import: 4; struct: 5; enum: 6; fn: 7; type: 8; static: 9; trait: 10; impl: 11; tymethod: 12; method: 13; structfield: 14; variant: 15; macro: 16; associatedtype: 17; ... 9 more ...; attribute: 27; }>'.

notriddle · 2025-11-05T02:43:43Z

src/librustdoc/html/static/js/search.js

-
-            // No match
-            return false;
+            // @ts-ignore


Suggested change

// @ts-ignore

// @ts-expected-error

notriddle · 2025-11-05T02:45:27Z

r=me after fixing those two problems

rustbot · 2025-11-05T10:45:51Z

This PR was rebased onto a different master commit. Here's a range-diff highlighting what actually changed.

Rebasing is a normal part of keeping PRs up to date, so no action is needed—this note is just to help reviewers.

GuillaumeGomez · 2025-11-05T12:53:15Z

@bors r=notriddle rollup

bors · 2025-11-05T12:53:19Z

📌 Commit 72d94d1 has been approved by notriddle

It is now in the queue for this repository.

…, r=notriddle [rustdoc search] Simplify itemTypes and filter "dependencies" We currently have a list of type filters, some constants to be able to index the list of type filters and finally a `switch` to include some types in a given filter (for example when we filter on `constant`, we also include `associatedconstant` items). r? `@notriddle`

Rollup of 8 pull requests Successful merges: - #147994 (Deduplicate deprecation warning when using unit or tuple structs) - #148440 ([rustdoc search] Simplify itemTypes and filter "dependencies") - #148501 (triagebot: Create Zulip topics for libs backports) - #148517 (Remove no longer necessary lint allow) - #148518 (Unify the configuration of the compiler docs) - #148523 (miri subtree update) - #148525 (Fix ICE from lit_to_mir_constant caused by type error) - #148534 (Merge `Vec::push{,_mut}_within_capacity`) r? `@ghost` `@rustbot` modify labels: rollup

Rollup merge of #148440 - GuillaumeGomez:improve-search-code, r=notriddle [rustdoc search] Simplify itemTypes and filter "dependencies" We currently have a list of type filters, some constants to be able to index the list of type filters and finally a `switch` to include some types in a given filter (for example when we filter on `constant`, we also include `associatedconstant` items). r? ``@notriddle``

Rollup of 8 pull requests Successful merges: - rust-lang/rust#147994 (Deduplicate deprecation warning when using unit or tuple structs) - rust-lang/rust#148440 ([rustdoc search] Simplify itemTypes and filter "dependencies") - rust-lang/rust#148501 (triagebot: Create Zulip topics for libs backports) - rust-lang/rust#148517 (Remove no longer necessary lint allow) - rust-lang/rust#148518 (Unify the configuration of the compiler docs) - rust-lang/rust#148523 (miri subtree update) - rust-lang/rust#148525 (Fix ICE from lit_to_mir_constant caused by type error) - rust-lang/rust#148534 (Merge `Vec::push{,_mut}_within_capacity`) r? `@ghost` `@rustbot` modify labels: rollup

…iaskrgr Rollup of 8 pull requests Successful merges: - rust-lang#147994 (Deduplicate deprecation warning when using unit or tuple structs) - rust-lang#148440 ([rustdoc search] Simplify itemTypes and filter "dependencies") - rust-lang#148501 (triagebot: Create Zulip topics for libs backports) - rust-lang#148517 (Remove no longer necessary lint allow) - rust-lang#148518 (Unify the configuration of the compiler docs) - rust-lang#148523 (miri subtree update) - rust-lang#148525 (Fix ICE from lit_to_mir_constant caused by type error) - rust-lang#148534 (Merge `Vec::push{,_mut}_within_capacity`) r? `@ghost` `@rustbot` modify labels: rollup

Rollup of 8 pull requests Successful merges: - rust-lang/rust#147994 (Deduplicate deprecation warning when using unit or tuple structs) - rust-lang/rust#148440 ([rustdoc search] Simplify itemTypes and filter "dependencies") - rust-lang/rust#148501 (triagebot: Create Zulip topics for libs backports) - rust-lang/rust#148517 (Remove no longer necessary lint allow) - rust-lang/rust#148518 (Unify the configuration of the compiler docs) - rust-lang/rust#148523 (miri subtree update) - rust-lang/rust#148525 (Fix ICE from lit_to_mir_constant caused by type error) - rust-lang/rust#148534 (Merge `Vec::push{,_mut}_within_capacity`) r? `@ghost` `@rustbot` modify labels: rollup

rustbot added A-rustdoc-search Area: Rustdoc's search feature S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Nov 3, 2025

rustbot assigned notriddle Nov 3, 2025

rustbot added T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. T-rustdoc-frontend Relevant to the rustdoc-frontend team, which will review and decide on the web UI/UX output. labels Nov 3, 2025

notriddle reviewed Nov 5, 2025

View reviewed changes

[rustdoc search] Simplify itemTypes and filter "dependencies"

72d94d1

GuillaumeGomez force-pushed the improve-search-code branch from c11d24b to 72d94d1 Compare November 5, 2025 10:45

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Nov 5, 2025

This was referenced Nov 5, 2025

Rollup of 6 pull requests #148538

Closed

Rollup of 8 pull requests #148544

Merged

bors merged commit 54fa498 into rust-lang:master Nov 6, 2025
11 checks passed

rustbot added this to the 1.93.0 milestone Nov 6, 2025

GuillaumeGomez deleted the improve-search-code branch November 6, 2025 10:29

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

[rustdoc search] Simplify itemTypes and filter "dependencies"#148440