Fix macro_rules! duplication when reexported in the same module #89867
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
This can append if within the same module a `#[macro_export] macro_rules!` is declared but also a reexport of itself producing two export of the same macro in the same module. In that case we only want to document it once.
|
r? @ollie27 (rust-highfive has picked a reviewer for you, use r? to override) |
rust-highfive
added
the
S-waiting-on-review
This comment has been minimized.
This comment has been minimized.
camelid
reviewed
Oct 14, 2021
camelid
added
the
T-rustdoc
Urgau
commented
Oct 15, 2021
Co-authored-by: Guillaume Gomez <[email protected]>
camelid
reviewed
Oct 15, 2021
Comment on lines
+6
to
+7
| // @matches 'issue_89852/sidebar-items.js' '"repro"' | ||
| // @!matches 'issue_89852/sidebar-items.js' '"repro".*"repro"' |
There was a problem hiding this comment.
Shouldn't repro2 be showing up in the sidebar as well?
There was a problem hiding this comment.
Maybe, but this would be a pre-existing issue that my PR does not try to solve.
There was a problem hiding this comment.
Can't you use count instead to ensure there is only 1 repro? I'm really not a big fan of negative checks.
There was a problem hiding this comment.
Maybe, but this would be a pre-existing issue that my PR does not try to solve.
Hmm, I wonder if they are related issues though: #89852 (comment)
There was a problem hiding this comment.
Can't you use count instead to ensure there is only 1
repro? I'm really not a big fan of negative checks.
Unfortunately no because it's a javascript and XPath doesn't work on them.
There was a problem hiding this comment.
I guess it'll be enough for now then. It would have been much simpler to check using rustdoc-gui though... :-/
|
@bors: r+ |
|
📌 Commit db5b64a has been approved by |
bors
added
S-waiting-on-bors
pietroalbini
added
beta-accepted
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Oct 18, 2021
Rust 1.56.0 stable release This PR bumps 1.56.0 to the stable channel. This also includes a backport for: * Latest changes to the release notes * rust-lang#89867 r? `@ghost` cc `@rust-lang/release`
matthiaskrgr
added a commit
to matthiaskrgr/rust
that referenced
this pull request
Oct 18, 2021
…laumeGomez
Fix macro_rules! duplication when reexported in the same module
This can append if within the same module a `#[macro_export] macro_rules!`
is declared but also a reexport of itself producing two export of the same
macro in the same module. In that case we only want to document it once.
Before:
```
Module {
is_crate: true,
items: [
Id("0:4"), // pub use crate::repro as repro2;
Id("0:3"), // macro_rules! repro
Id("0:3"), // duplicate, same as above
],
}
```
After:
```
Module {
is_crate: true,
items: [
Id("0:4"), // pub use crate::repro as repro2;
Id("0:3"), // macro_rules! repro
],
}
```
Fixes rust-lang#89852
This was referenced Oct 18, 2021
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Oct 19, 2021
…askrgr Rollup of 8 pull requests Successful merges: - rust-lang#89766 (RustWrapper: adapt for an LLVM API change) - rust-lang#89867 (Fix macro_rules! duplication when reexported in the same module) - rust-lang#89941 (removing TLS support in x86_64-unknown-none-hermitkernel) - rust-lang#89956 (Suggest a case insensitive match name regardless of levenshtein distance) - rust-lang#89988 (Do not promote values with const drop that need to be dropped) - rust-lang#89997 (Add test for issue rust-lang#84957 - `str.as_bytes()` in a `const` expression) - rust-lang#90002 (:arrow_up: rust-analyzer) - rust-lang#90034 (Tiny tweak to Iterator::unzip() doc comment example.) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Mark-Simulacrum
removed
the
beta-nominated
Merged
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Oct 22, 2021
…ulacrum [beta] backports * Don't emit a warning for empty rmeta files. rust-lang#90072 * Erase late-bound regions before computing vtable debuginfo name. rust-lang#90050 * Fix wrong niche calculation when 2+ niches are placed at the start rust-lang#90040 * Revert rust-lang#86011 to fix an incorrect bound check rust-lang#90025 * Fix macro_rules! duplication when reexported in the same module rust-lang#89867 * Bump cargo to include rust-lang/cargo#9979 - Fix fetching git repos after a force push. r? `@Mark-Simulacrum`
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.
This can append if within the same module a
#[macro_export] macro_rules!is declared but also a reexport of itself producing two export of the same
macro in the same module. In that case we only want to document it once.
Before:
After:
Fixes #89852