Prevent some attributes from being merged with others on reexports #108057
Conversation
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
rustbot
added
S-waiting-on-review
GuillaumeGomez
force-pushed
the
fix-reexport-attr-merge
branch
from
e420651 to
f0f4ccb
Compare
notriddle
requested changes
Feb 14, 2023
This comment has been minimized.
This comment has been minimized.
GuillaumeGomez
force-pushed
the
fix-reexport-attr-merge
branch
from
f0f4ccb to
9927f12
Compare
|
Updated, thanks for the ideas! |
…ly for items with a path of 1 element
notriddle
reviewed
Feb 14, 2023
This comment has been minimized.
This comment has been minimized.
…se `#[doc(inline)]`
GuillaumeGomez
force-pushed
the
fix-reexport-attr-merge
branch
from
9927f12 to
374f798
Compare
|
The last commit fixes the handling of reexports of |
|
@bors r+ |
bors
added
S-waiting-on-bors
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Feb 16, 2023
…iaskrgr Rollup of 7 pull requests Successful merges: - rust-lang#106347 (More accurate spans for arg removal suggestion) - rust-lang#108057 (Prevent some attributes from being merged with others on reexports) - rust-lang#108090 (`if $c:expr { Some($r:expr) } else { None }` =>> `$c.then(|| $r)`) - rust-lang#108092 (note issue for feature(packed_bundled_libs)) - rust-lang#108099 (use chars instead of strings where applicable) - rust-lang#108115 (Do not ICE on unmet trait alias bounds) - rust-lang#108125 (Add new people to the compiletest review rotation) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 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.
Final fix for #59368.
As discussed on zulip here, we need to clone the
Attributeto be able to filter some parts of it. Then we need to go through the attributes to be able to only keep what we want (everything except a few attributes in short).As for the second commit, when I wrote the test, I realized that the code to traverse all reexports one by one to collect all their attributes was not completely working so I fixed the few issues remaining.
r? @notriddle