-
Notifications
You must be signed in to change notification settings - Fork 804
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Checker: fix exception on wrong update syntax in anon records #15638
Merged
vzarytovskii
merged 3 commits into
dotnet:main
from
auduchinok:tcExpr-record-anonUpdate
Jul 19, 2023
Merged
Checker: fix exception on wrong update syntax in anon records #15638
vzarytovskii
merged 3 commits into
dotnet:main
from
auduchinok:tcExpr-record-anonUpdate
Jul 19, 2023
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
vzarytovskii
approved these changes
Jul 19, 2023
T-Gro
reviewed
Jul 19, 2023
tests/FSharp.Compiler.ComponentTests/Conformance/Types/RecordTypes/AnonymousRecords.fs
Outdated
Show resolved
Hide resolved
T-Gro
approved these changes
Jul 19, 2023
nice |
/backport to release/dev17.7 |
Started backporting to release/dev17.7: https://github.com/dotnet/fsharp/actions/runs/5654806378 |
Backport is needed to resolve merge issues in 17.7 -> main, it won't go into QB. |
@vzarytovskii backporting to release/dev17.7 failed, the patch most likely resulted in conflicts: $ git am --3way --ignore-whitespace --keep-non-patch changes.patch
Applying: Revert "Fix: 14814 --- Inaccurate error in anonymous record copy-and-update (#15625)"
Applying: Checker: fix exception in wrong anon record update
Using index info to reconstruct a base tree...
M src/Compiler/Checking/CheckExpressions.fs
M tests/FSharp.Compiler.ComponentTests/Conformance/Types/RecordTypes/AnonymousRecords.fs
Falling back to patching base and 3-way merge...
Auto-merging tests/FSharp.Compiler.ComponentTests/Conformance/Types/RecordTypes/AnonymousRecords.fs
CONFLICT (content): Merge conflict in tests/FSharp.Compiler.ComponentTests/Conformance/Types/RecordTypes/AnonymousRecords.fs
Auto-merging src/Compiler/Checking/CheckExpressions.fs
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0002 Checker: fix exception in wrong anon record update
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Error: The process '/usr/bin/git' failed with exit code 128 Please backport manually! |
vzarytovskii
pushed a commit
to vzarytovskii/fsharp
that referenced
this pull request
Jul 25, 2023
Closed
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.
Fixes exceptions introduced in #15214 when wrong syntax is used to update an anonymous record: