If let else mutex by DevinR528 · Pull Request #5332 · rust-lang/rust-clippy

DevinR528 · 2020-03-18T02:01:21Z

changelog: Adds lint to catch incorrect use of Mutex::lock in if let expressions with lock calls in any of the blocks.

closes: #5219

clippy_lints/src/if_let_mutex.rs

DevinR528 · 2020-03-18T22:18:02Z

I hope this works its definitely a lot cleaner, I removed if_chain, I wasn't sure how to avoid unnecessary walking and still use if_chain, but if the walking isn't that big of a deal I'll just call both of them up front and use if_chain.

bors · 2020-03-23T20:56:26Z

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

bors · 2020-03-30T08:20:14Z

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

bors · 2020-03-30T20:12:50Z

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

bors · 2020-04-08T14:33:54Z

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

flip1995

9cdc7d5 added 2 binary files. Please remove them, preferably with a force push.

Sorry for taking so long for the review. I don't have an excuse, just wasn't really motivated to review PRs recently.

clippy_lints/src/if_let_mutex.rs

doc/adding_lints.md

clippy_lints/src/if_let_mutex.rs

tests/ui/if_let_mutex.rs

bors · 2020-04-15T18:56:38Z

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

DevinR528 · 2020-04-15T19:54:44Z

No worries I've seen you've been pretty busy getting the new release stuff and everything. Sorry I keep adding the binary files I wonder if there is a way to tell vscode when you open a non existent dir to just fail instead of creating a file.

bors · 2020-04-17T16:21:13Z

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

bors · 2020-04-19T19:39:48Z

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

phansch

Implementation wise this looks good to me. Just some minor things =)

README.md

clippy_lints/src/if_let_mutex.rs

flip1995

r=me after addressing @phansch comments and the test added

doc/adding_lints.md

tests/ui/if_let_mutex.rs

phansch · 2020-04-20T19:12:49Z

@bors r=flip1995

bors · 2020-04-20T19:12:50Z

📌 Commit 489dd2e has been approved by flip1995

If let else mutex changelog: Adds lint to catch incorrect use of `Mutex::lock` in `if let` expressions with lock calls in any of the blocks. closes: #5219

bors · 2020-04-20T19:12:58Z

⌛ Testing commit 489dd2e with merge 023f3d1...

DevinR528 · 2020-04-20T19:13:37Z

How come the tests run sooo much faster? It's sweet.

bors · 2020-04-20T19:26:04Z

💔 Test failed - checks-action_test

phansch · 2020-04-20T19:39:46Z

Ah, you'll have to update the UI tests one more time because the line numbers changed.

How come the tests run sooo much faster? It's sweet.

I think that might be because of caching 🏃

phansch · 2020-04-20T20:21:29Z

@bors r=flip1995 thanks!

bors · 2020-04-20T20:21:31Z

📌 Commit 3fbe321 has been approved by flip1995

bors · 2020-04-20T20:21:38Z

⌛ Testing commit 3fbe321 with merge 6ce05bf...

bors · 2020-04-20T20:40:36Z

☀️ Test successful - checks-action_dev_test, checks-action_remark_test, checks-action_test
Approved by: flip1995
Pushing 6ce05bf to master...

DevinR528 · 2020-04-20T22:36:52Z

Thanks for the help and input as usual @flip1995 and @phansch!

flip1995 requested changes Mar 18, 2020

View reviewed changes

clippy_lints/src/if_let_mutex.rs Outdated Show resolved Hide resolved

clippy_lints/src/if_let_mutex.rs Outdated Show resolved Hide resolved

clippy_lints/src/if_let_mutex.rs Outdated Show resolved Hide resolved

DevinR528 force-pushed the if-let-else-mutex branch from 56b07a8 to c4e8eef Compare March 18, 2020 19:33

flip1995 reviewed Mar 18, 2020

View reviewed changes

clippy_lints/src/if_let_mutex.rs Outdated Show resolved Hide resolved

flip1995 added S-waiting-on-author Status: This is awaiting some action from the author. (Use `@rustbot ready` to update this status) A-lint Area: New lints labels Mar 18, 2020

DevinR528 force-pushed the if-let-else-mutex branch from 0bce79e to 7a8fca3 Compare March 24, 2020 00:20

flip1995 self-requested a review March 30, 2020 17:49

DevinR528 force-pushed the if-let-else-mutex branch from dfe83ed to 2928c6c Compare March 30, 2020 18:31

DevinR528 force-pushed the if-let-else-mutex branch from 53f70e4 to e3895f8 Compare April 3, 2020 20:45

flip1995 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 from the author. (Use `@rustbot ready` to update this status) labels Apr 8, 2020

DevinR528 force-pushed the if-let-else-mutex branch from e3895f8 to f7df69b Compare April 10, 2020 10:31

flip1995 requested changes Apr 15, 2020

View reviewed changes

flip1995 added S-waiting-on-author Status: This is awaiting some action from the author. (Use `@rustbot ready` to update this status) and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties labels Apr 15, 2020

DevinR528 force-pushed the if-let-else-mutex branch from f7df69b to 17da276 Compare April 15, 2020 21:09

DevinR528 force-pushed the if-let-else-mutex branch from 17da276 to 0575d5d Compare April 19, 2020 14:42

DevinR528 added 4 commits April 20, 2020 06:29

progress work on suggestion for auto fix

001a42e

creating suggestion

139e2c6

use span_lint_and_help, cargo dev fmt

40bbdff

move closures to seperate fns, remove known problems

51c2325

DevinR528 added 9 commits April 20, 2020 06:30

add note about update-all-refs script, revert redundant pat to master

fca3537

use Visitor api to find Mutex::lock calls

c6c77d9

change visitor name to OppVisitor

930619b

fix internal clippy warnings

1ee04e4

dev update_lints

2e8a2de

fix map import to rustc_middle

7242fa5

cargo dev fmt

4cebe2b

use if chain

ae82092

test for mutex eq, add another test case

a9f1bb4

DevinR528 force-pushed the if-let-else-mutex branch from 0575d5d to a9f1bb4 Compare April 20, 2020 10:30

update span_lint_and_help call to six args

d1b1a4c

phansch reviewed Apr 20, 2020

View reviewed changes

README.md Show resolved Hide resolved

clippy_lints/src/if_let_mutex.rs Outdated Show resolved Hide resolved

flip1995 approved these changes Apr 20, 2020

View reviewed changes

doc/adding_lints.md Outdated Show resolved Hide resolved

tests/ui/if_let_mutex.rs Show resolved Hide resolved

factor ifs into function, add differing mutex test

489dd2e

bors added a commit that referenced this pull request Apr 20, 2020

Auto merge of #5332 - DevinR528:if-let-else-mutex, r=flip1995

023f3d1

If let else mutex changelog: Adds lint to catch incorrect use of `Mutex::lock` in `if let` expressions with lock calls in any of the blocks. closes: #5219

update stderr file

3fbe321

bors merged commit 6ce05bf into rust-lang:master Apr 20, 2020

bors mentioned this pull request Apr 20, 2020

Macro use sugg #5279

Merged

Conversation

DevinR528 commented Mar 18, 2020

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

DevinR528 commented Mar 18, 2020

Uh oh!

bors commented Mar 23, 2020

Uh oh!

bors commented Mar 30, 2020

Uh oh!

bors commented Mar 30, 2020

Uh oh!

bors commented Apr 8, 2020

Uh oh!

flip1995 left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

bors commented Apr 15, 2020

Uh oh!

DevinR528 commented Apr 15, 2020

Uh oh!

bors commented Apr 17, 2020

Uh oh!

bors commented Apr 19, 2020

Uh oh!

phansch left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

flip1995 left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

phansch commented Apr 20, 2020

Uh oh!

bors commented Apr 20, 2020

Uh oh!

bors commented Apr 20, 2020

Uh oh!

DevinR528 commented Apr 20, 2020

Uh oh!

bors commented Apr 20, 2020

Uh oh!

phansch commented Apr 20, 2020

Uh oh!

phansch commented Apr 20, 2020

Uh oh!

bors commented Apr 20, 2020

Uh oh!

bors commented Apr 20, 2020

Uh oh!

bors commented Apr 20, 2020

Uh oh!

DevinR528 commented Apr 20, 2020

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants