Skip to content
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.

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

fix(rustdoc): generics search #86659

Merged
merged 1 commit into from
Jul 2, 2021

Conversation

notriddle
Copy link
Contributor

@notriddle notriddle commented Jun 27, 2021

This commit adds a test case for generics, re-adds generics data
to the search index, and tweaks function indexing to use less space in JSON.

This partially reverts commit 14ca894.

@rust-highfive
Copy link
Collaborator

Some changes occurred in HTML/CSS/JS.

cc @GuillaumeGomez

@rust-highfive
Copy link
Collaborator

r? @CraftSpider

(rust-highfive has picked a reviewer for you, use r? to override)

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jun 27, 2021
@notriddle
Copy link
Contributor Author

r? @GuillaumeGomez #86648

@rust-log-analyzer

This comment has been minimized.

@notriddle notriddle force-pushed the notriddle/generics-rustdoc branch from ca85dbc to a2b9665 Compare June 28, 2021 03:58
@notriddle
Copy link
Contributor Author

@rustbot label: +A-rustdoc-js

@rustbot rustbot added the A-rustdoc-js Area: Rustdoc's JS front-end label Jun 28, 2021
@GuillaumeGomez GuillaumeGomez added the T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. label Jun 28, 2021
@GuillaumeGomez
Copy link
Member

Overall looks good to me, thanks a lot for this fix! Just one thing: you can put multiple search index tests into one file (like it's done in here). I made this comment because: can you add a test where you only look for the generic parameter please?

@GuillaumeGomez
Copy link
Member

Also: I'll need to make a perf run because some types' increased, so we have a track of it.

@notriddle
Copy link
Contributor Author

I made this comment because: can you add a test where you only look for the generic parameter please?

Sure. generics and generics-trait now both check with the "just the parameter" case.

@rust-log-analyzer

This comment has been minimized.

@notriddle notriddle force-pushed the notriddle/generics-rustdoc branch from 7c9b8ff to 24c7178 Compare June 28, 2021 20:35
JohnTitor added a commit to JohnTitor/rust that referenced this pull request Jun 30, 2021
…=notriddle

Fix rustdoc query type filter

I realized while reviewing rust-lang#86659 that the type filter was broken on search so I'd prefer it to get merged before merging rust-lang#86659.

r? `@notriddle`
@GuillaumeGomez
Copy link
Member

Can you rebase on master now that #86746 was merged please?

This commit adds a test case for generics, re-adds generics data
to the search index, and tweaks function indexing to use less space in JSON.

This reverts commit 14ca894.
@notriddle notriddle force-pushed the notriddle/generics-rustdoc branch from 797d3a8 to cedd242 Compare July 1, 2021 13:58
@notriddle
Copy link
Contributor Author

@GuillaumeGomez kay, it's rebased

@GuillaumeGomez
Copy link
Member

Thanks! Considering that the number of changes on the rustdoc "backend" side is now very small, I don't think we need to run a perf check anymore. r=me once CI pass.

@notriddle
Copy link
Contributor Author

@bors r=GuillaumeGomez

@bors
Copy link
Contributor

bors commented Jul 1, 2021

@notriddle: 🔑 Insufficient privileges: Not in reviewers

@GuillaumeGomez
Copy link
Member

@bors: r+

@bors
Copy link
Contributor

bors commented Jul 1, 2021

📌 Commit cedd242 has been approved by GuillaumeGomez

@bors 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 Jul 1, 2021
JohnTitor added a commit to JohnTitor/rust that referenced this pull request Jul 1, 2021
…c, r=GuillaumeGomez

fix(rustdoc): generics search

This commit adds a test case for generics, re-adds generics data
to the search index, and tweaks function indexing to use less space in JSON.

This partially reverts commit 14ca894.
bors added a commit to rust-lang-ci/rust that referenced this pull request Jul 1, 2021
Rollup of 7 pull requests

Successful merges:

 - rust-lang#86148 (Check the number of generic lifetime and const parameters of intrinsics)
 - rust-lang#86659 (fix(rustdoc): generics search)
 - rust-lang#86768 (Add myself to mailmap)
 - rust-lang#86775 (Test for const trait impls behind feature gates)
 - rust-lang#86779 (Allow anyone to add or remove any label starting with perf-)
 - rust-lang#86783 (Move Mutex::unlock to T: ?Sized)
 - rust-lang#86785 (proc_macro/bridge: Remove dead code Slice type)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 45a3cd5 into rust-lang:master Jul 2, 2021
@rustbot rustbot added this to the 1.55.0 milestone Jul 2, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-rustdoc-js Area: Rustdoc's JS front-end S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants