Under betterFors don't drop the trailing map if it would result in a different type (also drop _ => ())
#22619
+154
−14
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
sjrd
reviewed
Feb 18, 2025
KacperFKorban
force-pushed
the
better-fors-fix
branch
from
d6badeb to
213a3fd
Compare
odersky
approved these changes
Feb 20, 2025
| then gen.expr // avoid a redundant map with identity | ||
| else Apply(rhsSelect(gen, mapName), makeLambda(gen, body)) | ||
| && gen.checkMode != GenCheckMode.Filtered // results of withFilter have the wrong type | ||
| && (deepEquals(gen.pat, body) || deepEquals(body, Tuple(Nil))) |
There was a problem hiding this comment.
Might factor out the next three lines and use in a method like markTrailingMap(gen, body). Then that can be re-used below.
odersky
reviewed
Feb 20, 2025
| && deepEquals(gen.pat, body) | ||
| then gen.expr // avoid a redundant map with identity | ||
| else Apply(rhsSelect(gen, mapName), makeLambda(gen, body)) | ||
| && gen.checkMode != GenCheckMode.Filtered // results of withFilter have the wrong type |
There was a problem hiding this comment.
This is non-standard indentation, but I'd tend t leave it in to be able to judge better how it looks.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
closes #21804