disambiguate the base-compat imports in hledger package too (#794)

This commit is contained in:
Simon Michael 2018-06-04 16:32:57 -07:00
parent 0ce9c5728a
commit ec39c87ca8
4 changed files with 10 additions and 9 deletions

View File

@ -5,7 +5,7 @@ related utilities used by hledger commands.
-}
{-# LANGUAGE CPP, ScopedTypeVariables, DeriveDataTypeable, FlexibleContexts, TypeFamilies, OverloadedStrings #-}
{-# LANGUAGE CPP, ScopedTypeVariables, DeriveDataTypeable, FlexibleContexts, TypeFamilies, OverloadedStrings, PackageImports #-}
module Hledger.Cli.CliOptions (
@ -71,7 +71,7 @@ module Hledger.Cli.CliOptions (
where
import Prelude ()
import Prelude.Compat
import "base-compat-batteries" Prelude.Compat
import qualified Control.Exception as C
import Control.Monad (when)
import Data.Char
@ -80,7 +80,7 @@ import Data.Default
import Data.Functor.Compat ((<$>))
#endif
import Data.Functor.Identity (Identity)
import Data.List.Compat
import "base-compat-batteries" Data.List.Compat
import Data.List.Split (splitOneOf)
import Data.Ord
import Data.Maybe

View File

@ -3,7 +3,7 @@ A history-aware add command to help with data entry.
|-}
{-# OPTIONS_GHC -fno-warn-missing-signatures -fno-warn-unused-do-bind #-}
{-# LANGUAGE ScopedTypeVariables, DeriveDataTypeable, RecordWildCards, TypeOperators, FlexibleContexts, OverloadedStrings #-}
{-# LANGUAGE ScopedTypeVariables, DeriveDataTypeable, RecordWildCards, TypeOperators, FlexibleContexts, OverloadedStrings, PackageImports #-}
module Hledger.Cli.Commands.Add (
addmode
@ -15,7 +15,7 @@ module Hledger.Cli.Commands.Add (
where
import Prelude ()
import Prelude.Compat
import "base-compat-batteries" Prelude.Compat
import Control.Exception as E
import Control.Monad
import Control.Monad.Trans.Class
@ -23,7 +23,7 @@ import Control.Monad.State.Strict (evalState, evalStateT)
import Control.Monad.Trans (liftIO)
import Data.Char (toUpper, toLower)
import Data.Functor.Identity (Identity(..))
import Data.List.Compat
import "base-compat-batteries" Data.List.Compat
import qualified Data.Set as S
import Data.Maybe
import Data.Text (Text)

View File

@ -7,6 +7,7 @@ The help command.
--TODO substring matching
{-# LANGUAGE QuasiQuotes #-}
{-# LANGUAGE PackageImports #-}
module Hledger.Cli.Commands.Help (
@ -16,7 +17,7 @@ module Hledger.Cli.Commands.Help (
) where
import Prelude ()
import Prelude.Compat
import "base-compat-batteries" Prelude.Compat
import Data.Char
import Data.List
import Data.Maybe

View File

@ -1,4 +1,4 @@
{-# LANGUAGE TemplateHaskell, OverloadedStrings #-}
{-# LANGUAGE TemplateHaskell, OverloadedStrings, PackageImports #-}
{-|
Embedded documentation files in various formats, and helpers for viewing them.
@ -21,7 +21,7 @@ module Hledger.Cli.DocFiles (
) where
import Prelude ()
import Prelude.Compat
import "base-compat-batteries" Prelude.Compat
import Data.FileEmbed
import Data.String
import System.IO