Skip to content

Only update typar name when TyparStaticReq matches.#15845

Merged
vzarytovskii merged 2 commits intodotnet:mainfrom
nojaf:fix-update-typar-name
Aug 23, 2023
Merged

Only update typar name when TyparStaticReq matches.#15845
vzarytovskii merged 2 commits intodotnet:mainfrom
nojaf:fix-update-typar-name

Conversation

@nojaf
Copy link
Copy Markdown
Contributor

@nojaf nojaf commented Aug 23, 2023

As mentioned on Slack by Josua Jäger, there was a recent regression in the 7.0.400 SDK.
The fix for this is that we can't update the ident of the syntypar when ' doesn't match with ^.

@nojaf nojaf requested a review from a team as a code owner August 23, 2023 13:04
@vzarytovskii vzarytovskii merged commit 65da1c2 into dotnet:main Aug 23, 2023
@vzarytovskii
Copy link
Copy Markdown
Member

/backport to release/dev17.7

@github-actions
Copy link
Copy Markdown
Contributor

Started backporting to release/dev17.7: https://github.com/dotnet/fsharp/actions/runs/5952907769

@github-actions
Copy link
Copy Markdown
Contributor

@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: Only update typar name when TyparStaticReq matches.
.git/rebase-apply/patch:66: trailing whitespace.
        FSharp """        
.git/rebase-apply/patch:101: trailing whitespace.
    FSharp """        
warning: 2 lines add whitespace errors.
Using index info to reconstruct a base tree...
M	src/Compiler/Checking/CheckDeclarations.fs
M	tests/FSharp.Compiler.ComponentTests/Signatures/TypeTests.fs
Falling back to patching base and 3-way merge...
Auto-merging tests/FSharp.Compiler.ComponentTests/Signatures/TypeTests.fs
Auto-merging src/Compiler/Checking/CheckDeclarations.fs
CONFLICT (content): Merge conflict in src/Compiler/Checking/CheckDeclarations.fs
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Only update typar name when TyparStaticReq matches.
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 Aug 23, 2023
vzarytovskii added a commit that referenced this pull request Aug 24, 2023
Co-authored-by: Florian Verdonck <florian.verdonck@outlook.com>
Co-authored-by: Tomas Grosup <tomasgrosup@microsoft.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

Archived in project

Development

Successfully merging this pull request may close these issues.

5 participants