diff --git a/hledger-lib/Hledger/Read/Common.hs b/hledger-lib/Hledger/Read/Common.hs index 12b10368a..83eda4c3d 100644 --- a/hledger-lib/Hledger/Read/Common.hs +++ b/hledger-lib/Hledger/Read/Common.hs @@ -108,15 +108,12 @@ import Data.List.NonEmpty (NonEmpty(..)) import Data.List.Split (wordsBy) import Data.Maybe import qualified Data.Map as M -#if !(MIN_VERSION_base(4,11,0)) -import Data.Monoid -#endif import Data.Text (Text) import qualified Data.Text as T import Data.Time.Calendar import Data.Time.LocalTime import System.Time (getClockTime) -import Text.Megaparsec.Compat hiding (skipManyTill) +import Text.Megaparsec.Compat import Control.Applicative.Combinators (skipManyTill) import Hledger.Data diff --git a/hledger-lib/Text/Megaparsec/Compat.hs b/hledger-lib/Text/Megaparsec/Compat.hs index 33545f980..9203f77d0 100644 --- a/hledger-lib/Text/Megaparsec/Compat.hs +++ b/hledger-lib/Text/Megaparsec/Compat.hs @@ -18,10 +18,10 @@ where import qualified Data.Set as S import Data.Text -import Text.Megaparsec #if MIN_VERSION_megaparsec(6,0,0) +import Text.Megaparsec hiding (skipManyTill) import Text.Megaparsec.Char import Data.List.NonEmpty (fromList) import Data.Void (Void) @@ -48,6 +48,7 @@ mptext = string #else +import Text.Megaparsec import Text.Megaparsec.Prim (MonadParsec) -- | A basic parse error type. diff --git a/hledger-ui/Hledger/UI/AccountsScreen.hs b/hledger-ui/Hledger/UI/AccountsScreen.hs index a1a40e85a..ec8465c25 100644 --- a/hledger-ui/Hledger/UI/AccountsScreen.hs +++ b/hledger-ui/Hledger/UI/AccountsScreen.hs @@ -33,7 +33,6 @@ import System.FilePath (takeFileName) import Hledger import Hledger.Cli hiding (progname,prognameandversion) -import Hledger.Cli.Commands.Add (add) import Hledger.UI.UIOptions import Hledger.UI.UITypes import Hledger.UI.UIState diff --git a/hledger/Hledger/Cli/Commands/Rewrite.hs b/hledger/Hledger/Cli/Commands/Rewrite.hs index e9461a614..529d38449 100755 --- a/hledger/Hledger/Cli/Commands/Rewrite.hs +++ b/hledger/Hledger/Cli/Commands/Rewrite.hs @@ -14,10 +14,8 @@ import Data.List (sortOn, foldl') import Data.String.Here import qualified Data.Text as T import Hledger -import Hledger.Data.AutoTransaction (runModifierTransaction) import Hledger.Cli.CliOptions import Hledger.Cli.Commands.Print ---import Hledger.Cli hiding (outputflags) import System.Console.CmdArgs.Explicit import Text.Printf import Text.Megaparsec