Uh oh!
There was an error while loading. Please reload this page.
Fix bug where private item with intermediate doc hidden re-export was not inlined - #112178
Merged
bors merged 3 commits intoJun 4, 2023
Merged
Conversation
This comment has been minimized.
This comment has been minimized.
MemberAuthor
Fixed CI. |
Uh oh!
There was an error while loading. Please reload this page.
GuillaumeGomezforce-pushed
the
fix-inline-private-intermediate
branch
from
June 3, 2023 17:57
ca8a476 to
d029800CompareGuillaumeGomez
commented
Jun 3, 2023
MemberAuthor
Applied suggestion. |
notriddle
commented
Jun 3, 2023
Contributor
@bors r+ rollup |
bors
commented
Jun 3, 2023
Collaborator
matthiaskrgr added a commit
to matthiaskrgr/rust
that referenced
this pull request
Jun 4, 2023
…intermediate, r=notriddle
Fix bug where private item with intermediate doc hidden re-export was not inlined
This fixes this bug:
```rust
mod private {
/// Original.
pub struct Bar3;
}
/// Hidden.
#[doc(hidden)]
pub use crate::private::Bar3;
/// Visible.
pub use self::Bar3 as Reexport;
```
In this case, `private::Bar3` should be inlined and renamed `Reexport` but instead we have:
```
pub use self::Bar3 as Reexport;
```
and no links.
There were actually two issues: the first one is that we forgot to check if the next intermediate re-export was doc hidden. The second was that we made the `#[doc(hidden)]` attribute inheritable, which shouldn't be possible.
r? `@notriddle`matthiaskrgr
commented
Jun 4, 2023
Member
@bors r- might cause stack overflow here? #112264 (comment) |
matthiaskrgr
commented
Jun 4, 2023
Member
bors
commented
Jun 4, 2023
Collaborator
bors added a commit
to rust-lang-ci/rust
that referenced
this pull request
Jun 4, 2023
…iaskrgr Rollup of 6 pull requests Successful merges: - rust-lang#109093 (add `#[doc(alias="flatmap")]` to `Option::and_then`) - rust-lang#110701 (Fix `x test core` when download-rustc is enabled) - rust-lang#111982 (Revert "Enable incremental independent of stage") - rust-lang#112158 (Add portable-simd mention) - rust-lang#112172 (doc: improve explanation) - rust-lang#112178 (Fix bug where private item with intermediate doc hidden re-export was not inlined) r? `@ghost` `@rustbot` modify labels: rollup
matthiaskrgr added a commit
to matthiaskrgr/rust
that referenced
this pull request
Jun 15, 2023
…ddle Add chapter in rustdoc book for re-exports and add a regression test for `#[doc(hidden)]` behaviour Fixesrust-lang#109449. Fixesrust-lang#53417. After the discussion in rust-lang#109697, I made a few PRs to fix a few corner cases: * rust-lang#112178 * rust-lang#112108 * rust-lang#111997 With this I think I covered all cases. Only thing missing at this point was a chapter covering re-exports in the rustdoc book. r? `@notriddle`
This file contains hidden or 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
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
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.
This fixes this bug:
In this case,
private::Bar3should be inlined and renamedReexportbut instead we have:and no links.
There were actually two issues: the first one is that we forgot to check if the next intermediate re-export was doc hidden. The second was that we made the
#[doc(hidden)]attribute inheritable, which shouldn't be possible.r? @notriddle