rustdoc: convert if let Some() that always matches to variable
#112251
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
|
(rustbot has picked a reviewer for you, use r? to override) |
rustbot
added
S-waiting-on-review
src/librustdoc/visit_ast.rs
Outdated
| @@ -290,27 +290,29 @@ impl<'a, 'tcx> RustdocVisitor<'a, 'tcx> { | |||
|
|
|||
| if !please_inline { | |||
| let inherits_hidden = inherits_doc_hidden(tcx, res_did, None); | |||
| let item_def_id = reexport_chain(tcx, def_id, res_did) | |||
There was a problem hiding this comment.
This changes things a bit: reexport_chain and all the rest were only called if the item was private or was inheriting doc(hidden).
There was a problem hiding this comment.
I couldn't just use if let, because the first item in a chain isn't allowed to be irrefutable.
Maybe I should factor this out into its own function instead?
There was a problem hiding this comment.
That would also allow to make it easier to understand what's going on so big 👍
notriddle
force-pushed
the
notriddle/cleanup-inlining
branch
from
37bf05c
to
a59e20b
Compare
GuillaumeGomez
approved these changes
Jun 4, 2023
|
Thanks! |
|
@bors r+ rollup |
|
📌 Commit a59e20b0215748e77db496b2b5ea88ca0b16d260 has been approved by It is now in the queue for this repository. |
bors
added
S-waiting-on-bors
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Jun 4, 2023
…iaskrgr Rollup of 3 pull requests Successful merges: - rust-lang#112247 (rust-lld: add rpath entry to the correct `lib` folder) - rust-lang#112274 (Migrate GUI colors test to original CSS color format) - rust-lang#112277 (Don't require the output from libtest to be valid UTF-8) Failed merges: - rust-lang#112251 (rustdoc: convert `if let Some()` that always matches to variable) r? `@ghost` `@rustbot` modify labels: rollup
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Jun 5, 2023
…llaumeGomez Rollup of 6 pull requests Successful merges: - rust-lang#112243 (Remove unneeded `Buffer` allocations when `&mut fmt::Write` can be used directly) - rust-lang#112263 (Remove ExtendElement, ExtendWith, extend_with) - rust-lang#112291 (Disable RustAnalyzer check by default, run Rustfmt check before) - rust-lang#112299 (Don't double-print status messages in GHA) - rust-lang#112311 (Ignore fluent message reordering in `git blame`) - rust-lang#112315 (fix spelling error) Failed merges: - rust-lang#112251 (rustdoc: convert `if let Some()` that always matches to variable) r? `@ghost` `@rustbot` modify labels: rollup
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Jun 5, 2023
…iaskrgr Rollup of 6 pull requests Successful merges: - rust-lang#112081 (Avoid ICE on `#![doc(test(...)]` with literal parameter) - rust-lang#112196 (Resolve vars in result from `scrape_region_constraints`) - rust-lang#112303 (Normalize in infcx instead of globally for `Option::as_deref` suggestion) - rust-lang#112316 (Ensure space is inserted after keyword in `unused_delims`) - rust-lang#112318 (Merge method, type and const object safety checks) - rust-lang#112322 (Don't mention `IMPLIED_BOUNDS_ENTAILMENT` if signatures reference error) Failed merges: - rust-lang#112251 (rustdoc: convert `if let Some()` that always matches to variable) r? `@ghost` `@rustbot` modify labels: rollup
notriddle
force-pushed
the
notriddle/cleanup-inlining
branch
from
a59e20b
to
0f1aaef
Compare
notriddle
added
S-waiting-on-review
|
Didn't I already approve it? 😆 |
|
You did. It got a merge conflict, so I rebased it, and needed to manually merge in the changes (specifically, |
GuillaumeGomez
approved these changes
Jun 6, 2023
|
Oh I see. Sorry I completely missed that. @bors r+ rollup |
bors
added
S-waiting-on-bors
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Jun 7, 2023
Rollup of 6 pull requests Successful merges: - rust-lang#112076 (Fall back to bidirectional normalizes-to if no subst-relate candidate in alias-relate goal) - rust-lang#112122 (Add `-Ztrait-solver=next-coherence`) - rust-lang#112251 (rustdoc: convert `if let Some()` that always matches to variable) - rust-lang#112345 (fix(expand): prevent infinity loop in macro containing only "///") - rust-lang#112359 (Respect `RUST_BACKTRACE` for delayed bugs) - rust-lang#112382 (download-rustc: Fix `x test core` on MacOS) r? `@ghost` `@rustbot` modify labels: rollup
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.
No description provided.