Small adjustments to check_attribute_safety to make the logic more obvious#140619
Merged
bors merged 1 commit intorust-lang:masterfrom May 5, 2025
Merged
Small adjustments to check_attribute_safety to make the logic more obvious#140619bors merged 1 commit intorust-lang:masterfrom
check_attribute_safety to make the logic more obvious#140619bors merged 1 commit intorust-lang:masterfrom
Conversation
8d0848d to
86c8cce
Compare
Collaborator
|
☔ The latest upstream changes (presumably #140633) made this pull request unmergeable. Please resolve the merge conflicts. |
86c8cce to
e81c82d
Compare
Member
Author
Urgau
reviewed
May 4, 2025
Member
Author
|
@rustbot author |
Collaborator
|
Reminder, once the PR becomes ready for a review, use |
e81c82d to
eb3a8e5
Compare
Member
Author
|
Switched to |
jieyouxu
commented
May 4, 2025
Comment on lines
+232
to
+233
| Some(AttributeSafety::Unsafe { .. } | AttributeSafety::Normal) | None, | ||
| Safety::Safe(..), |
Member
Author
There was a problem hiding this comment.
Remark: the ast::Safety type is kinda weird, because it's dual-used by places where there can be {Safe, Unsafe, Default} (within extern {} blocks), and also other places where the Safety::Safe variant must be impossible (unsafe vs normal attributes).
Member
|
@bors r+ rollup |
Collaborator
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
May 4, 2025
Rollup of 6 pull requests Successful merges: - rust-lang#137280 (stabilize ptr::swap_nonoverlapping in const) - rust-lang#140457 (Use target-cpu=z13 on s390x codegen const vector test) - rust-lang#140619 (Small adjustments to `check_attribute_safety` to make the logic more obvious) - rust-lang#140625 (Suggest `retain_mut` over `retain` as `Vec::extract_if` alternative) - rust-lang#140627 (Allow linking rustc and rustdoc against the same single tracing crate) - rust-lang#140630 (Async drop source info fix for proxy-drop-coroutine) r? `@ghost` `@rustbot` modify labels: rollup
rust-timer
added a commit
to rust-lang-ci/rust
that referenced
this pull request
May 5, 2025
Rollup merge of rust-lang#140619 - jieyouxu:validate_attr_cleanups, r=Urgau Small adjustments to `check_attribute_safety` to make the logic more obvious Follow-up to rust-lang#140617.
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.
Follow-up to #140617.