Skip to content

Prs 5028 5029 5033 #5046

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

Merged
merged 8 commits into from
Jan 17, 2018
Merged

Prs 5028 5029 5033 #5046

merged 8 commits into from
Jan 17, 2018

Conversation

phadej
Copy link
Collaborator

@phadej phadej commented Jan 16, 2018

Includes changes from #5028, #5029 and #5033.

This is last check before I hit merge.


Please include the following checklist in your PR:

  • Patches conform to the coding conventions.
  • Any changes that could be relevant to users have been recorded in the changelog.
  • The documentation has been updated, if necessary.
  • If the change is docs-only, [ci skip] is used to avoid triggering the build bots.

Please also shortly describe how you tested your change. Bonus points for added tests!

phadej and others added 7 commits January 16, 2018 12:57
This provides a provisional (i.e. hacky) retrofitted implementation of
the forward-compat scheme described in haskell#4899 for the cabal-2.2 branch

This hack works by constructing a dummy package description in case
the package description fails to be parsed via the standard parser,
and we detect a new-style cabal-spec declaration.
There are 3957 warned files atm in Hackage index.
All of them have tab "inside the field", thus old parser acceps them.

See e.g added th-lift-instances file. The warning comes from the description field.
Also add FieldDescrs field grammar instance, for collecting
individual field value parsers and printers.
@23Skidoo
Copy link
Member

@phadej You're on fire!

@phadej
Copy link
Collaborator Author

phadej commented Jan 17, 2018

It seems I burned Travis, hopefully they will recover soon :S

@phadej
Copy link
Collaborator Author

phadej commented Jan 17, 2018

linux and windows green. Merging.

@phadej phadej merged commit d955fab into haskell:master Jan 17, 2018
@phadej phadej deleted the prs-5028-5029-5033 branch January 17, 2018 12:34
@phadej phadej mentioned this pull request Jan 17, 2018
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.

3 participants