[beta] backports - #160714
Open
cuviper wants to merge 10 commits into
Open
Conversation
(cherry picked from commit facc787)
(cherry picked from commit cb797b8)
fastmod --fixed-strings '#[splat]' '#[rustc_splat]'
fastmod --fixed-strings '`splat` attribute' '`rustc_splat` attribute'
fastmod --fixed-strings '$splat$' '$rustc_splat$'
fastmod 'v0(.*)#\[rustc_splat\]' 'v0${1}#[splat]' tests/ui/splat/splat-mangling.rs
(cherry picked from commit e574edf)
This comment has been minimized.
This comment has been minimized.
(cherry picked from commit bc1bb27)
Mitigation for [RUST-159429]. The recurring problem is that built-in attributes are treated differently compared to ordinary prelude attributes, built-in attributes, even while unstable, can name-collide with stable macro re-exports of the same name (and proc-macro helper attributes of the same name), which can break stable code. See [RUST-134964]. [RUST-159429]: rust-lang#159429 [RUST-134963]: rust-lang#134963 (cherry picked from commit 0a0f6df)
(cherry picked from commit 44d291e)
To account for the renamed `#[rustc_unroll]` attribute. (cherry picked from commit 91ee1f3)
This stderr diff is a funny side-effect of renaming `#[unroll]` => `#[rustc_unroll]`, where the `#[rustc_unknown]` attribute name is just similar enough edit distance wise to `#[rustc_unroll]` that `#[rustc_unroll]` shows up as a plausible suggestion candidate, lol. (cherry picked from commit 945d2f3)
(cherry picked from commit d1265b7)
Collaborator
|
Member
Author
|
@bors r+ rollup=never p=1 |
Contributor
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.
cfg_select!rustfmt: Discover modules viacfg_select!#158372#[unroll]=>#[rustc_unroll]to mitigate nameres ambiguity Rename#[unroll]=>#[rustc_unroll]to mitigate nameres ambiguity #160211r? me