[6.0][stdlib] Optional.map, .flatMap: Remove @_disfavoredOverload #73298
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.
Explanation: Reverts the addition of
@_disfavoredOverload
on the retroactive generalizations ofOptional.map
andOptional.flatMap
. The attribute was added speculatively to defend against potential source breaks while rdar://125016028 is being investigated; however, it leads to "expression too complex" issues that are non-hypothetical source breaks.Scope: Impacts usages and external reimplementations of
Optional.map
andOptional.flatMap
.Risk: Low. This resolves regressions that have come to light, although it does potentially introduce ambiguity issues in code that have local definitions for
Optional.map
/.flatMap
that used to shadow the originals.Testing: Source compat suite.
Reviewer: @slavapestov
Main branch PR: [stdlib] Optional.map, .flatMap: Remove @_disfavoredOverload #73296
Issue: rdar://127015095&127015541