lib: restrict imports, avoiding GHCI clashes

This commit is contained in:
Simon Michael 2016-11-20 10:27:16 -08:00
parent 1539b258b9
commit 7d56af5a03
2 changed files with 13 additions and 14 deletions

View File

@ -23,8 +23,8 @@ module Hledger.Read (
readJournal', readJournal',
-- * Re-exported -- * Re-exported
accountaliasp, JournalReader.accountaliasp,
postingp, JournalReader.postingp,
module Hledger.Read.Common, module Hledger.Read.Common,
-- * Tests -- * Tests
@ -51,11 +51,11 @@ import Text.Printf
import Hledger.Data.Dates (getCurrentDay) import Hledger.Data.Dates (getCurrentDay)
import Hledger.Data.Types import Hledger.Data.Types
import Hledger.Read.Common import Hledger.Read.Common
import Hledger.Read.JournalReader as JournalReader import qualified Hledger.Read.JournalReader as JournalReader
import Hledger.Read.LedgerReader as LedgerReader import qualified Hledger.Read.LedgerReader as LedgerReader
import Hledger.Read.TimedotReader as TimedotReader import qualified Hledger.Read.TimedotReader as TimedotReader
import Hledger.Read.TimeclockReader as TimeclockReader import qualified Hledger.Read.TimeclockReader as TimeclockReader
import Hledger.Read.CsvReader as CsvReader import qualified Hledger.Read.CsvReader as CsvReader
import Hledger.Utils import Hledger.Utils
import Prelude hiding (getContents, writeFile) import Prelude hiding (getContents, writeFile)
import Hledger.Utils.UTF8IOCompat (writeFile) import Hledger.Utils.UTF8IOCompat (writeFile)
@ -241,11 +241,11 @@ samplejournal = readJournal' $ T.unlines
tests_Hledger_Read = TestList $ tests_Hledger_Read = TestList $
tests_readJournal' tests_readJournal'
++ [ ++ [
tests_Hledger_Read_JournalReader, JournalReader.tests_Hledger_Read_JournalReader,
tests_Hledger_Read_LedgerReader, LedgerReader.tests_Hledger_Read_LedgerReader,
tests_Hledger_Read_TimeclockReader, TimeclockReader.tests_Hledger_Read_TimeclockReader,
tests_Hledger_Read_TimedotReader, TimedotReader.tests_Hledger_Read_TimedotReader,
tests_Hledger_Read_CsvReader, CsvReader.tests_Hledger_Read_CsvReader,
"journal" ~: do "journal" ~: do
r <- runExceptT $ parseWithState mempty JournalReader.journalp "" r <- runExceptT $ parseWithState mempty JournalReader.journalp ""

View File

@ -13,8 +13,7 @@ module Ledger.Parser.Text
) where ) where
import Control.Applicative import Control.Applicative
import Data.ByteString as B hiding (pack, unpack, singleton, import Data.ByteString (ByteString)
zipWith, concat)
import Data.Maybe import Data.Maybe
import qualified Data.Text.Encoding as E import qualified Data.Text.Encoding as E
import Filesystem.Path.CurrentOS hiding (concat) import Filesystem.Path.CurrentOS hiding (concat)