RustDoc: Fix bounds linking trait.Foo instead of traitalias.Foo #84811
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
rust-highfive
added
the
S-waiting-on-review
|
My review todo list:
|
jyn514
added
the
T-rustdoc
scottmcm
force-pushed
the
rustdoc-trait-alias-fix
branch
from
108e69f to
34bf237
Compare
scottmcm
force-pushed
the
rustdoc-trait-alias-fix
branch
from
34bf237 to
fe540ae
Compare
GuillaumeGomez
approved these changes
May 2, 2021
jyn514
reviewed
May 2, 2021
There was a problem hiding this comment.
I haven't had time to do all the things on #84811 (comment), but I think we can land this in the meantime. Just a couple nits.
| } | ||
| } | ||
| clean::PrimitiveItem(..) => { | ||
| self.cache.paths.insert(item.def_id, (self.cache.stack.clone(), item.type_())); | ||
| } | ||
|
|
||
| _ => {} | ||
| clean::ExternCrateItem { .. } |
There was a problem hiding this comment.
This seems to work ok as a re-export:
I don't think extern crates can show up anywhere else, so this seems fine for now.
| _ => {} | ||
| clean::ExternCrateItem { .. } | ||
| | clean::ImportItem(..) | ||
| | clean::OpaqueTyItem(..) |
There was a problem hiding this comment.
Oh, is this one TAIT? I would have guessed https://doc.rust-lang.org/nightly/unstable-book/language-features/extern-types.html
But overall, I'd like to leave the match as-is for this PR, if that's ok. Then someone else can audit them later and move them to different sections with comments about why they're ok to be skipped, or whatever.
jyn514
added
S-waiting-on-author
jyn514
reviewed
May 2, 2021
This comment has been minimized.
This comment has been minimized.
scottmcm
force-pushed
the
rustdoc-trait-alias-fix
branch
from
1c7136e to
40ffa94
Compare
scottmcm
commented
May 2, 2021
|
@bors r+ |
|
📌 Commit 40ffa94 has been approved by |
bors
added
S-waiting-on-bors
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
May 3, 2021
Rollup of 6 pull requests Successful merges: - rust-lang#84072 (Allow setting `target_family` to multiple values, and implement `target_family="wasm"`) - rust-lang#84744 (Add ErrorKind::OutOfMemory) - rust-lang#84784 (Add help message to suggest const for unused type param) - rust-lang#84811 (RustDoc: Fix bounds linking trait.Foo instead of traitalias.Foo) - rust-lang#84818 (suggestion for unit enum variant when matched with a patern) - rust-lang#84832 (Do not print visibility in external traits) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
May 18, 2021
Implement the new desugaring from `try_trait_v2` ~~Currently blocked on rust-lang#84782, which has a PR in rust-lang#84811 Rebased atop that fix. `try_trait_v2` tracking issue: rust-lang#84277 Unfortunately this is already touching a ton of things, so if you have suggestions for good ways to split it up, I'd be happy to hear them. (The combination between the use in the library, the compiler changes, the corresponding diagnostic differences, even MIR tests mean that I don't really have a great plan for it other than trying to have decently-readable commits. r? `@ghost` ~~(This probably shouldn't go in during the last week before the fork anyway.)~~ Fork happened.
flip1995
pushed a commit
to flip1995/rust-clippy
that referenced
this pull request
May 20, 2021
Implement the new desugaring from `try_trait_v2` ~~Currently blocked on rust-lang/rust#84782, which has a PR in rust-lang/rust#84811 Rebased atop that fix. `try_trait_v2` tracking issue: rust-lang/rust#84277 Unfortunately this is already touching a ton of things, so if you have suggestions for good ways to split it up, I'd be happy to hear them. (The combination between the use in the library, the compiler changes, the corresponding diagnostic differences, even MIR tests mean that I don't really have a great plan for it other than trying to have decently-readable commits. r? `@ghost` ~~(This probably shouldn't go in during the last week before the fork anyway.)~~ Fork happened.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #84782
The code was assuming
Traitwhen adding bounds to the cache, so add a check on the DefId to see what its kind really is.r? @jyn514
Before:
After:
