More unsafe attr verification #127543

carbotaniuman · 2024-07-10T00:09:39Z

This code denies unsafe on attributes such as #[test] and #[ignore], while also changing the MetaItem parsing so unsafe in args like #[allow(unsafe(dead_code))] is not accidentally allowed.

Tracking:

Tracking Issue for RFC 3325: unsafe attributes #123757

rustbot · 2024-07-10T00:09:46Z

r? @estebank

rustbot has assigned @estebank.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

estebank · 2024-07-12T17:04:24Z

compiler/rustc_parse/src/parser/attr.rs

@@ -373,7 +373,7 @@ impl<'a> Parser<'a> {
 /// MetaItem = SimplePath ( '=' UNSUFFIXED_LIT | '(' MetaSeq? ')' )? ;
 /// MetaSeq = MetaItemInner (',' MetaItemInner)* ','? ;
 /// ```
- pub fn parse_meta_item(&mut self) -> PResult<'a, ast::MetaItem> {
+ pub fn parse_meta_item(&mut self, allow_leading_unsafe: bool) -> PResult<'a, ast::MetaItem> {


Instead of a bool, can we make this an enum AllowLeadingUnsafe { Yes, No }? It makes it easier to read the calls in isolation without having to check the signature.

estebank · 2024-07-12T17:39:25Z

tests/ui/attributes/unsafe/extraneous-unsafe-attributes.stderr

+error: `cfg` is not an unsafe attribute
+ --> $DIR/extraneous-unsafe-attributes.rs:5:3
+ |
+LL | #[unsafe(cfg(any()))]
+ | ^^^^^^
+ |
+ = note: extraneous unsafe is not allowed in attributes


Suggested change

error: `cfg` is not an unsafe attribute

--> $DIR/extraneous-unsafe-attributes.rs:5:3

|

LL | #[unsafe(cfg(any()))]

| ^^^^^^

|

= note: extraneous unsafe is not allowed in attributes

error: `cfg` is not an unsafe attribute

--> $DIR/extraneous-unsafe-attributes.rs:5:3

|

LL | #[unsafe(cfg(any()))]

| ^^^^^^ --- this is not an unsafe attribute

| |

| extraneous unsafe is not allowed in attributes

compiler/rustc_parse/src/validate_attr.rs

estebank · 2024-07-12T17:49:55Z

r=me after the bool change

bors · 2024-07-14T08:40:37Z

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

carbotaniuman · 2024-07-23T01:04:18Z

@rustbot reviewer

carbotaniuman · 2024-07-26T02:13:12Z

@rustbot review

carbotaniuman · 2024-07-26T02:14:10Z

Oh I did that already, oops.

traviscross · 2024-07-29T03:11:46Z

@rustbot labels -S-waiting-on-author -S-waiting-on-review

Looks like the bool change was made, so per the comment above...

@bors r=estebank rollup=always

bors · 2024-07-29T03:11:48Z

📌 Commit 95d1101 has been approved by estebank

It is now in the queue for this repository.

bors · 2024-07-29T03:11:49Z

🌲 The tree is currently closed for pull requests below priority 100. This pull request will be tested once the tree is reopened.

bors · 2024-07-29T05:13:57Z

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

…iaskrgr Rollup of 5 pull requests Successful merges: - rust-lang#109174 (Replace `io::Cursor::{remaining_slice, is_empty}`) - rust-lang#127290 (Fully document `rustdoc-json-types`) - rust-lang#128055 (std: unsafe-wrap personality::dwarf::eh) - rust-lang#128269 (improve cargo invocations on bootstrap) - rust-lang#128310 (Add missing periods on `BTreeMap` cursor `peek_next` docs) Failed merges: - rust-lang#127543 (More unsafe attr verification) - rust-lang#128182 (handle no_std targets on std builds) r? `@ghost` `@rustbot` modify labels: rollup

traviscross · 2024-07-30T05:55:38Z

It's now been rebased; it looks reasonable to me, so let's try again...

@bors rollup=always r=estebank,traviscross 8eaf51b

…ification, r=estebank,traviscross More unsafe attr verification This code denies unsafe on attributes such as `#[test]` and `#[ignore]`, while also changing the `MetaItem` parsing so `unsafe` in args like `#[allow(unsafe(dead_code))]` is not accidentally allowed. Tracking: - rust-lang#123757

…iaskrgr Rollup of 8 pull requests Successful merges: - rust-lang#127543 (More unsafe attr verification) - rust-lang#128357 (Detect non-lifetime binder params shadowing item params) - rust-lang#128367 (CI: rfl: build the generated doctests and documentation) - rust-lang#128376 (Mark `Parser::eat`/`check` methods as `#[must_use]`) - rust-lang#128379 (the output in stderr expects panic-unwind) - rust-lang#128380 (make `///` doc comments compatible with naked functions) - rust-lang#128382 (cargo-miri: better error when we seem to run inside bootstrap but something is wrong) - rust-lang#128398 (tidy: Fix quote in error message) r? `@ghost` `@rustbot` modify labels: rollup

matthiaskrgr · 2024-07-30T20:52:56Z

@bors r- rollup=iffy
failed on apple #128403 (comment)

This makes it possible for the `unsafe(...)` syntax to only be valid at the top level, and the `NestedMetaItem`s will automatically reject `unsafe(...)`.

traviscross · 2024-07-31T01:52:19Z

@carbotaniuman pushed a fix; let's try again...

@bors rollup=iffy r=estebank,traviscross 49db8a5

bors · 2024-08-01T10:40:48Z

⌛ Testing commit 49db8a5 with merge c0e3298...

bors · 2024-08-01T13:12:28Z

☀️ Test successful - checks-actions
Approved by: estebank,traviscross
Pushing c0e3298 to master...

rust-timer · 2024-08-02T04:52:40Z

Finished benchmarking commit (c0e3298): comparison URL.

Overall result: no relevant changes - no action needed

@rustbot label: -perf-regression

Instruction count

This benchmark run did not return any relevant results for this metric.

Max RSS (memory usage)

This benchmark run did not return any relevant results for this metric.

Cycles

This benchmark run did not return any relevant results for this metric.

Binary size

This benchmark run did not return any relevant results for this metric.

Bootstrap: 758.41s -> 756.519s (-0.25%)
Artifact size: 336.92 MiB -> 336.96 MiB (0.01%)

rustbot assigned estebank Jul 10, 2024

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 Jul 10, 2024

traviscross mentioned this pull request Jul 10, 2024

Tracking Issue for RFC 3325: unsafe attributes #123757

Closed

8 tasks

estebank reviewed Jul 12, 2024

View reviewed changes

compiler/rustc_parse/src/validate_attr.rs Outdated Show resolved Hide resolved

estebank reviewed Jul 12, 2024

View reviewed changes

compiler/rustc_parse/src/validate_attr.rs Outdated Show resolved Hide resolved

estebank added the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Jul 12, 2024

carbotaniuman force-pushed the more_unsafe_attr_verification branch from bd94a21 to 95d1101 Compare July 21, 2024 23:56

rustbot removed the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Jul 29, 2024

rustbot removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jul 29, 2024

bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Jul 29, 2024

matthiaskrgr mentioned this pull request Jul 29, 2024

Rollup of 5 pull requests #128330

Merged

bors 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-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jul 29, 2024

Deny unsafe on more builtin attributes

d8bc876

carbotaniuman force-pushed the more_unsafe_attr_verification branch from 95d1101 to 5bd483d Compare July 30, 2024 02:04

This comment has been minimized.

Sign in to view

carbotaniuman force-pushed the more_unsafe_attr_verification branch from 5bd483d to 71c1060 Compare July 30, 2024 02:20

This comment has been minimized.

Sign in to view

carbotaniuman force-pushed the more_unsafe_attr_verification branch from 71c1060 to 989b363 Compare July 30, 2024 03:13

This comment has been minimized.

Sign in to view

carbotaniuman force-pushed the more_unsafe_attr_verification branch from 989b363 to 8eaf51b Compare July 30, 2024 04:18

matthiaskrgr mentioned this pull request Jul 30, 2024

Rollup of 8 pull requests #128403

Closed

Add toggle for parse_meta_item unsafe parsing

49db8a5

This makes it possible for the `unsafe(...)` syntax to only be valid at the top level, and the `NestedMetaItem`s will automatically reject `unsafe(...)`.

carbotaniuman force-pushed the more_unsafe_attr_verification branch from 8eaf51b to 49db8a5 Compare July 30, 2024 23:29

bors added the merged-by-bors This PR was explicitly merged by bors. label Aug 1, 2024

bors merged commit c0e3298 into rust-lang:master Aug 1, 2024
7 checks passed

rustbot added this to the 1.82.0 milestone Aug 1, 2024

carbotaniuman deleted the more_unsafe_attr_verification branch August 1, 2024 18:26

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

More unsafe attr verification #127543

More unsafe attr verification #127543

carbotaniuman commented Jul 10, 2024 •

edited by traviscross

Loading

rustbot commented Jul 10, 2024

estebank Jul 12, 2024

estebank Jul 12, 2024

estebank commented Jul 12, 2024

bors commented Jul 14, 2024

carbotaniuman commented Jul 23, 2024

carbotaniuman commented Jul 26, 2024

carbotaniuman commented Jul 26, 2024

traviscross commented Jul 29, 2024

bors commented Jul 29, 2024

bors commented Jul 29, 2024

bors commented Jul 29, 2024

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

traviscross commented Jul 30, 2024

matthiaskrgr commented Jul 30, 2024

traviscross commented Jul 31, 2024

bors commented Aug 1, 2024

bors commented Aug 1, 2024

rust-timer commented Aug 2, 2024

More unsafe attr verification #127543

More unsafe attr verification #127543

Conversation

carbotaniuman commented Jul 10, 2024 • edited by traviscross Loading

rustbot commented Jul 10, 2024

estebank Jul 12, 2024

Choose a reason for hiding this comment

estebank Jul 12, 2024

Choose a reason for hiding this comment

estebank commented Jul 12, 2024

bors commented Jul 14, 2024

carbotaniuman commented Jul 23, 2024

carbotaniuman commented Jul 26, 2024

carbotaniuman commented Jul 26, 2024

traviscross commented Jul 29, 2024

bors commented Jul 29, 2024

bors commented Jul 29, 2024

bors commented Jul 29, 2024

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

traviscross commented Jul 30, 2024

matthiaskrgr commented Jul 30, 2024

traviscross commented Jul 31, 2024

bors commented Aug 1, 2024

bors commented Aug 1, 2024

rust-timer commented Aug 2, 2024

Overall result: no relevant changes - no action needed

Instruction count

Max RSS (memory usage)

Cycles

Binary size

carbotaniuman commented Jul 10, 2024 •

edited by traviscross

Loading