diff --git a/hledger-lib/Hledger/Utils.hs b/hledger-lib/Hledger/Utils.hs index 47acc1691..43155fca6 100644 --- a/hledger-lib/Hledger/Utils.hs +++ b/hledger-lib/Hledger/Utils.hs @@ -76,7 +76,7 @@ module Hledger.Utils ( -- * Other module Hledger.Utils.Debug, module Hledger.Utils.Parse, - module Hledger.Utils.Print, + module Hledger.Utils.IO, module Hledger.Utils.Regex, module Hledger.Utils.String, module Hledger.Utils.Text, @@ -112,7 +112,7 @@ import System.IO import Hledger.Utils.Debug import Hledger.Utils.Parse -import Hledger.Utils.Print +import Hledger.Utils.IO import Hledger.Utils.Regex import Hledger.Utils.String import Hledger.Utils.Text diff --git a/hledger-lib/Hledger/Utils/Debug.hs b/hledger-lib/Hledger/Utils/Debug.hs index d9a3ff3d1..926b708de 100644 --- a/hledger-lib/Hledger/Utils/Debug.hs +++ b/hledger-lib/Hledger/Utils/Debug.hs @@ -146,7 +146,7 @@ import System.Environment (getProgName) import System.Exit (exitFailure) import System.IO.Unsafe (unsafePerformIO) -import Hledger.Utils.Print (progArgs, pshow, pshow') +import Hledger.Utils.IO (progArgs, pshow, pshow') -- | The program name as returned by @getProgName@. -- It's best to set this explicitly at program startup with @withProgName@, diff --git a/hledger-lib/Hledger/Utils/Print.hs b/hledger-lib/Hledger/Utils/IO.hs similarity index 95% rename from hledger-lib/Hledger/Utils/Print.hs rename to hledger-lib/Hledger/Utils/IO.hs index 1701a8c66..c3d5820c4 100644 --- a/hledger-lib/Hledger/Utils/Print.hs +++ b/hledger-lib/Hledger/Utils/IO.hs @@ -1,16 +1,15 @@ {- | Helpers for pretty-formatting haskell values, pretty-printing to console, deciding if ANSI colour should be used, and detecting an -o/--output-file option. -Uses unsafePerformIO for simple program-wide read-only access to some common -command-line flags/environment variables. +Uses unsafePerformIO. Limitations: -When running in GHCI, this module must be reloaded to see a change (because of unsafePerformIO). +When running in GHCI, this module must be reloaded to see environmental changes. The colour scheme may be somewhat hard-coded. -} -module Hledger.Utils.Print ( +module Hledger.Utils.IO ( -- * Pretty showing as a string pshow ,pshow' diff --git a/hledger-lib/Hledger/Utils/Test.hs b/hledger-lib/Hledger/Utils/Test.hs index 41ac17674..7bc4603b8 100644 --- a/hledger-lib/Hledger/Utils/Test.hs +++ b/hledger-lib/Hledger/Utils/Test.hs @@ -38,7 +38,7 @@ import Text.Megaparsec.Custom finalErrorBundlePretty, ) -import Hledger.Utils.Print (pshow) +import Hledger.Utils.IO (pshow) -- * tasty helpers diff --git a/hledger-lib/hledger-lib.cabal b/hledger-lib/hledger-lib.cabal index dd482a132..f723eb68b 100644 --- a/hledger-lib/hledger-lib.cabal +++ b/hledger-lib/hledger-lib.cabal @@ -83,8 +83,8 @@ library Hledger.Reports.PostingsReport Hledger.Utils Hledger.Utils.Debug + Hledger.Utils.IO Hledger.Utils.Parse - Hledger.Utils.Print Hledger.Utils.Regex Hledger.Utils.String Hledger.Utils.Test diff --git a/hledger-lib/package.yaml b/hledger-lib/package.yaml index c08a9aa8e..be5e2495d 100644 --- a/hledger-lib/package.yaml +++ b/hledger-lib/package.yaml @@ -137,8 +137,8 @@ library: - Hledger.Reports.PostingsReport - Hledger.Utils - Hledger.Utils.Debug + - Hledger.Utils.IO - Hledger.Utils.Parse - - Hledger.Utils.Print - Hledger.Utils.Regex - Hledger.Utils.String - Hledger.Utils.Test