Skip to content
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

Update to ghc-8.10.1 #934

Merged
merged 4 commits into from
Mar 28, 2020
Merged

Conversation

shayne-fletcher
Copy link
Collaborator

Switch to the 8.10.1 parse tree.

Copy link
Owner

@ndmitchell ndmitchell left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Amazing work. The parse quick hack needs unwinding, since it breaks a few bits and pieces, but shouldn't be too hard. See 685051e#diff-28531b9ca053a7288b86a2e9d28dd5b9. I think it may be as simple as removing the pprLocErrMsg bit.

src/Hint/List.hs Show resolved Hide resolved
src/GHC/Util.hs Show resolved Hide resolved
src/HSE/All.hs Outdated Show resolved Hide resolved
tests/json.test Outdated Show resolved Hide resolved
tests/lhs.test Outdated Show resolved Hide resolved
@ndmitchell
Copy link
Owner

I just introduced and solved a merge commit on your branch, so you will need to pull/merge before rebasing.

@shayne-fletcher
Copy link
Collaborator Author

@ndmitchell Addressed the comments so far in the last two commits. Please cast your eye over once more.

@shayne-fletcher
Copy link
Collaborator Author

Oh, and there are some new test failures but I judge they have come in on your merge from master just now.

@ndmitchell ndmitchell merged commit cf972fe into ndmitchell:master Mar 28, 2020
@ndmitchell
Copy link
Owner

Woohoo! Let's merge and then if there are any CI errors I'll fix them up in situ.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants