Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Remove even more instances of @ts-expect-error from search.js #138913

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 16 commits into from
Apr 2, 2025
Merged

Remove even more instances of @ts-expect-error from search.js #138913

Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
c123adf
rustdoc js: add nonundef and use it to remove a ts-expect-error
lolbinarycat Mar 24, 2025
ccd95ac
search.js: improve typechecking by avoiding Map.has
lolbinarycat Mar 24, 2025
e9a5470
search.js: refactor handling of rawPaths in buildIndex
lolbinarycat Mar 24, 2025
49bf6ca
search.js: add undef2null and eliminate more @ts-expect-error
lolbinarycat Mar 24, 2025
1af16cd
search.js(query parser): rethrow error if it isn't a string array
lolbinarycat Mar 24, 2025
8af647c
search.js: remove another Map.has() and @ts-expect-error
lolbinarycat Mar 24, 2025
714be45
search.js: refactor transformResults
lolbinarycat Mar 24, 2025
ca514c1
search.js: fix signature of pushText
lolbinarycat Mar 24, 2025
7f14198
search.js: use @type instead of @ts-expect-error
lolbinarycat Mar 24, 2025
3245e7b
search.js: fix return type of unifyFunctionTypes
lolbinarycat Mar 24, 2025
4a00a84
search.js: give type to unifiedGenericsMgens
lolbinarycat Mar 24, 2025
523f413
search.js: give type annotation to newSolutions
lolbinarycat Mar 24, 2025
1b8b09a
search.js: fix whitespace
lolbinarycat Mar 25, 2025
74b7599
satisfy eslint
lolbinarycat Mar 27, 2025
65624d9
tester.js: ignore displayTypeSignature if it is null
lolbinarycat Mar 27, 2025
d487087
search.js: revert usage of nonundef for now (not available under test)
lolbinarycat Mar 27, 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
Prev Previous commit
Next Next commit
search.js: fix signature of pushText
  • Loading branch information
@lolbinarycat
lolbinarycat committed Mar 24, 2025
commit ca514c1a13b419606fe051ec897a25a07dc7aa26
14 changes: 5 additions & 9 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 @@ -2901,7 +2901,7 @@ class DocSearch {
const whereClause = new Map();

const fnParamNames = obj.paramNames || [];
// @ts-expect-error
/** @type {string[]} */
const queryParamNames = [];
/**
* Recursively writes a map of IDs to query generic names,
Expand Down Expand Up @@ -2934,7 +2934,7 @@ class DocSearch {
* index 2 is not highlighted, etc.
*
* @param {{name?: string, highlighted?: boolean}} fnType - input
* @param {[string]} result
* @param {string[]} result
*/
const pushText = (fnType, result) => {
// If !!(result.length % 2) == false, then pushing a new slot starts an even
Expand All @@ -2946,7 +2946,6 @@ class DocSearch {
// needs coerced to a boolean.
if (!!(result.length % 2) === !!fnType.highlighted) {
result.push("");
// @ts-expect-error
} else if (result.length === 0 && !!fnType.highlighted) {
result.push("");
result.push("");
Expand All @@ -2960,7 +2959,7 @@ class DocSearch {
* or a trait bound on Fn, FnMut, or FnOnce.
*
* @param {rustdoc.HighlightedFunctionType} fnType - input
* @param {[string]} result
* @param {string[]} result
*/
const writeHof = (fnType, result) => {
const hofOutput = fnType.bindings.get(this.typeNameIdOfOutput) || [];
Expand Down Expand Up @@ -3000,7 +2999,7 @@ class DocSearch {
* Returns `false` if the supplied type isn't special.
*
* @param {rustdoc.HighlightedFunctionType} fnType
* @param {[string]} result
* @param {string[]} result
*/
const writeSpecialPrimitive = (fnType, result) => {
if (fnType.id === this.typeNameIdOfArray || fnType.id === this.typeNameIdOfSlice ||
Expand Down Expand Up @@ -3047,7 +3046,7 @@ class DocSearch {
* updating the where clause and generic type param map.
*
* @param {rustdoc.HighlightedFunctionType} fnType
* @param {[string]} result
* @param {string[]} result
*/
const writeFn = (fnType, result) => {
if (fnType.id !== null && fnType.id < 0) {
Expand All @@ -3065,7 +3064,6 @@ class DocSearch {
for (const [queryId, fnId] of mgens) {
if (fnId === fnType.id) {
mappedNames.set(
// @ts-expect-error
queryParamNames[-1 - queryId],
fnParamNames[-1 - fnType.id],
);
Expand All @@ -3080,7 +3078,6 @@ class DocSearch {
const where = [];
onEachBtwn(
fnType.generics,
// @ts-expect-error
nested => writeFn(nested, where),
// @ts-expect-error
() => pushText({ name: " + ", highlighted: false }, where),
Expand Down Expand Up @@ -3115,7 +3112,6 @@ class DocSearch {
// shown in the where clause and name mapping output, but is
// redundant in this spot
for (const value of values) {
// @ts-expect-error
writeFn(value, []);
}
return true;
Expand Down