From 7d56af5a030151213a216d84460c0fafa56a29e1 Mon Sep 17 00:00:00 2001
From: Simon Michael <simon@joyful.com>
Date: Sun, 20 Nov 2016 10:27:16 -0800
Subject: [PATCH] lib: restrict imports, avoiding GHCI clashes

---
 hledger-lib/Hledger/Read.hs                   | 24 +++++++++----------
 .../other/ledger-parse/Ledger/Parser/Text.hs  |  3 +--
 2 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/hledger-lib/Hledger/Read.hs b/hledger-lib/Hledger/Read.hs
index eaf9981f5..9e445f54c 100644
--- a/hledger-lib/Hledger/Read.hs
+++ b/hledger-lib/Hledger/Read.hs
@@ -23,8 +23,8 @@ module Hledger.Read (
   readJournal',
 
   -- * Re-exported
-  accountaliasp,
-  postingp,
+  JournalReader.accountaliasp,
+  JournalReader.postingp,
   module Hledger.Read.Common,
 
   -- * Tests
@@ -51,11 +51,11 @@ import Text.Printf
 import Hledger.Data.Dates (getCurrentDay)
 import Hledger.Data.Types
 import Hledger.Read.Common
-import Hledger.Read.JournalReader as JournalReader
-import Hledger.Read.LedgerReader as LedgerReader
-import Hledger.Read.TimedotReader as TimedotReader
-import Hledger.Read.TimeclockReader as TimeclockReader
-import Hledger.Read.CsvReader as CsvReader
+import qualified Hledger.Read.JournalReader   as JournalReader
+import qualified Hledger.Read.LedgerReader    as LedgerReader
+import qualified Hledger.Read.TimedotReader   as TimedotReader
+import qualified Hledger.Read.TimeclockReader as TimeclockReader
+import qualified Hledger.Read.CsvReader       as CsvReader
 import Hledger.Utils
 import Prelude hiding (getContents, writeFile)
 import Hledger.Utils.UTF8IOCompat (writeFile)
@@ -241,11 +241,11 @@ samplejournal = readJournal' $ T.unlines
 tests_Hledger_Read = TestList $
   tests_readJournal'
   ++ [
-   tests_Hledger_Read_JournalReader,
-   tests_Hledger_Read_LedgerReader,
-   tests_Hledger_Read_TimeclockReader,
-   tests_Hledger_Read_TimedotReader,
-   tests_Hledger_Read_CsvReader,
+   JournalReader.tests_Hledger_Read_JournalReader,
+   LedgerReader.tests_Hledger_Read_LedgerReader,
+   TimeclockReader.tests_Hledger_Read_TimeclockReader,
+   TimedotReader.tests_Hledger_Read_TimedotReader,
+   CsvReader.tests_Hledger_Read_CsvReader,
 
    "journal" ~: do
     r <- runExceptT $ parseWithState mempty JournalReader.journalp ""
diff --git a/hledger-lib/other/ledger-parse/Ledger/Parser/Text.hs b/hledger-lib/other/ledger-parse/Ledger/Parser/Text.hs
index 1d114eaf6..14728fecb 100644
--- a/hledger-lib/other/ledger-parse/Ledger/Parser/Text.hs
+++ b/hledger-lib/other/ledger-parse/Ledger/Parser/Text.hs
@@ -13,8 +13,7 @@ module Ledger.Parser.Text
        ) where
 
 import           Control.Applicative
-import           Data.ByteString as B hiding (pack, unpack, singleton,
-                                              zipWith, concat)
+import           Data.ByteString (ByteString)
 import           Data.Maybe
 import qualified Data.Text.Encoding as E
 import           Filesystem.Path.CurrentOS hiding (concat)