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

Remove overlapping Lift instance #998

Merged
merged 1 commit into from
Jan 1, 2020
Merged

Remove overlapping Lift instance #998

merged 1 commit into from
Jan 1, 2020

Conversation

RyanGlScott
Copy link
Contributor

@RyanGlScott RyanGlScott commented Dec 28, 2019

This patch removes the overlapping instance Lift' a => Lift a by replacing the three Lift' instances with Lift instances:

  • There has been an instance Lift a => Lift [a] in template-haskell for a while now, so that one is already covered.
  • The instance (Lift k, Lift v) => Lift (Map k v) is now obtained from the th-lift-instances library, which is the canonical home for that particular instance.
  • The text library defines an instance Lift Text since version 1.2.4.0. On earlier versions of text, an equivalent instance is obtained from the th-lift-instances library, which backports it.

Before submitting your PR, check that you've:

  • Bumped the version number

After submitting your PR:

  • Update the Changelog.md file with a link to your PR
  • Check that CI passes (or if it fails, for reasons unrelated to your change, like CI timeouts)

@parsonsmatt
Copy link
Collaborator

awesome, thanks!

This patch removes the overlapping `instance Lift' a => Lift a` by
replacing the three `Lift'` instances with `Lift` instances:

* There has been an `instance Lift a => Lift [a]` in
  `template-haskell` for a while now, so that one is already covered.
* The `instance (Lift k, Lift v) => Lift (Map k v)` is now obtained
  from the `th-lift-instances` library, which is the canonical home
  for that particular instance.
* The `text` library defines an `instance Lift Text` since version
  1.2.4.0. On earlier versions of `text`, an equivalent instance is
  obtained from the `th-lift-instances` library, which backports it.
@RyanGlScott
Copy link
Contributor Author

CI is fixed now (after tweaking several stack.yaml files).

@MaxGabriel MaxGabriel merged commit 35c5701 into yesodweb:master Jan 1, 2020
@MaxGabriel
Copy link
Member

Released!

merijn pushed a commit to merijn/persistent that referenced this pull request Jan 6, 2020
This patch removes the overlapping `instance Lift' a => Lift a` by
replacing the three `Lift'` instances with `Lift` instances:

* There has been an `instance Lift a => Lift [a]` in
  `template-haskell` for a while now, so that one is already covered.
* The `instance (Lift k, Lift v) => Lift (Map k v)` is now obtained
  from the `th-lift-instances` library, which is the canonical home
  for that particular instance.
* The `text` library defines an `instance Lift Text` since version
  1.2.4.0. On earlier versions of `text`, an equivalent instance is
  obtained from the `th-lift-instances` library, which backports it.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants