Skip to content

Add multiple_unsafe_ops_per_block lint#10206

Merged
bors merged 1 commit intorust-lang:masterfrom
Niki4tap:one_unsafe_op_per_block
Jan 19, 2023
Merged

Add multiple_unsafe_ops_per_block lint#10206
bors merged 1 commit intorust-lang:masterfrom
Niki4tap:one_unsafe_op_per_block

Conversation

@Niki4tap
Copy link
Copy Markdown
Contributor

@Niki4tap Niki4tap commented Jan 16, 2023 •
edited by xFrednet
Loading

Adds a lint, which restricts an unsafe block to only one unsafe operation.

Closes #10064

changelog: New lint: [multiple_unsafe_ops_per_block]
#10206

@rustbot
Copy link
Copy Markdown
Collaborator

rustbot commented Jan 16, 2023

r? @Alexendoo

(rustbot has picked a reviewer for you, use r? to override)

@rustbot rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties label Jan 16, 2023
@Niki4tap
Copy link
Copy Markdown
Contributor Author

Niki4tap commented Jan 16, 2023

@rustbot label: +A-lint, +L-restriction

@rustbot rustbot added A-lint Area: New lints L-restriction Lint: Belongs in the restriction lint group labels Jan 16, 2023
Alexendoo
Alexendoo reviewed Jan 17, 2023
View reviewed changes
Copy link
Copy Markdown
Member

@Alexendoo Alexendoo left a comment

Choose a reason for hiding this comment

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

👋

Thanks for the PR! It's looking good

@Niki4tap Niki4tap force-pushed the one_unsafe_op_per_block branch from bb5cfee to 6d6d5a4 Compare January 17, 2023 15:05
@Niki4tap Niki4tap changed the title Add one_unsafe_op_per_block lint Add multiple_unsafe_ops_per_block lint Jan 17, 2023
@Niki4tap
Copy link
Copy Markdown
Contributor Author

Niki4tap commented Jan 17, 2023

Thanks for the review, @Alexendoo! I've addressed the comments, can you review it again please?

Alexendoo
Alexendoo reviewed Jan 18, 2023
View reviewed changes
clippy_lints/src/multiple_unsafe_ops_per_block.rs Outdated
) {
let expr = expr.peel_drop_temps();

for_each_expr_with_closures(cx, expr, |expr| {
Copy link
Copy Markdown
Member

@Alexendoo Alexendoo Jan 17, 2023

Choose a reason for hiding this comment

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

You can pass the Block in here directly, letting you remove the collect_block function

Suggested change
for_each_expr_with_closures(cx, expr, |expr| {
for_each_expr_with_closures(cx, block, |expr| {

Copy link
Copy Markdown
Contributor Author

@Niki4tap Niki4tap Jan 18, 2023

Choose a reason for hiding this comment

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

Can't take Block directly here, as I still have one recursive call at the bottom, but I figured I can take impl Visitable, so that works. Thanks for the comment!

@Niki4tap Niki4tap force-pushed the one_unsafe_op_per_block branch from 6d6d5a4 to 875e36f Compare January 18, 2023 07:00
@Niki4tap Niki4tap requested a review from Alexendoo January 18, 2023 12:17
@Niki4tap
Copy link
Copy Markdown
Contributor Author

Niki4tap commented Jan 19, 2023

@Alexendoo can you look again please? I think it should be good now

@Alexendoo
Copy link
Copy Markdown
Member

Alexendoo commented Jan 19, 2023

Yep looks great thanks

@bors r+

@bors
Copy link
Copy Markdown
Contributor

bors commented Jan 19, 2023

📌 Commit 875e36f has been approved by Alexendoo

It is now in the queue for this repository.

@bors
Copy link
Copy Markdown
Contributor

bors commented Jan 19, 2023

⌛ Testing commit 875e36f with merge aa0eb7f...

@bors
Copy link
Copy Markdown
Contributor

bors commented Jan 19, 2023

☀️ Test successful - checks-action_dev_test, checks-action_remark_test, checks-action_test
Approved by: Alexendoo
Pushing aa0eb7f to master...

@bors bors merged commit aa0eb7f into rust-lang:master Jan 19, 2023
@Niki4tap Niki4tap deleted the one_unsafe_op_per_block branch January 19, 2023 14:09
This was referenced Jan 19, 2023
Closed
Merged
Merged
Closed
Merged
Closed
@taiki-e taiki-e mentioned this pull request Jan 30, 2023
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@Alexendoo Alexendoo Alexendoo approved these changes

Assignees

@Alexendoo Alexendoo

Labels

A-lint Area: New lints L-restriction Lint: Belongs in the restriction lint group S-waiting-on-review Status: Awaiting review from the assignee but also interested parties

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

New lint: Limit unsafe blocks to a single unsafe operation

4 participants

@Niki4tap @rustbot @Alexendoo @bors