Merge remote-tracking branch 'origin/develop' into ghc810

This commit is contained in:
Hamish Mackenzie 2020-11-21 23:11:09 +13:00
commit 157e8eb314
No known key found for this signature in database
GPG Key ID: 538A4CC29D74DADF
8 changed files with 16 additions and 8 deletions

View File

@ -1,7 +1,13 @@
# Revision history for reflex # Revision history for reflex
## Unreleased ## 0.8.0.0
* Replace 0.7.2.0 with 0.8.0.0 to reflect the `MonadHold` interface change. Deprecates 0.7.2.0.
## 0.7.2.0
* ([#416](https://github.com/reflex-frp/reflex/pull/416)) Add `now :: m (Event t ())` to `MonadHold`. * ([#416](https://github.com/reflex-frp/reflex/pull/416)) Add `now :: m (Event t ())` to `MonadHold`.
* Extend some dependency version bounds
* Fix HLint 3 test
## 0.7.1.0 ## 0.7.1.0

View File

@ -1,5 +1,5 @@
Name: reflex Name: reflex
Version: 0.7.1.0 Version: 0.8.0.0
Synopsis: Higher-order Functional Reactive Programming Synopsis: Higher-order Functional Reactive Programming
Description: Description:
Interactive programs without callbacks or side-effects. Interactive programs without callbacks or side-effects.
@ -257,7 +257,10 @@ test-suite hlint
, directory , directory
, filepath , filepath
, filemanip , filemanip
, hlint (< 2.1 || >= 2.2.2) && < 3 if impl(ghc >= 8.8)
build-depends: hlint >= 3
else
build-depends: hlint (< 2.1 || >= 2.2.2) && < 3
if impl(ghcjs) if impl(ghcjs)
buildable: False buildable: False

View File

@ -8,7 +8,6 @@
{-# LANGUAGE RankNTypes #-} {-# LANGUAGE RankNTypes #-}
{-# LANGUAGE ScopedTypeVariables #-} {-# LANGUAGE ScopedTypeVariables #-}
{-# LANGUAGE TypeFamilies #-} {-# LANGUAGE TypeFamilies #-}
{-# LANGUAGE TypeOperators #-}
{-# LANGUAGE UndecidableInstances #-} {-# LANGUAGE UndecidableInstances #-}
#ifdef USE_REFLEX_OPTIMIZER #ifdef USE_REFLEX_OPTIMIZER
{-# OPTIONS_GHC -fplugin=Reflex.Optimizer #-} {-# OPTIONS_GHC -fplugin=Reflex.Optimizer #-}

View File

@ -9,7 +9,6 @@
{-# LANGUAGE RecursiveDo #-} {-# LANGUAGE RecursiveDo #-}
{-# LANGUAGE ScopedTypeVariables #-} {-# LANGUAGE ScopedTypeVariables #-}
{-# LANGUAGE TypeFamilies #-} {-# LANGUAGE TypeFamilies #-}
{-# LANGUAGE TypeOperators #-}
{-# LANGUAGE UndecidableInstances #-} {-# LANGUAGE UndecidableInstances #-}
#ifdef USE_REFLEX_OPTIMIZER #ifdef USE_REFLEX_OPTIMIZER
{-# OPTIONS_GHC -fplugin=Reflex.Optimizer #-} {-# OPTIONS_GHC -fplugin=Reflex.Optimizer #-}

View File

@ -6,7 +6,6 @@
{-# LANGUAGE FunctionalDependencies #-} {-# LANGUAGE FunctionalDependencies #-}
{-# LANGUAGE ScopedTypeVariables #-} {-# LANGUAGE ScopedTypeVariables #-}
{-# LANGUAGE TypeFamilies #-} {-# LANGUAGE TypeFamilies #-}
{-# LANGUAGE TypeOperators #-}
{-# LANGUAGE UndecidableInstances #-} {-# LANGUAGE UndecidableInstances #-}
#ifdef USE_REFLEX_OPTIMIZER #ifdef USE_REFLEX_OPTIMIZER
{-# OPTIONS_GHC -fplugin=Reflex.Optimizer #-} {-# OPTIONS_GHC -fplugin=Reflex.Optimizer #-}

View File

@ -9,7 +9,6 @@
{-# LANGUAGE GADTs #-} {-# LANGUAGE GADTs #-}
{-# LANGUAGE GeneralizedNewtypeDeriving #-} {-# LANGUAGE GeneralizedNewtypeDeriving #-}
{-# LANGUAGE LambdaCase #-} {-# LANGUAGE LambdaCase #-}
{-# LANGUAGE MultiWayIf #-}
{-# LANGUAGE RankNTypes #-} {-# LANGUAGE RankNTypes #-}
{-# LANGUAGE RoleAnnotations #-} {-# LANGUAGE RoleAnnotations #-}
{-# LANGUAGE ScopedTypeVariables #-} {-# LANGUAGE ScopedTypeVariables #-}
@ -20,6 +19,7 @@
{-# LANGUAGE DeriveFunctor #-} {-# LANGUAGE DeriveFunctor #-}
{-# LANGUAGE StandaloneDeriving #-} {-# LANGUAGE StandaloneDeriving #-}
{-# LANGUAGE InstanceSigs #-} {-# LANGUAGE InstanceSigs #-}
{-# LANGUAGE MultiWayIf #-}
#ifdef USE_REFLEX_OPTIMIZER #ifdef USE_REFLEX_OPTIMIZER
{-# OPTIONS_GHC -fplugin=Reflex.Optimizer #-} {-# OPTIONS_GHC -fplugin=Reflex.Optimizer #-}

View File

@ -18,6 +18,7 @@ import Data.GADT.Compare
import Data.IORef import Data.IORef
import Data.Semigroup import Data.Semigroup
import Data.These import Data.These
import Data.Type.Equality ((:~:)(Refl))
import Data.Functor.Misc import Data.Functor.Misc
import Data.Patch import Data.Patch

View File

@ -1,7 +1,7 @@
module Main where module Main where
import Control.Monad import Control.Monad
import Language.Haskell.HLint3 (hlint) import Language.Haskell.HLint (hlint)
import System.Directory import System.Directory
import System.Exit (exitFailure, exitSuccess) import System.Exit (exitFailure, exitSuccess)
import System.FilePath import System.FilePath
@ -22,6 +22,7 @@ main = do
, "--ignore=Use unless" , "--ignore=Use unless"
, "--ignore=Reduce duplication" , "--ignore=Reduce duplication"
, "--cpp-define=USE_TEMPLATE_HASKELL" , "--cpp-define=USE_TEMPLATE_HASKELL"
, "--cpp-define=DEBUG"
, "--ignore=Use tuple-section" , "--ignore=Use tuple-section"
] ]
recurseInto = and <$> sequence recurseInto = and <$> sequence