Skip to content

Conversation

jieyouxu
Copy link
Member

@jieyouxu jieyouxu commented May 3, 2025

Follow-up to #140617.

@jieyouxu jieyouxu added the S-blocked Status: Blocked on something else such as an RFC or other implementation work. label May 3, 2025
@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels May 3, 2025
@jieyouxu jieyouxu removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label May 3, 2025
@jieyouxu jieyouxu force-pushed the validate_attr_cleanups branch from 8d0848d to 86c8cce Compare May 3, 2025 15:08
@bors
Copy link
Collaborator

bors commented May 4, 2025

☔ The latest upstream changes (presumably #140633) made this pull request unmergeable. Please resolve the merge conflicts.

@jieyouxu jieyouxu force-pushed the validate_attr_cleanups branch from 86c8cce to e81c82d Compare May 4, 2025 11:13
@jieyouxu jieyouxu marked this pull request as ready for review May 4, 2025 11:15
@jieyouxu
Copy link
Member Author

jieyouxu commented May 4, 2025

r? @Urgau
@rustbot ready

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-blocked Status: Blocked on something else such as an RFC or other implementation work. labels May 4, 2025
@jieyouxu
Copy link
Member Author

jieyouxu commented May 4, 2025

@rustbot author

@rustbot rustbot added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels May 4, 2025
@rustbot
Copy link
Collaborator

rustbot commented May 4, 2025

Reminder, once the PR becomes ready for a review, use @rustbot ready.

@jieyouxu jieyouxu force-pushed the validate_attr_cleanups branch from e81c82d to eb3a8e5 Compare May 4, 2025 13:54
@jieyouxu
Copy link
Member Author

jieyouxu commented May 4, 2025

Switched to span_delayed_bug.
@rustbot ready

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels May 4, 2025
Comment on lines +232 to +233
Some(AttributeSafety::Unsafe { .. } | AttributeSafety::Normal) | None,
Safety::Safe(..),
Copy link
Member Author

@jieyouxu jieyouxu May 4, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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).

@Urgau
Copy link
Member

Urgau commented May 4, 2025

@bors r+ rollup

@bors
Copy link
Collaborator

bors commented May 4, 2025

📌 Commit eb3a8e5 has been approved by Urgau

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels May 4, 2025
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
@bors bors merged commit df9f9ca into rust-lang:master May 5, 2025
6 checks passed
@rustbot rustbot added this to the 1.88.0 milestone May 5, 2025
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.
@jieyouxu jieyouxu deleted the validate_attr_cleanups branch May 5, 2025 05:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants