Skip to content

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
@notriddle notriddle force-pushed the notriddle/where-clause branch from 0ecc6ac to 8965422 Compare March 4, 2023 03:36
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 notriddle force-pushed the notriddle/where-clause branch from 8965422 to 9d27028 Compare March 4, 2023 16:06
@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).


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
Collaborator

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
bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 4, 2023
…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
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
Development

Successfully merging this pull request may close these issues.

4 participants