Skip to content

Revert clippy lint [filter_map_bool_then]#114715

Merged
bors merged 1 commit into
rust-lang:masterfrom
Centri3:revert-clippy-11115
Aug 11, 2023
Merged

Revert clippy lint [filter_map_bool_then]#114715
bors merged 1 commit into
rust-lang:masterfrom
Centri3:revert-clippy-11115

Conversation

@Centri3

@Centri3 Centri3 commented Aug 10, 2023

Copy link
Copy Markdown
Member

r? @Manishearth

Issue in question is rust-lang/rust-clippy#11309.

We usually wait until the next sync but this ICE is entirely unpreventable and happens often for code where type annotations are needed alongside a lifetime parameter so I think it's a good idea to revert it here. Also, this got into 1.71.1: https://play.rust-lang.org/?version=stable&mode=debug&edition=2021&gist=620a95846a0e4810dffb39d7594d62d7

@rustbot rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Aug 10, 2023
@rustbot

rustbot commented Aug 10, 2023

Copy link
Copy Markdown
Collaborator

Some changes occurred in src/tools/clippy

cc @rust-lang/clippy

@Centri3

Centri3 commented Aug 10, 2023

Copy link
Copy Markdown
Member Author

Here's a minimized case that requires type annotations to compile, but ICEs: https://play.rust-lang.org/?version=nightly&mode=debug&edition=2021&gist=83fbcc68e86fcb1cc9d03652136186b5

In this case you could put it on helper itself, but there are likely many cases where you cannot.

@Manishearth

Copy link
Copy Markdown
Member

@bors r+

@bors

bors commented Aug 11, 2023

Copy link
Copy Markdown
Collaborator

📌 Commit c0ae75b has been approved by Manishearth

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 Aug 11, 2023
bors added a commit to rust-lang-ci/rust that referenced this pull request Aug 11, 2023
…mpiler-errors

Rollup of 5 pull requests

Successful merges:

 - rust-lang#114194 (Inline trivial (noop) flush calls)
 - rust-lang#114257 (Avoid using `ptr::Unique` in `LinkedList` code)
 - rust-lang#114359 ([library/std] Replace condv while loop with `cvar.wait_while`.)
 - rust-lang#114402 (Fix documentation of impl From<Vec<T>> for Rc<[T]>)
 - rust-lang#114715 (Revert clippy lint [`filter_map_bool_then`])

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 35a76a6 into rust-lang:master Aug 11, 2023
@bors

bors commented Aug 11, 2023

Copy link
Copy Markdown
Collaborator

⌛ Testing commit c0ae75b with merge 7d8386f...

@rustbot rustbot added this to the 1.73.0 milestone Aug 11, 2023
@flip1995 flip1995 mentioned this pull request Aug 11, 2023
@Centri3 Centri3 deleted the revert-clippy-11115 branch August 11, 2023 14:01
bors added a commit to rust-lang-ci/rust that referenced this pull request Aug 11, 2023
Update Clippy

r? `@Manishearth`

cc `@Centri3` This reinstates the `filter_map_bool_then` lint rust-lang#114715, since I think you fixed the ICE in rust-lang@beb57f0 which is included in this sync.
flip1995 pushed a commit to flip1995/rust that referenced this pull request Aug 14, 2023
…mpiler-errors

Rollup of 5 pull requests

Successful merges:

 - rust-lang#114194 (Inline trivial (noop) flush calls)
 - rust-lang#114257 (Avoid using `ptr::Unique` in `LinkedList` code)
 - rust-lang#114359 ([library/std] Replace condv while loop with `cvar.wait_while`.)
 - rust-lang#114402 (Fix documentation of impl From<Vec<T>> for Rc<[T]>)
 - rust-lang#114715 (Revert clippy lint [`filter_map_bool_then`])

r? `@ghost`
`@rustbot` modify labels: rollup
@ChrisDenton

Copy link
Copy Markdown
Member

This looks like it has already been merged so I'm not sure why it's in the queue again. I'll cancel it now but feel free to restart if this was intentional.

@bors r-

@bors 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 Sep 3, 2023
@saethlin saethlin added merged-by-bors This PR was explicitly merged by bors. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Sep 3, 2023
@blyxyas

blyxyas commented Sep 3, 2023

Copy link
Copy Markdown
Member

Yep, this is already completed shouldn't be merged again.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

merged-by-bors This PR was explicitly merged by bors.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants