rustdoc: Fix missing private inlining#109259
Merged
bors merged 2 commits intorust-lang:masterfrom Mar 20, 2023
Merged
Conversation
notriddle
reviewed
Mar 17, 2023
2 tasks
84c1a61 to
e9f29c4
Compare
Member
Author
|
@notriddle Good catch. I was able to reproduce the bug with inline module. Updated the test. |
Contributor
|
@bors r+ rollup |
Collaborator
matthiaskrgr
added a commit
to matthiaskrgr/rust
that referenced
this pull request
Mar 17, 2023
…-inlining, r=notriddle rustdoc: Fix missing private inlining Fixes rust-lang#109258. If the item isn't inlined, it shouldn't have been added into `view_item_stack`. The problem here was that it was not removed, preventing sub items to be inlined if they have a re-export in "upper levels". cc `@epage` r? `@notriddle`
matthiaskrgr
added a commit
to matthiaskrgr/rust
that referenced
this pull request
Mar 17, 2023
…-inlining, r=notriddle rustdoc: Fix missing private inlining Fixes rust-lang#109258. If the item isn't inlined, it shouldn't have been added into `view_item_stack`. The problem here was that it was not removed, preventing sub items to be inlined if they have a re-export in "upper levels". cc ``@epage`` r? ``@notriddle``
matthiaskrgr
added a commit
to matthiaskrgr/rust
that referenced
this pull request
Mar 17, 2023
…-inlining, r=notriddle rustdoc: Fix missing private inlining Fixes rust-lang#109258. If the item isn't inlined, it shouldn't have been added into `view_item_stack`. The problem here was that it was not removed, preventing sub items to be inlined if they have a re-export in "upper levels". cc ```@epage``` r? ```@notriddle```
Member
|
@bors r- |
Member
Author
|
It's the only rustdoc PR in the rollup but I can't reproduce the CI failure locally and I don't really see why this test in particular would now fail. Quite surprising... Maybe it's a mix with another PR in the rollup that gave this result? |
Member
Author
|
I really can't figure out from my tests how it could make this error. Let's retry then. @bors r=notriddle |
Collaborator
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Mar 20, 2023
…iaskrgr Rollup of 13 pull requests Successful merges: - rust-lang#109249 (Update names/comments for new return-position impl trait in trait lowering strategy) - rust-lang#109259 (rustdoc: Fix missing private inlining) - rust-lang#109269 (rustdoc: cleanup some intermediate allocs) - rust-lang#109301 (fix: fix ICE in `custom-test-frameworks` feature) - rust-lang#109319 (Add test for `c_variadic` in rustdoc-json) - rust-lang#109323 (Ignore files in .gitignore in mir opt check) - rust-lang#109331 (rustdoc: implement bag semantics for function parameter search) - rust-lang#109337 (Improve `Iterator::collect_into` documentation) - rust-lang#109351 (rustdoc: Remove footnote references from doc summary) - rust-lang#109353 (Fix wrong crate name in custom MIR docs) - rust-lang#109362 (Split `items` from `-Zmeta-stats` in two.) - rust-lang#109370 (fix ClashingExternDeclarations lint ICE) - rust-lang#109375 (rustdoc: Fix improper escaping of deprecation reasons) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
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 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 #109258.
If the item isn't inlined, it shouldn't have been added into
view_item_stack. The problem here was that it was not removed, preventing sub items to be inlined if they have a re-export in "upper levels".cc @epage
r? @notriddle