refactor: simplify some imports

hledger-chart/Hledger/Chart/Main.hs

@@ -22,13 +22,12 @@ import Safe (readDef)
 import System.Console.GetOpt
 import System.Exit (exitFailure)
 
+import Hledger
+import Prelude hiding (putStr, putStrLn)
+import Hledger.Utils.UTF8 (putStr, putStrLn)
 import Hledger.Cli.Options
 import Hledger.Cli.Utils (withJournalDo)
 import Hledger.Cli.Version
-import Hledger.Data
-import Hledger.Utils
-import Prelude hiding (putStr, putStrLn)
-import Hledger.Utils.UTF8 (putStr, putStrLn)
 
 
 progname_chart = progname_cli ++ "-chart"

hledger-lib/Hledger.hs

@@ -7,4 +7,5 @@ module Hledger (
 where
 import Hledger.Data
 import Hledger.Read
+import Hledger.Report
 import Hledger.Utils

hledger-lib/Hledger/Read.hs

@@ -14,6 +14,7 @@ module Hledger.Read (
        myTimelogPath,
        myJournal,
        myTimelog,
+       someamount,
 )
 where
 import Control.Monad.Error

hledger-vty/Hledger/Vty/Main.hs

@@ -15,11 +15,10 @@ import Graphics.Vty
 import Safe (headDef)
 import System.Console.GetOpt
 
-import Hledger.Cli
+import Hledger
-import Hledger.Data
-import Hledger.Utils
 import Prelude hiding (putStr, putStrLn)
 import Hledger.Utils.UTF8 (putStr, putStrLn)
+import Hledger.Cli
 
 
 progname_vty = progname_cli ++ "-vty"

hledger-web/Handlers.hs

@@ -26,11 +26,8 @@ import Text.Printf
 import Yesod.Form
 import Yesod.Json
 
+import Hledger hiding (today)
 import Hledger.Cli
-import Hledger.Data hiding (today)
-import Hledger.Read (journalFromPathAndString)
-import Hledger.Read.JournalReader (someamount)
-import Hledger.Utils
 
 import App
 import Settings

hledger/Hledger/Cli.hs

@@ -23,6 +23,7 @@ import Data.Time.Calendar
 import System.Time (ClockTime(TOD))
 import Test.HUnit
 
+import Hledger
 import Hledger.Cli.Add
 import Hledger.Cli.Balance
 import Hledger.Cli.Convert
@@ -33,10 +34,6 @@ import Hledger.Cli.Stats
 import Hledger.Cli.Options
 import Hledger.Cli.Utils
 import Hledger.Cli.Version
-import Hledger.Data  -- including testing utils in Hledger.Data.Utils
-import Hledger.Read
-import Hledger.Read.JournalReader (someamount)
-import Hledger.Utils
 
 
 -- | hledger and hledger-lib's unit tests aggregated from all modules

hledger/Hledger/Cli/Add.hs

@@ -28,14 +28,12 @@ import Text.Printf
 import qualified Data.Foldable as Foldable (find)
 import qualified Data.Set as Set
 
-import Hledger.Cli.Options
+import Hledger
-import Hledger.Cli.Register (postingRegisterReport, postingRegisterReportAsText)
-import Hledger.Cli.Utils
-import Hledger.Data
-import Hledger.Read.JournalReader (someamount)
-import Hledger.Utils
 import Prelude hiding (putStr, putStrLn, appendFile)
 import Hledger.Utils.UTF8 (putStr, putStrLn, appendFile)
+import Hledger.Cli.Options
+import Hledger.Cli.Register (postingRegisterReportAsText)
+import Hledger.Cli.Utils
 
 
 {- | Information used as the basis for suggested account names, amounts,

hledger/Hledger/Cli/Balance.hs

@@ -105,14 +105,12 @@ import Data.List
 import Data.Maybe
 import Test.HUnit
 
+import Hledger
+import Prelude hiding (putStr)
+import Hledger.Utils.UTF8 (putStr)
 import Hledger.Cli.Format
 import qualified Hledger.Cli.Format as Format
 import Hledger.Cli.Options
-import Hledger.Cli.Utils
-import Hledger.Data
-import Hledger.Utils
-import Prelude hiding (putStr)
-import Hledger.Utils.UTF8 (putStr)
 
 
 -- | Print a balance report.

hledger/Hledger/Cli/Print.hs

@@ -11,9 +11,7 @@ module Hledger.Cli.Print (
 ) where
 import Data.List
 
-import Hledger.Cli.Options
+import Hledger
-import Hledger.Cli.Utils
-import Hledger.Data
 import Prelude hiding (putStr)
 import Hledger.Utils.UTF8 (putStr)
 import Hledger.Cli.Options

hledger/Hledger/Cli/Register.hs

@@ -17,12 +17,10 @@ import Data.Maybe
 import Test.HUnit
 import Text.Printf
 
-import Hledger.Cli.Options
+import Hledger
-import Hledger.Cli.Utils
-import Hledger.Data
-import Hledger.Utils
 import Prelude hiding (putStr)
 import Hledger.Utils.UTF8 (putStr)
+import Hledger.Cli.Options
 
 
 -- | Print a (posting) register report.