silence redundant import warnings with ghc 8.4

This commit is contained in:
Simon Michael 2018-03-24 22:51:56 +00:00
parent 47615c8af8
commit 84579bb1b4
22 changed files with 69 additions and 3 deletions

View File

@ -76,6 +76,8 @@ hledger-check "(assets:overdraft < £2000) ==> (*assets:checking == £0)"
"If I have taken money from my overdraft, then I must have no money in "If I have taken money from my overdraft, then I must have no money in
my checking account (including subaccounts)." my checking account (including subaccounts)."
-} -}
{-# LANGUAGE CPP #-}
module Main where module Main where
import Control.Arrow (first) import Control.Arrow (first)
@ -88,7 +90,9 @@ import Data.Functor.Identity (Identity(..))
import Data.List (foldl', groupBy, intercalate, nub, sortOn) import Data.List (foldl', groupBy, intercalate, nub, sortOn)
import Data.List.NonEmpty (NonEmpty(..), nonEmpty, toList) import Data.List.NonEmpty (NonEmpty(..), nonEmpty, toList)
import Data.Maybe (fromMaybe, mapMaybe) import Data.Maybe (fromMaybe, mapMaybe)
#if !(MIN_VERSION_base(4,11,0))
import Data.Monoid ((<>)) import Data.Monoid ((<>))
#endif
import Data.Time.Calendar (toGregorian) import Data.Time.Calendar (toGregorian)
import Data.Time.Calendar.OrdinalDate (mondayStartWeek, sundayStartWeek, toOrdinalDate) import Data.Time.Calendar.OrdinalDate (mondayStartWeek, sundayStartWeek, toOrdinalDate)
import Data.Text (isPrefixOf, pack, unpack) import Data.Text (isPrefixOf, pack, unpack)

View File

@ -1,4 +1,6 @@
{-# LANGUAGE NoMonomorphismRestriction, OverloadedStrings #-} {-# LANGUAGE NoMonomorphismRestriction #-}
{-# LANGUAGE OverloadedStrings #-}
{-# LANGUAGE CPP #-}
{-| {-|
'AccountName's are strings like @assets:cash:petty@, with multiple 'AccountName's are strings like @assets:cash:petty@, with multiple
@ -10,7 +12,9 @@ hierarchy.
module Hledger.Data.AccountName module Hledger.Data.AccountName
where where
import Data.List import Data.List
#if !(MIN_VERSION_base(4,11,0))
import Data.Monoid import Data.Monoid
#endif
import Data.Text (Text) import Data.Text (Text)
import qualified Data.Text as T import qualified Data.Text as T
import Data.Tree import Data.Tree

View File

@ -1,4 +1,6 @@
{-# LANGUAGE OverloadedStrings, ViewPatterns #-} {-# LANGUAGE OverloadedStrings #-}
{-# LANGUAGE ViewPatterns #-}
{-# LANGUAGE CPP #-}
{-| {-|
This module provides utilities for applying automated transactions like This module provides utilities for applying automated transactions like
@ -18,7 +20,9 @@ module Hledger.Data.AutoTransaction
where where
import Data.Maybe import Data.Maybe
#if !(MIN_VERSION_base(4,11,0))
import Data.Monoid ((<>)) import Data.Monoid ((<>))
#endif
import Data.Time.Calendar import Data.Time.Calendar
import qualified Data.Text as T import qualified Data.Text as T
import Hledger.Data.Types import Hledger.Data.Types

View File

@ -8,12 +8,15 @@ are thousands separated by comma, significant decimal places and so on.
-} -}
{-# LANGUAGE OverloadedStrings #-} {-# LANGUAGE OverloadedStrings #-}
{-# LANGUAGE CPP #-}
module Hledger.Data.Commodity module Hledger.Data.Commodity
where where
import Data.List import Data.List
import Data.Maybe (fromMaybe) import Data.Maybe (fromMaybe)
#if !(MIN_VERSION_base(4,11,0))
import Data.Monoid import Data.Monoid
#endif
import qualified Data.Text as T import qualified Data.Text as T
import Test.HUnit import Test.HUnit
-- import qualified Data.Map as M -- import qualified Data.Map as M

View File

@ -84,7 +84,9 @@ import Data.List
import Data.List.Extra (groupSort) import Data.List.Extra (groupSort)
-- import Data.Map (findWithDefault) -- import Data.Map (findWithDefault)
import Data.Maybe import Data.Maybe
#if !(MIN_VERSION_base(4,11,0))
import Data.Monoid import Data.Monoid
#endif
import Data.Ord import Data.Ord
import qualified Data.Semigroup as Sem import qualified Data.Semigroup as Sem
import Data.Text (Text) import Data.Text (Text)

View File

@ -8,6 +8,7 @@ look up the date or description there.
-} -}
{-# LANGUAGE OverloadedStrings #-} {-# LANGUAGE OverloadedStrings #-}
{-# LANGUAGE CPP #-}
module Hledger.Data.Posting ( module Hledger.Data.Posting (
-- * Posting -- * Posting
@ -59,7 +60,9 @@ where
import Data.List import Data.List
import Data.Maybe import Data.Maybe
import Data.MemoUgly (memo) import Data.MemoUgly (memo)
#if !(MIN_VERSION_base(4,11,0))
import Data.Monoid import Data.Monoid
#endif
import Data.Ord import Data.Ord
import Data.Text (Text) import Data.Text (Text)
import qualified Data.Text as T import qualified Data.Text as T

View File

@ -6,6 +6,7 @@ transactions..) by various criteria, and a SimpleTextParser for query expressio
-} -}
{-# LANGUAGE DeriveDataTypeable, OverloadedStrings, ViewPatterns #-} {-# LANGUAGE DeriveDataTypeable, OverloadedStrings, ViewPatterns #-}
{-# LANGUAGE CPP #-}
module Hledger.Query ( module Hledger.Query (
-- * Query and QueryOpt -- * Query and QueryOpt
@ -49,7 +50,9 @@ import Data.Data
import Data.Either import Data.Either
import Data.List import Data.List
import Data.Maybe import Data.Maybe
#if !(MIN_VERSION_base(4,11,0))
import Data.Monoid ((<>)) import Data.Monoid ((<>))
#endif
-- import Data.Text (Text) -- import Data.Text (Text)
import qualified Data.Text as T import qualified Data.Text as T
import Data.Time.Calendar import Data.Time.Calendar

View File

@ -33,7 +33,9 @@ import Data.List.NonEmpty (NonEmpty(..))
import Data.List.Split (wordsBy) import Data.List.Split (wordsBy)
import Data.Maybe import Data.Maybe
import qualified Data.Map as M import qualified Data.Map as M
#if !(MIN_VERSION_base(4,11,0))
import Data.Monoid import Data.Monoid
#endif
import Data.Text (Text) import Data.Text (Text)
import qualified Data.Text as T import qualified Data.Text as T
import Data.Time.Calendar import Data.Time.Calendar

View File

@ -79,7 +79,9 @@ import Control.Monad
import Control.Monad.Except (ExceptT(..), runExceptT, throwError) import Control.Monad.Except (ExceptT(..), runExceptT, throwError)
import Control.Monad.State.Strict import Control.Monad.State.Strict
import qualified Data.Map.Strict as M import qualified Data.Map.Strict as M
#if !(MIN_VERSION_base(4,11,0))
import Data.Monoid import Data.Monoid
#endif
import Data.Text (Text) import Data.Text (Text)
import Data.String import Data.String
import Data.List import Data.List

View File

@ -2,6 +2,7 @@
-- There may be better alternatives out there. -- There may be better alternatives out there.
{-# LANGUAGE OverloadedStrings #-} {-# LANGUAGE OverloadedStrings #-}
{-# LANGUAGE CPP #-}
module Hledger.Utils.Text module Hledger.Utils.Text
-- ( -- (
@ -57,7 +58,9 @@ where
-- import Data.Char -- import Data.Char
import Data.List import Data.List
#if !(MIN_VERSION_base(4,11,0))
import Data.Monoid import Data.Monoid
#endif
import Data.Text (Text) import Data.Text (Text)
import qualified Data.Text as T import qualified Data.Text as T
-- import Text.Parsec -- import Text.Parsec

View File

@ -2,6 +2,7 @@
{-# LANGUAGE OverloadedStrings #-} {-# LANGUAGE OverloadedStrings #-}
{-# LANGUAGE RecordWildCards #-} {-# LANGUAGE RecordWildCards #-}
{-# LANGUAGE CPP #-}
module Hledger.UI.AccountsScreen module Hledger.UI.AccountsScreen
(accountsScreen (accountsScreen
@ -18,7 +19,9 @@ import Control.Monad
import Control.Monad.IO.Class (liftIO) import Control.Monad.IO.Class (liftIO)
import Data.List import Data.List
import Data.Maybe import Data.Maybe
#if !(MIN_VERSION_base(4,11,0))
import Data.Monoid import Data.Monoid
#endif
import qualified Data.Text as T import qualified Data.Text as T
import Data.Time.Calendar (Day) import Data.Time.Calendar (Day)
import qualified Data.Vector as V import qualified Data.Vector as V

View File

@ -1,6 +1,7 @@
-- The error screen, showing a current error condition (such as a parse error after reloading the journal) -- The error screen, showing a current error condition (such as a parse error after reloading the journal)
{-# LANGUAGE OverloadedStrings, FlexibleContexts, RecordWildCards #-} {-# LANGUAGE OverloadedStrings, FlexibleContexts, RecordWildCards #-}
{-# LANGUAGE CPP #-}
module Hledger.UI.ErrorScreen module Hledger.UI.ErrorScreen
(errorScreen (errorScreen
@ -14,7 +15,9 @@ import Brick
-- import Brick.Widgets.Border (borderAttr) -- import Brick.Widgets.Border (borderAttr)
import Control.Monad import Control.Monad
import Control.Monad.IO.Class (liftIO) import Control.Monad.IO.Class (liftIO)
#if !(MIN_VERSION_base(4,11,0))
import Data.Monoid import Data.Monoid
#endif
import Data.Time.Calendar (Day) import Data.Time.Calendar (Day)
import Graphics.Vty (Event(..),Key(..)) import Graphics.Vty (Event(..),Key(..))
import Text.Megaparsec.Compat import Text.Megaparsec.Compat

View File

@ -1,6 +1,7 @@
-- The account register screen, showing transactions in an account, like hledger-web's register. -- The account register screen, showing transactions in an account, like hledger-web's register.
{-# LANGUAGE OverloadedStrings, FlexibleContexts, RecordWildCards #-} {-# LANGUAGE OverloadedStrings, FlexibleContexts, RecordWildCards #-}
{-# LANGUAGE CPP #-}
module Hledger.UI.RegisterScreen module Hledger.UI.RegisterScreen
(registerScreen (registerScreen
@ -14,7 +15,9 @@ import Control.Monad
import Control.Monad.IO.Class (liftIO) import Control.Monad.IO.Class (liftIO)
import Data.List import Data.List
import Data.List.Split (splitOn) import Data.List.Split (splitOn)
#if !(MIN_VERSION_base(4,11,0))
import Data.Monoid import Data.Monoid
#endif
import Data.Maybe import Data.Maybe
import qualified Data.Text as T import qualified Data.Text as T
import Data.Time.Calendar import Data.Time.Calendar

View File

@ -9,6 +9,7 @@
{-# LANGUAGE OverloadedStrings #-} {-# LANGUAGE OverloadedStrings #-}
{-# LANGUAGE CPP #-}
module Hledger.UI.Theme ( module Hledger.UI.Theme (
defaultTheme defaultTheme
@ -19,7 +20,9 @@ module Hledger.UI.Theme (
import qualified Data.Map as M import qualified Data.Map as M
import Data.Maybe import Data.Maybe
#if !(MIN_VERSION_base(4,11,0))
import Data.Monoid import Data.Monoid
#endif
import Graphics.Vty import Graphics.Vty
import Brick import Brick
import Brick.Widgets.Border import Brick.Widgets.Border

View File

@ -1,6 +1,7 @@
-- The transaction screen, showing a single transaction's general journal entry. -- The transaction screen, showing a single transaction's general journal entry.
{-# LANGUAGE OverloadedStrings, TupleSections, RecordWildCards #-} -- , FlexibleContexts {-# LANGUAGE OverloadedStrings, TupleSections, RecordWildCards #-} -- , FlexibleContexts
{-# LANGUAGE CPP #-}
module Hledger.UI.TransactionScreen module Hledger.UI.TransactionScreen
(transactionScreen (transactionScreen
@ -11,7 +12,9 @@ where
import Control.Monad import Control.Monad
import Control.Monad.IO.Class (liftIO) import Control.Monad.IO.Class (liftIO)
import Data.List import Data.List
#if !(MIN_VERSION_base(4,11,0))
import Data.Monoid import Data.Monoid
#endif
import qualified Data.Text as T import qualified Data.Text as T
import Data.Time.Calendar (Day) import Data.Time.Calendar (Day)
import Graphics.Vty (Event(..),Key(..)) import Graphics.Vty (Event(..),Key(..))

View File

@ -2,6 +2,7 @@
{- | Rendering & misc. helpers. -} {- | Rendering & misc. helpers. -}
{-# LANGUAGE OverloadedStrings #-} {-# LANGUAGE OverloadedStrings #-}
{-# LANGUAGE CPP #-}
module Hledger.UI.UIUtils module Hledger.UI.UIUtils
where where
@ -16,7 +17,9 @@ import Brick.Widgets.List
import Control.Monad.IO.Class import Control.Monad.IO.Class
import Data.List import Data.List
import Data.Maybe import Data.Maybe
#if !(MIN_VERSION_base(4,11,0))
import Data.Monoid import Data.Monoid
#endif
import Graphics.Vty (Event(..),Key(..),Modifier(..),Color,Attr,currentAttr) import Graphics.Vty (Event(..),Key(..),Modifier(..),Color,Attr,currentAttr)
import Lens.Micro.Platform import Lens.Micro.Platform
import System.Environment import System.Environment

View File

@ -17,4 +17,6 @@ import Settings as Import
import Settings.Development as Import import Settings.Development as Import
import Settings.StaticFiles as Import import Settings.StaticFiles as Import
#if !(MIN_VERSION_base(4,11,0))
import Data.Monoid as Import ((<>)) import Data.Monoid as Import ((<>))
#endif

View File

@ -4,6 +4,7 @@ hledger's built-in commands, and helpers for printing the commands list.
{-# LANGUAGE OverloadedStrings #-} {-# LANGUAGE OverloadedStrings #-}
{-# LANGUAGE QuasiQuotes #-} {-# LANGUAGE QuasiQuotes #-}
{-# LANGUAGE CPP #-}
module Hledger.Cli.Commands ( module Hledger.Cli.Commands (
findCommand findCommand
@ -38,7 +39,9 @@ where
import Control.Monad import Control.Monad
import Data.List import Data.List
import Data.List.Split (splitOn) import Data.List.Split (splitOn)
#if !(MIN_VERSION_base(4,11,0))
import Data.Monoid ((<>)) import Data.Monoid ((<>))
#endif
import Data.String.Here import Data.String.Here
import Data.Text (Text) import Data.Text (Text)
import qualified Data.Text as T import qualified Data.Text as T

View File

@ -11,6 +11,7 @@ The @accounts@ command lists account names:
-} -}
{-# LANGUAGE OverloadedStrings #-} {-# LANGUAGE OverloadedStrings #-}
{-# LANGUAGE CPP #-}
module Hledger.Cli.Commands.Accounts ( module Hledger.Cli.Commands.Accounts (
accountsmode accountsmode
@ -19,7 +20,9 @@ module Hledger.Cli.Commands.Accounts (
) where ) where
import Data.List import Data.List
#if !(MIN_VERSION_base(4,11,0))
import Data.Monoid import Data.Monoid
#endif
-- import Data.Text (Text) -- import Data.Text (Text)
import qualified Data.Text as T import qualified Data.Text as T
import System.Console.CmdArgs.Explicit as C import System.Console.CmdArgs.Explicit as C

View File

@ -1,4 +1,5 @@
{-# LANGUAGE OverloadedStrings, LambdaCase, DeriveTraversable, ViewPatterns, QuasiQuotes #-} {-# LANGUAGE OverloadedStrings, LambdaCase, DeriveTraversable, ViewPatterns, QuasiQuotes #-}
{-# LANGUAGE CPP #-}
module Hledger.Cli.Commands.Rewrite ( module Hledger.Cli.Commands.Rewrite (
rewritemode rewritemode
@ -6,7 +7,9 @@ module Hledger.Cli.Commands.Rewrite (
) )
where where
#if !(MIN_VERSION_base(4,11,0))
import Control.Monad.Writer import Control.Monad.Writer
#endif
import Data.List (sortOn, foldl') import Data.List (sortOn, foldl')
import Data.String.Here import Data.String.Here
import qualified Data.Text as T import qualified Data.Text as T

View File

@ -1,6 +1,8 @@
{-# LANGUAGE OverloadedStrings #-}
-- from https://github.com/blaenk/blaenk.github.io -- from https://github.com/blaenk/blaenk.github.io
{-# LANGUAGE OverloadedStrings #-}
{-# LANGUAGE CPP #-}
module TableOfContents ( module TableOfContents (
tableOfContents, tableOfContents,
ignoreTOC, ignoreTOC,
@ -13,7 +15,9 @@ import Text.Pandoc.Walk (walk, query)
import Data.List (groupBy) import Data.List (groupBy)
import Data.Tree (Forest, Tree(Node)) import Data.Tree (Forest, Tree(Node))
#if !(MIN_VERSION_base(4,11,0))
import Data.Monoid ((<>), mconcat) import Data.Monoid ((<>), mconcat)
#endif
import Data.Function (on) import Data.Function (on)
import Data.Maybe (fromMaybe) import Data.Maybe (fromMaybe)

View File

@ -10,12 +10,15 @@
-- Based on code from https://github.com/blaenk/blaenk.github.io -- Based on code from https://github.com/blaenk/blaenk.github.io
{-# LANGUAGE OverloadedStrings #-} {-# LANGUAGE OverloadedStrings #-}
{-# LANGUAGE CPP #-}
import Data.Char (isDigit) import Data.Char (isDigit)
import Data.List (groupBy) import Data.List (groupBy)
import Data.List.Split import Data.List.Split
import Data.Tree (Forest, Tree(Node)) import Data.Tree (Forest, Tree(Node))
#if !(MIN_VERSION_base(4,11,0))
import Data.Monoid ((<>), mconcat) import Data.Monoid ((<>), mconcat)
#endif
import Data.Function (on) import Data.Function (on)
import Data.Maybe (fromMaybe) import Data.Maybe (fromMaybe)
import Safe import Safe