7b5df7b · reflex · git.iko.soy

git.iko.soy/reflex

Fix hlint 3 test and a GC test

* hlint released a new version * hlint 3 is not compatible with ghc 8.4 because newst ghc-lib fails to compile. * the Refl constructor does not seem to get exported in newer versions of some dependency

commit7b5df7b19c575339b654ea8ab48c545e2d64a6a0 authorMalte Brandy <malte.brandy@maralorn.de> dateFri 19 Jun 2020, 14:15 (6 years ago) parentcf4ddc0

7 files changed+8−6

compare with develop

unifiedsplit

reflex.cabal+4−1 src/Reflex/PerformEvent/Class.hs−1 src/Reflex/PostBuild/Base.hs−1 src/Reflex/PostBuild/Class.hs−1 src/Reflex/Spider/Internal.hs+1−1 test/GC.hs+1 test/hlint.hs+2−1

reflex.cabal+4−1

@@ -256,7 +256,10 @@ test-suite hlint

256256 , directory

257257 , filepath

258258 , filemanip

259− , hlint (< 2.1 || >= 2.2.2) && < 3

259+ if impl(ghc >= 8.8)

260+ build-depends: hlint >= 3

261+ else

262+ build-depends: hlint (< 2.1 || >= 2.2.2) && < 3

260263 if impl(ghcjs)

261264 buildable: False

262265

src/Reflex/PerformEvent/Class.hs−1

@@ -8,7 +8,6 @@

88{-# LANGUAGE RankNTypes #-}

99{-# LANGUAGE ScopedTypeVariables #-}

1010{-# LANGUAGE TypeFamilies #-}

11−{-# LANGUAGE TypeOperators #-}

1211{-# LANGUAGE UndecidableInstances #-}

1312#ifdef USE_REFLEX_OPTIMIZER

1413{-# OPTIONS_GHC -fplugin=Reflex.Optimizer #-}

src/Reflex/PostBuild/Base.hs−1

@@ -9,7 +9,6 @@

99{-# LANGUAGE RecursiveDo #-}

1010{-# LANGUAGE ScopedTypeVariables #-}

1111{-# LANGUAGE TypeFamilies #-}

12−{-# LANGUAGE TypeOperators #-}

1312{-# LANGUAGE UndecidableInstances #-}

1413#ifdef USE_REFLEX_OPTIMIZER

1514{-# OPTIONS_GHC -fplugin=Reflex.Optimizer #-}

src/Reflex/PostBuild/Class.hs−1

@@ -6,7 +6,6 @@

66{-# LANGUAGE FunctionalDependencies #-}

77{-# LANGUAGE ScopedTypeVariables #-}

88{-# LANGUAGE TypeFamilies #-}

9−{-# LANGUAGE TypeOperators #-}

109{-# LANGUAGE UndecidableInstances #-}

1110#ifdef USE_REFLEX_OPTIMIZER

1211{-# OPTIONS_GHC -fplugin=Reflex.Optimizer #-}

src/Reflex/Spider/Internal.hs+1−1

@@ -9,7 +9,6 @@

99{-# LANGUAGE GADTs #-}

1010{-# LANGUAGE GeneralizedNewtypeDeriving #-}

1111{-# LANGUAGE LambdaCase #-}

12−{-# LANGUAGE MultiWayIf #-}

1312{-# LANGUAGE RankNTypes #-}

1413{-# LANGUAGE RoleAnnotations #-}

1514{-# LANGUAGE ScopedTypeVariables #-}

@@ -20,6 +19,7 @@

2019{-# LANGUAGE DeriveFunctor #-}

2120{-# LANGUAGE StandaloneDeriving #-}

2221{-# LANGUAGE InstanceSigs #-}

22+{-# LANGUAGE MultiWayIf #-}

2323

2424#ifdef USE_REFLEX_OPTIMIZER

2525{-# OPTIONS_GHC -fplugin=Reflex.Optimizer #-}

test/GC.hs+1

@@ -18,6 +18,7 @@ import Data.GADT.Compare

1818import Data.IORef

1919import Data.Semigroup

2020import Data.These

21+import Data.Type.Equality ((:~:)(Refl))

2122

2223import Data.Functor.Misc

2324import Data.Patch

test/hlint.hs+2−1

@@ -1,7 +1,7 @@

11module Main where

33import Control.Monad

4−import Language.Haskell.HLint3 (hlint)

4+import Language.Haskell.HLint (hlint)

55import System.Directory

66import System.Exit (exitFailure, exitSuccess)

77import System.FilePath

@@ -22,6 +22,7 @@ main = do

2222 , "--ignore=Use unless"

2323 , "--ignore=Reduce duplication"

2424 , "--cpp-define=USE_TEMPLATE_HASKELL"

25+ , "--cpp-define=DEBUG"

2526 , "--ignore=Use tuple-section"

2627 ]

2728 recurseInto = and <$> sequence