Merge pull request #1 from DanBurton/galenhuntington-patch1

Support haskell-src-exts 1.21
haskell-party · Feb 18, 2019 · 0d6a61f · 0d6a61f
2 parents 7b2c816 + cb315dc
commit 0d6a61f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/haskell-src-meta.cabal b/haskell-src-meta.cabal
@@ -18,7 +18,7 @@ extra-source-files: ChangeLog README.md examples/*.hs
 
 library
  build-depends: base >= 4.6 && < 5,
- haskell-src-exts >= 1.18 && < 1.21,
+ haskell-src-exts >= 1.18 && < 1.22,
  pretty >= 1.0 && < 1.2,
  syb >= 0.1 && < 0.8,
  template-haskell >= 2.8 && < 2.15,
@@ -41,7 +41,7 @@ test-suite unit
  build-depends:
  HUnit >= 1.2 && < 1.7,
  base >= 4.5 && < 5,
- haskell-src-exts >= 1.17 && < 1.21,
+ haskell-src-exts >= 1.17 && < 1.22,
  haskell-src-meta,
  pretty >= 1.0 && < 1.2,
  template-haskell >= 2.7 && < 2.15,

diff --git a/src/Language/Haskell/Meta/Syntax/Translate.hs b/src/Language/Haskell/Meta/Syntax/Translate.hs
@@ -314,11 +314,13 @@ instance ToName TyVarBndr where
  toName (PlainTV n) = n
  toName (KindedTV n _) = n
 
+#if !MIN_VERSION_haskell_src_exts(1,21,0)
 instance ToType (Hs.Kind l) where
  toType (Hs.KindStar _) = StarT
  toType (Hs.KindFn _ k1 k2) = toType k1 .->. toType k2
  toType (Hs.KindParen _ kp) = toType kp
  toType (Hs.KindVar _ n) = VarT (toName n)
+#endif
 
 toKind :: Hs.Kind l -> Kind
 toKind = toType