bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

rustdoc-search: clean up checkPath

Browse source 
This computes the same result with less code by computing many of
the old checks at once:

* It won't enter the loop if clength > length, because then the
  result of length - clength will be negative and the
  loop conditional will fail.
* i + clength will never be greater than length, because it
  starts out as i = length - clength, implying that i + clength
  equals length, and it only goes down from there.
* The aborted variable is replaced with control flow.
This commit is contained in:
Michael Howell 2023-11-20 13:15:47 -07:00
parent 2f8d81f9db
commit d82a08537a
1 changed files with 3 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/librustdoc/html/static/js/search.js
View file

@ -1840,26 +1840,16 @@ function initSearch(rawSearchIndex) {
const length = path.length; const length = path.length;
const clength = contains.length; const clength = contains.length;
if (clength > length) { pathiter: for (let i = length - clength; i >= 0; i -= 1) {
return maxEditDistance + 1;
}
for (let i = 0; i < length; ++i) {
if (i + clength > length) {
break;
}
let dist_total = 0; let dist_total = 0;
let aborted = false;
for (let x = 0; x < clength; ++x) { for (let x = 0; x < clength; ++x) {
const dist = editDistance(path[i + x], contains[x], maxEditDistance); const dist = editDistance(path[i + x], contains[x], maxEditDistance);
if (dist > maxEditDistance) { if (dist > maxEditDistance) {
aborted = true; continue pathiter;
break;
} }
dist_total += dist; dist_total += dist;
} }
if (!aborted) { ret_dist = Math.min(ret_dist, Math.round(dist_total / clength));
ret_dist = Math.min(ret_dist, Math.round(dist_total / clength));
}
} }
return ret_dist; return ret_dist;
} }