mirror of
https://github.com/jtdaugherty/brick.git
synced 2024-11-29 21:46:11 +03:00
Merge pull request #340 from sjakobi/less-compat
Remove some compat code for base < 4.8 / GHC < 7.10
This commit is contained in:
commit
16d4d0a159
@ -2,10 +2,6 @@
|
||||
{-# LANGUAGE OverloadedStrings #-}
|
||||
module Main where
|
||||
|
||||
#if !MIN_VERSION_base(4,8,0)
|
||||
import Control.Applicative ((<$>))
|
||||
#endif
|
||||
|
||||
#if !(MIN_VERSION_base(4,11,0))
|
||||
import Data.Monoid ((<>))
|
||||
#endif
|
||||
|
@ -2,10 +2,6 @@
|
||||
{-# LANGUAGE OverloadedStrings #-}
|
||||
module Main where
|
||||
|
||||
#if !MIN_VERSION_base(4,8,0)
|
||||
import Control.Applicative
|
||||
#endif
|
||||
|
||||
import Control.Monad (void)
|
||||
#if !(MIN_VERSION_base(4,11,0))
|
||||
import Data.Monoid ((<>))
|
||||
|
@ -3,9 +3,6 @@
|
||||
{-# LANGUAGE TemplateHaskell #-}
|
||||
module Main where
|
||||
|
||||
#if !MIN_VERSION_base(4,8,0)
|
||||
import Control.Applicative ((<$>))
|
||||
#endif
|
||||
import Lens.Micro ((^.), (&), (.~), (%~))
|
||||
import Lens.Micro.TH (makeLenses)
|
||||
import Control.Monad (void)
|
||||
|
@ -1,9 +1,6 @@
|
||||
{-# LANGUAGE OverloadedStrings #-}
|
||||
module Main where
|
||||
|
||||
#if !MIN_VERSION_base(4,8,0)
|
||||
import Control.Applicative ((<$>))
|
||||
#endif
|
||||
#if !(MIN_VERSION_base(4,11,0))
|
||||
import Data.Monoid ((<>))
|
||||
#endif
|
||||
|
@ -2,10 +2,6 @@
|
||||
{-# LANGUAGE OverloadedStrings #-}
|
||||
module Main where
|
||||
|
||||
#if !MIN_VERSION_base(4,8,0)
|
||||
import Control.Applicative
|
||||
#endif
|
||||
|
||||
import Control.Monad (void)
|
||||
#if !(MIN_VERSION_base(4,11,0))
|
||||
import Data.Monoid ((<>))
|
||||
|
@ -45,11 +45,6 @@ module Brick.AttrMap
|
||||
)
|
||||
where
|
||||
|
||||
#if !MIN_VERSION_base(4,8,0)
|
||||
import Control.Applicative ((<$>))
|
||||
import Data.Monoid
|
||||
#endif
|
||||
|
||||
import qualified Data.Semigroup as Sem
|
||||
|
||||
import Control.DeepSeq
|
||||
|
@ -8,10 +8,6 @@ module Brick.BChan
|
||||
)
|
||||
where
|
||||
|
||||
#if !MIN_VERSION_base(4,8,0)
|
||||
import Control.Applicative ((<$>))
|
||||
#endif
|
||||
|
||||
import Control.Concurrent.STM.TBQueue
|
||||
import Control.Monad.STM (atomically, orElse)
|
||||
|
||||
|
@ -56,10 +56,6 @@ import Control.Monad.Trans.Class (lift)
|
||||
import Control.Monad.Trans.State
|
||||
import Control.Monad.Trans.Reader
|
||||
import Control.Concurrent (forkIO, killThread)
|
||||
#if !MIN_VERSION_base(4,8,0)
|
||||
import Control.Applicative ((<$>))
|
||||
import Data.Monoid (mempty)
|
||||
#endif
|
||||
import qualified Data.Foldable as F
|
||||
import Data.Maybe (listToMaybe)
|
||||
import qualified Data.Map as M
|
||||
|
@ -84,11 +84,6 @@ module Brick.Types
|
||||
)
|
||||
where
|
||||
|
||||
#if !MIN_VERSION_base(4,8,0)
|
||||
import Control.Applicative
|
||||
import Data.Monoid (Monoid(..))
|
||||
#endif
|
||||
|
||||
import Lens.Micro (_1, _2, to, (^.), (&), (.~), Lens')
|
||||
import Lens.Micro.Type (Getting)
|
||||
import Control.Monad.Catch (MonadThrow, MonadCatch, MonadMask)
|
||||
|
@ -53,10 +53,6 @@ module Brick.Types.Internal
|
||||
)
|
||||
where
|
||||
|
||||
#if !MIN_VERSION_base(4,8,0)
|
||||
import Data.Monoid
|
||||
#endif
|
||||
|
||||
import Lens.Micro (_1, _2, Lens')
|
||||
import Lens.Micro.TH (makeLenses)
|
||||
import qualified Data.Set as S
|
||||
|
@ -26,10 +26,6 @@ module Brick.Widgets.Border
|
||||
)
|
||||
where
|
||||
|
||||
#if !MIN_VERSION_base(4,8,0)
|
||||
import Control.Applicative ((<$>))
|
||||
#endif
|
||||
|
||||
import Lens.Micro ((^.), (&), (.~), to)
|
||||
import Graphics.Vty (imageHeight, imageWidth)
|
||||
|
||||
|
@ -100,11 +100,6 @@ where
|
||||
import Data.Monoid ((<>))
|
||||
#endif
|
||||
|
||||
#if !MIN_VERSION_base(4,8,0)
|
||||
import Control.Applicative
|
||||
import Data.Monoid ((<>), mempty)
|
||||
#endif
|
||||
|
||||
import Lens.Micro ((^.), (.~), (&), (%~), to, _1, _2, each, to, Lens')
|
||||
import Lens.Micro.Mtl (use, (%=))
|
||||
import Control.Monad ((>=>),when)
|
||||
|
@ -36,10 +36,6 @@ module Brick.Widgets.Dialog
|
||||
)
|
||||
where
|
||||
|
||||
#if !MIN_VERSION_base(4,8,0)
|
||||
import Control.Applicative
|
||||
#endif
|
||||
|
||||
import Lens.Micro
|
||||
#if !(MIN_VERSION_base(4,11,0))
|
||||
import Data.Monoid
|
||||
|
@ -7,10 +7,6 @@ module Brick.Widgets.Internal
|
||||
)
|
||||
where
|
||||
|
||||
#if !MIN_VERSION_base(4,8,0)
|
||||
import Control.Applicative
|
||||
#endif
|
||||
|
||||
import Lens.Micro ((^.), (&), (%~))
|
||||
import Control.Monad.Trans.State.Lazy
|
||||
import Control.Monad.Trans.Reader
|
||||
|
@ -78,13 +78,7 @@ where
|
||||
import Prelude hiding (reverse, splitAt)
|
||||
|
||||
import Control.Applicative ((<|>))
|
||||
#if !MIN_VERSION_base(4,8,0)
|
||||
import Control.Applicative ((<$>), (<*>), pure)
|
||||
import Data.Foldable (Foldable, find, toList)
|
||||
import Data.Traversable (Traversable)
|
||||
#else
|
||||
import Data.Foldable (find, toList)
|
||||
#endif
|
||||
import Control.Monad.Trans.State (evalState, get, put)
|
||||
|
||||
import Lens.Micro ((^.), (^?), (&), (.~), (%~), _2, _head, set)
|
||||
|
@ -17,11 +17,6 @@ module Data.Text.Markup
|
||||
)
|
||||
where
|
||||
|
||||
#if !MIN_VERSION_base(4,8,0)
|
||||
import Control.Applicative ((<$>))
|
||||
import Data.Monoid
|
||||
#endif
|
||||
|
||||
import qualified Data.Semigroup as Sem
|
||||
import Data.String (IsString(..))
|
||||
import qualified Data.Text as T
|
||||
|
Loading…
Reference in New Issue
Block a user