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.

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

Jump to bottom

rustdoc: function signature search with traits in where clause #108723

Merged
merged 1 commit into from
Mar 5, 2023
Merged

rustdoc: function signature search with traits in where clause #108723

merged 1 commit into from
Mar 5, 2023

Conversation

notriddle
Copy link
Contributor

Before

image

After

image

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. labels Mar 4, 2023
GuillaumeGomez
GuillaumeGomez reviewed Mar 4, 2023
View reviewed changes
Copy link
Member

@GuillaumeGomez GuillaumeGomez left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me, thanks! Please add more tested in rustdoc-js for the feature to be more strictly tested.

@notriddle
Copy link
Contributor Author

@GuillaumeGomez You're right. I did manage to find another problem.

Here's a new test case and fix for where clause handling (it was trying to get the def_id for a Type::Generic, which always returns None, so it only ever did anything with the first where bound).

GuillaumeGomez
GuillaumeGomez reviewed Mar 4, 2023
View reviewed changes
tests/rustdoc-js/where-clause.rs

pub fn abracadabra<X>(_: X) where X: Trait<Nested> {}

pub fn alacazam<X>() -> X where X: Trait<Nested> {}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pokemon reference? 🤣

@GuillaumeGomez
Copy link
Member

Looks good to me now, thanks! If you think there is no more testing remaining to be done, then r=me.

@notriddle
Copy link
Contributor Author

@bors r=GuillaumeGomez rollup

@bors
Copy link
Contributor

bors commented Mar 4, 2023

📌 Commit 9d27028 has been approved by GuillaumeGomez

It is now in the queue for this repository.

@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 Mar 4, 2023
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Mar 4, 2023
@matthiaskrgr
Rollup merge of rust-lang#108723 - notriddle:notriddle/where-clause, …
6c9a99e 
…r=GuillaumeGomez

rustdoc: function signature search with traits in `where` clause

## Before

![image](https://user-images.githubusercontent.com/1593513/222873534-a640a72a-c654-4702-9f3b-175129d9591d.png)

## After

![image](https://user-images.githubusercontent.com/1593513/222873544-fdfc431d-2b65-4b56-bede-0302ea9f153a.png)
@matthiaskrgr matthiaskrgr mentioned this pull request Mar 4, 2023
Closed
@matthiaskrgr matthiaskrgr mentioned this pull request Mar 4, 2023
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 4, 2023
@bors
Auto merge of rust-lang#108747 - matthiaskrgr:rollup-wfc7fx4, r=matth…
bb18388 
…iaskrgr

Rollup of 7 pull requests

Successful merges:

 - rust-lang#108627 (Properly colorize multi-part suggestions in the same line)
 - rust-lang#108632 (Omit unchanged options from config.toml in `configure.py`)
 - rust-lang#108715 (Remove unclosed_delims from parser)
 - rust-lang#108723 (rustdoc: function signature search with traits in `where` clause)
 - rust-lang#108724 (field is not used outside the crate)
 - rust-lang#108734 (rustdoc: Note in a type's layout/size if it is uninhabited)
 - rust-lang#108736 (Remove `allow(potential_query_instability)` from `ast_passes`)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 9cabc40 into rust-lang:master Mar 5, 2023
@rustbot rustbot added this to the 1.69.0 milestone Mar 5, 2023
@notriddle notriddle deleted the notriddle/where-clause branch March 5, 2023 02:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@GuillaumeGomez GuillaumeGomez GuillaumeGomez approved these changes

Assignees

@GuillaumeGomez GuillaumeGomez

Labels
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
Milestone
1.69.0
Development

Successfully merging this pull request may close these issues.
4 participants
@notriddle @GuillaumeGomez @bors @rustbot