rustdoc: avoid inlining items with duplicate (type, name)#99344
Merged
bors merged 1 commit intorust-lang:masterfrom Jul 18, 2022
Merged
Conversation
rustbot
added
the
T-rustdoc
Contributor
|
r? @jsha (rust-highfive has picked a reviewer for you, use r? to override) |
rust-highfive
added
the
S-waiting-on-review
notriddle
changed the title
This comment has been minimized.
This comment has been minimized.
notriddle
force-pushed
the
notriddle/multiple-macro-rules-w-same-name
branch
from
5028d98 to
8bc4099
Compare
notriddle
changed the title
(type, name)
notriddle
force-pushed
the
notriddle/multiple-macro-rules-w-same-name
branch
from
8bc4099 to
c822183
Compare
GuillaumeGomez
approved these changes
Jul 18, 2022
Member
|
Thanks! @bors r+ |
Collaborator
bors
added
S-waiting-on-bors
jyn514
reviewed
Jul 18, 2022
Comment on lines
+61
to
+65
| // Split up imports from all other items. | ||
| // | ||
| // This covers the case where somebody does an import which should pull in an item, | ||
| // but there's already an item with the same namespace and same name. Rust gives | ||
| // priority to the not-imported one, so we should, too. |
Member
There was a problem hiding this comment.
I'd suggest mentioning this is specifically about glob imports. For normal imports, the resolver gives an error that you have duplicate items: https://play.rust-lang.org/?version=stable&mode=debug&edition=2021&gist=130848897ca4a33ebafad5fa75ae8884
error[E0255]: the name `S` is defined multiple times
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Jul 18, 2022
Rollup of 7 pull requests Successful merges: - rust-lang#98839 (Add assertion that `transmute_copy`'s U is not larger than T) - rust-lang#98998 (Remove branch target prologues from `#[naked] fn`) - rust-lang#99198 (add missing null ptr check in alloc example) - rust-lang#99344 (rustdoc: avoid inlining items with duplicate `(type, name)`) - rust-lang#99351 (Use `typeck_results` to get accurate qpath res for arg mismatch error) - rust-lang#99378 (interpret/visitor: add missing early return) - rust-lang#99394 (Add regression test for rust-lang#95230) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Mark-Simulacrum
added
the
beta-nominated
Contributor
|
I'll go ahead and expedite "approve" the beta. As discussed in a past T-compiler meeting (Zulip notes), these small T-rustdoc changes don't probably need them to approve. Let me know if I am overlooking any established procedures :) @rustbot label +beta-accepted |
rustbot
added
the
beta-accepted
ehuss
removed
the
beta-nominated
ehuss
pushed a commit
to ehuss/rust
that referenced
this pull request
Jul 22, 2022
…rules-w-same-name, r=GuillaumeGomez rustdoc: avoid inlining items with duplicate `(type, name)` Fixes rust-lang#99221
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Jul 22, 2022
[beta] Beta 1.63 backports * Reference: Revert $$ macro_metavar rust-lang/reference#1192 * Revert "Stabilize $$ in Rust 1.63.0" rust-lang#99435 * rustdoc: avoid inlining items with duplicate `(type, name)` rust-lang#99344 * Do not call `check_expr` twice in `check_compatible` rust-lang#99397
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
11 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.
Fixes #99221