From aa0ac8a0a985651741e11efc3af3973db88cf80f Mon Sep 17 00:00:00 2001 From: Luke Lau Date: Wed, 14 Oct 2020 21:02:18 +0100 Subject: [PATCH] Use TypeInType for GHC 8.4.4 builds --- cabal.project | 2 +- src/Language/LSP/Test.hs | 3 +-- src/Language/LSP/Test/Decoding.hs | 3 +-- src/Language/LSP/Test/Parsing.hs | 2 +- test/dummy-server/Main.hs | 2 +- 5 files changed, 5 insertions(+), 7 deletions(-) diff --git a/cabal.project b/cabal.project index 07e67ee..abe0905 100644 --- a/cabal.project +++ b/cabal.project @@ -7,6 +7,6 @@ haddock-quickjump: True source-repository-package type: git location: https://github.com/alanz/lsp.git - tag: 7577be56392862abe880e0099ea9834a1012a34f + tag: e0ed7c79f9bd019b06b5fecfc558adcc2b1318a7 subdir: . lsp-types diff --git a/src/Language/LSP/Test.hs b/src/Language/LSP/Test.hs index 9d7c020..4021547 100644 --- a/src/Language/LSP/Test.hs +++ b/src/Language/LSP/Test.hs @@ -2,10 +2,9 @@ {-# LANGUAGE TypeOperators #-} {-# LANGUAGE FlexibleContexts #-} {-# LANGUAGE KindSignatures #-} -{-# LANGUAGE DataKinds #-} {-# LANGUAGE GADTs #-} {-# LANGUAGE RankNTypes #-} -{-# LANGUAGE PolyKinds #-} +{-# LANGUAGE TypeInType #-} {-# LANGUAGE ScopedTypeVariables #-} {-# LANGUAGE ExistentialQuantification #-} diff --git a/src/Language/LSP/Test/Decoding.hs b/src/Language/LSP/Test/Decoding.hs index 78337a1..eac3f39 100644 --- a/src/Language/LSP/Test/Decoding.hs +++ b/src/Language/LSP/Test/Decoding.hs @@ -1,9 +1,8 @@ {-# LANGUAGE OverloadedStrings #-} {-# LANGUAGE TupleSections #-} {-# LANGUAGE GADTs #-} -{-# LANGUAGE PolyKinds #-} {-# LANGUAGE KindSignatures #-} -{-# LANGUAGE DataKinds #-} +{-# LANGUAGE TypeInType #-} module Language.LSP.Test.Decoding where import Prelude hiding ( id ) diff --git a/src/Language/LSP/Test/Parsing.hs b/src/Language/LSP/Test/Parsing.hs index 26625b5..95937c5 100644 --- a/src/Language/LSP/Test/Parsing.hs +++ b/src/Language/LSP/Test/Parsing.hs @@ -2,7 +2,7 @@ {-# LANGUAGE EmptyCase #-} {-# LANGUAGE TypeOperators #-} {-# LANGUAGE ScopedTypeVariables #-} -{-# LANGUAGE PolyKinds #-} +{-# LANGUAGE TypeInType #-} {-# LANGUAGE KindSignatures #-} {-# LANGUAGE DataKinds #-} {-# LANGUAGE GADTs #-} diff --git a/test/dummy-server/Main.hs b/test/dummy-server/Main.hs index 1af140e..7c73e3b 100644 --- a/test/dummy-server/Main.hs +++ b/test/dummy-server/Main.hs @@ -1,4 +1,4 @@ -{-# LANGUAGE DataKinds #-} +{-# LANGUAGE TypeInType #-} {-# LANGUAGE OverloadedStrings #-} import Control.Monad -- 2.30.2