Fix manual_map and manual_filter FN for complex map body

[profetia]

Closes #16776

Inspired by the original reproducer in #16751. After this PR the two lints no longer require the map/filter body to be a single expression of map/filter.

changelog: [manual_map] fix FN for complex map body
changelog: [manual_filter] fix FN for complex map body

[rustbot]

r? @llogiq

rustbot has assigned @llogiq.
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

Why was this reviewer chosen?

The reviewer was selected based on:

• Owners of files modified in this PR: 7 candidates
• 7 candidates expanded to 7 candidates
• Random selection from Jarcho, dswij, llogiq, samueltardieu

[github-actions]

Lintcheck changes for 7666dcd

Lint	Added	Removed	Changed
clippy::manual_map	10	0	1

This comment will be updated if you push new changes

[profetia]

Also closes #16776 in this PR

[profetia]

I feel that manual_filter.rs, manual_map.rs and manual_utils.rs can be merged into one, since we are implementing filter, map and and_then (i.e. filter map).

[profetia]

r? clippy

[profetia]

r? clippy

[rustbot]

This PR was rebased onto a different master commit. Here's a range-diff highlighting what actually changed.

Rebasing is a normal part of keeping PRs up to date, so no action is needed—this note is just to help reviewers.

[profetia]

r? clippy