From 2f007c93d2fdd601950a110b79b21b361df8d393 Mon Sep 17 00:00:00 2001 From: Simon Michael Date: Mon, 29 Sep 2025 19:28:59 -1000 Subject: [PATCH] dev: switch all qualifed imports to ImportQualifiedPost style --- bin/_hledger-chart.hs | 2 +- bin/gsheet-csv.hs | 4 ++-- bin/hledger-balance-as-budget-multi.hs | 2 +- bin/hledger-check-fancyassertions.hs | 16 ++++++++-------- bin/hledger-check-postable.hs | 2 +- bin/hledger-check-tagfiles.cabal.hs | 2 +- bin/hledger-check-tagfiles.hs | 2 +- bin/hledger-combine-balances.hs | 4 ++-- bin/hledger-move.hs | 4 ++-- bin/hledger-register-max.hs | 4 ++-- bin/hledger-register-max2.hs | 4 ++-- bin/hledger-report1.hs | 4 ++-- bin/hledger-script-example-short.hs | 4 ++-- bin/hledger-script-example.hs | 4 ++-- bin/hledger-smooth.hs | 2 +- bin/hledger-swap-dates.hs | 2 +- dev.hs | 10 +++++----- examples/onelinecsv.hs | 2 +- hledger-lib/CHANGES.md | 6 +++--- hledger-lib/Hledger/Data/Account.hs | 10 +++++----- hledger-lib/Hledger/Data/AccountName.hs | 8 ++++---- hledger-lib/Hledger/Data/Amount.hs | 8 ++++---- hledger-lib/Hledger/Data/Balancing.hs | 10 +++++----- hledger-lib/Hledger/Data/Currency.hs | 2 +- hledger-lib/Hledger/Data/Dates.hs | 6 +++--- hledger-lib/Hledger/Data/Errors.hs | 2 +- hledger-lib/Hledger/Data/Journal.hs | 6 +++--- hledger-lib/Hledger/Data/JournalChecks.hs | 4 ++-- .../Hledger/Data/JournalChecks/Ordereddates.hs | 2 +- .../Data/JournalChecks/Uniqueleafnames.hs | 2 +- hledger-lib/Hledger/Data/Json.hs | 8 ++++---- hledger-lib/Hledger/Data/Ledger.hs | 2 +- hledger-lib/Hledger/Data/Period.hs | 2 +- hledger-lib/Hledger/Data/PeriodData.hs | 2 +- .../Hledger/Data/PeriodicTransaction.hs | 4 ++-- hledger-lib/Hledger/Data/Posting.hs | 10 +++++----- hledger-lib/Hledger/Data/StringFormat.hs | 2 +- hledger-lib/Hledger/Data/Timeclock.hs | 2 +- hledger-lib/Hledger/Data/Transaction.hs | 8 ++++---- .../Hledger/Data/TransactionModifier.hs | 6 +++--- hledger-lib/Hledger/Data/Types.hs | 6 +++--- hledger-lib/Hledger/Data/Valuation.hs | 6 +++--- hledger-lib/Hledger/Query.hs | 2 +- hledger-lib/Hledger/Read.hs | 6 +++--- hledger-lib/Hledger/Read/Common.hs | 8 ++++---- hledger-lib/Hledger/Read/JournalReader.hs | 14 +++++++------- hledger-lib/Hledger/Read/RulesReader.hs | 18 +++++++++--------- hledger-lib/Hledger/Read/TimedotReader.hs | 2 +- .../Reports/AccountTransactionsReport.hs | 2 +- hledger-lib/Hledger/Reports/BudgetReport.hs | 4 ++-- .../Hledger/Reports/MultiBalanceReport.hs | 4 ++-- hledger-lib/Hledger/Reports/ReportOptions.hs | 2 +- hledger-lib/Hledger/Reports/ReportTypes.hs | 2 +- hledger-lib/Hledger/Utils.hs | 4 ++-- hledger-lib/Hledger/Utils/IO.hs | 10 +++++----- hledger-lib/Hledger/Utils/Parse.hs | 6 +++--- hledger-lib/Hledger/Utils/Regex.hs | 2 +- hledger-lib/Hledger/Utils/String.hs | 2 +- hledger-lib/Hledger/Utils/Test.hs | 2 +- hledger-lib/Hledger/Utils/Text.hs | 6 +++--- hledger-lib/Hledger/Write/Beancount.hs | 6 +++--- hledger-lib/Hledger/Write/Csv.hs | 6 +++--- hledger-lib/Hledger/Write/Html.hs | 6 +++--- hledger-lib/Hledger/Write/Html/Attribute.hs | 2 +- hledger-lib/Hledger/Write/Html/Blaze.hs | 10 +++++----- hledger-lib/Hledger/Write/Html/HtmlCommon.hs | 2 +- hledger-lib/Hledger/Write/Html/Lucid.hs | 10 +++++----- hledger-lib/Hledger/Write/Ods.hs | 16 ++++++++-------- hledger-lib/Hledger/Write/Spreadsheet.hs | 6 +++--- hledger-lib/Text/Tabular/AsciiWide.hs | 4 ++-- hledger-lib/Text/WideString.hs | 4 ++-- hledger-ui/Hledger/UI/AccountsScreen.hs | 4 ++-- hledger-ui/Hledger/UI/Main.hs | 4 ++-- hledger-ui/Hledger/UI/MenuScreen.hs | 4 ++-- hledger-ui/Hledger/UI/RegisterScreen.hs | 4 ++-- hledger-ui/Hledger/UI/Theme.hs | 2 +- hledger-ui/Hledger/UI/TransactionScreen.hs | 2 +- hledger-ui/Hledger/UI/UIOptions.hs | 2 +- hledger-ui/Hledger/UI/UIScreens.hs | 4 ++-- hledger-ui/Hledger/UI/UIState.hs | 2 +- hledger-ui/Hledger/UI/UIUtils.hs | 4 ++-- hledger-web/Hledger/Web/App.hs | 4 ++-- hledger-web/Hledger/Web/Handler/AddR.hs | 2 +- hledger-web/Hledger/Web/Handler/MiscR.hs | 8 ++++---- hledger-web/Hledger/Web/Handler/RegisterR.hs | 2 +- hledger-web/Hledger/Web/Handler/UploadR.hs | 4 ++-- hledger-web/Hledger/Web/Main.hs | 2 +- hledger-web/Hledger/Web/Settings.hs | 2 +- hledger-web/Hledger/Web/Test.hs | 2 +- hledger-web/Hledger/Web/WebOptions.hs | 4 ++-- hledger-web/Hledger/Web/Widget/AddForm.hs | 4 ++-- hledger-web/Hledger/Web/Widget/Common.hs | 8 ++++---- hledger/Hledger/Cli.hs | 2 +- hledger/Hledger/Cli/Anchor.hs | 8 ++++---- hledger/Hledger/Cli/Anon.hs | 2 +- hledger/Hledger/Cli/CliOptions.hs | 6 +++--- hledger/Hledger/Cli/Commands.hs | 2 +- hledger/Hledger/Cli/Commands/Accounts.hs | 4 ++-- hledger/Hledger/Cli/Commands/Add.hs | 8 ++++---- hledger/Hledger/Cli/Commands/Aregister.hs | 14 +++++++------- hledger/Hledger/Cli/Commands/Balance.hs | 14 +++++++------- hledger/Hledger/Cli/Commands/Close.hs | 4 ++-- hledger/Hledger/Cli/Commands/Codes.hs | 4 ++-- hledger/Hledger/Cli/Commands/Commodities.hs | 6 +++--- hledger/Hledger/Cli/Commands/Demo.hs | 2 +- hledger/Hledger/Cli/Commands/Descriptions.hs | 2 +- hledger/Hledger/Cli/Commands/Diff.hs | 2 +- hledger/Hledger/Cli/Commands/Files.hs | 2 +- hledger/Hledger/Cli/Commands/Import.hs | 2 +- hledger/Hledger/Cli/Commands/Notes.hs | 2 +- hledger/Hledger/Cli/Commands/Payees.hs | 2 +- hledger/Hledger/Cli/Commands/Prices.hs | 4 ++-- hledger/Hledger/Cli/Commands/Print.hs | 14 +++++++------- hledger/Hledger/Cli/Commands/Register.hs | 16 ++++++++-------- hledger/Hledger/Cli/Commands/Rewrite.hs | 6 +++--- hledger/Hledger/Cli/Commands/Roi.hs | 4 ++-- hledger/Hledger/Cli/Commands/Run.hs | 8 ++++---- hledger/Hledger/Cli/Commands/Setup.hs | 8 ++++---- hledger/Hledger/Cli/Commands/Stats.hs | 8 ++++---- hledger/Hledger/Cli/Commands/Tags.hs | 6 +++--- hledger/Hledger/Cli/CompoundBalanceCommand.hs | 16 ++++++++-------- hledger/Hledger/Cli/Conf.hs | 4 ++-- hledger/Hledger/Cli/DocFiles.hs | 2 +- hledger/Hledger/Cli/Script.hs | 2 +- hledger/Hledger/Cli/Utils.hs | 12 ++++++------ hledger/Hledger/Cli/Version.hs | 4 ++-- hledger/app/hledger-cli.hs | 2 +- tools/changelogEdit.hs | 2 +- tools/criterionbench.hs | 2 +- tools/progressionbench.hs | 2 +- 130 files changed, 325 insertions(+), 325 deletions(-) diff --git a/bin/_hledger-chart.hs b/bin/_hledger-chart.hs index 36a187be4..6cec6e87b 100755 --- a/bin/_hledger-chart.hs +++ b/bin/_hledger-chart.hs @@ -38,7 +38,7 @@ import Data.List import Data.Maybe import Data.Ord import Data.String.Here -import qualified Data.Text as T +import Data.Text qualified as T import Graphics.Rendering.Chart import Graphics.Rendering.Chart.Backend.Diagrams import Safe diff --git a/bin/gsheet-csv.hs b/bin/gsheet-csv.hs index 48cae13ce..0d6323248 100755 --- a/bin/gsheet-csv.hs +++ b/bin/gsheet-csv.hs @@ -40,9 +40,9 @@ gsheet-csv SPREADSHEETID SHEETNAME - print specified sheet as CSV module Main where import "lens" Control.Lens -import qualified "bytestring" Data.ByteString.Lazy as B +import "bytestring" qualified Data.ByteString.Lazy as B import "cassava" Data.Csv -import qualified "text" Data.Text as T +import "text" qualified Data.Text as T import "gogol" Network.Google import "gogol-sheets" Network.Google.Sheets import "base" System.Environment diff --git a/bin/hledger-balance-as-budget-multi.hs b/bin/hledger-balance-as-budget-multi.hs index 88f825805..6657983ab 100644 --- a/bin/hledger-balance-as-budget-multi.hs +++ b/bin/hledger-balance-as-budget-multi.hs @@ -8,7 +8,7 @@ {-| Construct two balance reports for two different time periods and use one of the as "budget" for the other, thus comparing them -} -import qualified Data.Text.Lazy.IO as TL +import Data.Text.Lazy.IO qualified as TL import System.Environment (getArgs) import Hledger.Cli.Script import Hledger.Cli.Commands.Balance diff --git a/bin/hledger-check-fancyassertions.hs b/bin/hledger-check-fancyassertions.hs index 728ed80b6..4cf467632 100755 --- a/bin/hledger-check-fancyassertions.hs +++ b/bin/hledger-check-fancyassertions.hs @@ -111,18 +111,18 @@ import Data.Maybe (fromMaybe, mapMaybe) import Data.Time.Calendar (toGregorian) import Data.Time.Calendar.OrdinalDate (mondayStartWeek, sundayStartWeek, toOrdinalDate) import Data.Text (Text, isPrefixOf, pack, unpack) -import qualified Data.Text as T -import qualified Data.Text.IO as T -import qualified Hledger.Data as H -import qualified Hledger.Query as H -import qualified Hledger.Read as H -import qualified Hledger.Utils.Parse as H +import Data.Text qualified as T +import Data.Text.IO qualified as T +import Hledger.Data qualified as H +import Hledger.Query qualified as H +import Hledger.Read qualified as H +import Hledger.Utils.Parse qualified as H import Lens.Micro (set) import Options.Applicative import System.Exit (exitFailure) import System.FilePath (FilePath) -import qualified Text.Megaparsec as P -import qualified Text.Megaparsec.Char as P +import Text.Megaparsec qualified as P +import Text.Megaparsec.Char qualified as P -- Don't know how to preserve newlines yet. helptxt = unlines [ diff --git a/bin/hledger-check-postable.hs b/bin/hledger-check-postable.hs index c153641c6..137a3902e 100755 --- a/bin/hledger-check-postable.hs +++ b/bin/hledger-check-postable.hs @@ -14,7 +14,7 @@ import Data.String.QQ (s) import Text.Printf import Control.Monad import Data.List -import qualified Data.Text as T +import Data.Text qualified as T -- import Data.Time.Calendar import Safe import System.Exit diff --git a/bin/hledger-check-tagfiles.cabal.hs b/bin/hledger-check-tagfiles.cabal.hs index 37b1ceed6..cd4221f86 100755 --- a/bin/hledger-check-tagfiles.cabal.hs +++ b/bin/hledger-check-tagfiles.cabal.hs @@ -16,7 +16,7 @@ $ hledger check-tagfiles # compiles every time (?) -} import Control.Monad -import qualified Data.Text as T +import Data.Text qualified as T import Hledger.Cli.Script import System.Directory import System.Exit diff --git a/bin/hledger-check-tagfiles.hs b/bin/hledger-check-tagfiles.hs index d82b30e55..8b7bda8f0 100755 --- a/bin/hledger-check-tagfiles.hs +++ b/bin/hledger-check-tagfiles.hs @@ -17,7 +17,7 @@ $ hledger check-tagfiles # compiles if there's no compiled version -} import Control.Monad -import qualified Data.Text as T +import Data.Text qualified as T import Hledger.Cli.Script import System.Directory import System.Exit diff --git a/bin/hledger-combine-balances.hs b/bin/hledger-combine-balances.hs index d7d330712..9dec5e5b0 100755 --- a/bin/hledger-combine-balances.hs +++ b/bin/hledger-combine-balances.hs @@ -9,9 +9,9 @@ import System.Environment (getArgs) import Hledger.Cli.Script -import qualified Data.Map as M +import Data.Map qualified as M import Data.Map.Merge.Strict -import qualified Data.Text.Lazy.IO as TL +import Data.Text.Lazy.IO qualified as TL appendReports :: MultiBalanceReport -> MultiBalanceReport -> MultiBalanceReport appendReports r1 r2 = diff --git a/bin/hledger-move.hs b/bin/hledger-move.hs index d0bea9ded..c3de90f57 100755 --- a/bin/hledger-move.hs +++ b/bin/hledger-move.hs @@ -37,8 +37,8 @@ import System.IO (hPutStrLn, stderr) import System.IO.Unsafe (unsafePerformIO) import Lens.Micro ((^.)) import Text.Printf -import qualified Data.Text as T -import qualified Data.Text.IO as T +import Data.Text qualified as T +import Data.Text.IO qualified as T import Hledger.Cli.Script diff --git a/bin/hledger-register-max.hs b/bin/hledger-register-max.hs index c71fe71c3..295f559b4 100755 --- a/bin/hledger-register-max.hs +++ b/bin/hledger-register-max.hs @@ -23,8 +23,8 @@ import Control.Monad import Data.List import Data.Maybe import Data.Ord -import qualified "text" Data.Text as T -import qualified Data.Text.IO as T +import "text" qualified Data.Text as T +import Data.Text.IO qualified as T import Safe import System.Environment import Hledger.Cli.Script diff --git a/bin/hledger-register-max2.hs b/bin/hledger-register-max2.hs index c2345f953..fbe15a4cf 100755 --- a/bin/hledger-register-max2.hs +++ b/bin/hledger-register-max2.hs @@ -12,8 +12,8 @@ {-# LANGUAGE PackageImports #-} import Hledger.Cli.Script -import qualified "text" Data.Text as T -import qualified "text" Data.Text.IO as T +import "text" qualified Data.Text as T +import "text" qualified Data.Text.IO as T cmdmode = hledgerCommandMode (unlines -- Command name, then --help text. Note, empty help lines get stripped. diff --git a/bin/hledger-report1.hs b/bin/hledger-report1.hs index 4b961723b..b25afb571 100755 --- a/bin/hledger-report1.hs +++ b/bin/hledger-report1.hs @@ -12,8 +12,8 @@ {-# LANGUAGE PackageImports #-} import Hledger.Cli.Script -import qualified "text" Data.Text as T -import qualified "text" Data.Text.IO as T +import "text" qualified Data.Text as T +import "text" qualified Data.Text.IO as T cmdmode = hledgerCommandMode (unlines ["report1" diff --git a/bin/hledger-script-example-short.hs b/bin/hledger-script-example-short.hs index d2017b497..7c0cd633f 100644 --- a/bin/hledger-script-example-short.hs +++ b/bin/hledger-script-example-short.hs @@ -9,8 +9,8 @@ script-example - my new script {-# LANGUAGE OverloadedStrings #-} import Hledger.Cli.Script -import qualified Data.Text as T -import qualified Data.Text.IO as T +import Data.Text qualified as T +import Data.Text.IO qualified as T cmdmode = hledgerCommandMode (unlines ---------------------------standard terminal width----------------------------- diff --git a/bin/hledger-script-example.hs b/bin/hledger-script-example.hs index 07d64017d..4a407fe87 100755 --- a/bin/hledger-script-example.hs +++ b/bin/hledger-script-example.hs @@ -42,8 +42,8 @@ script-example - my new script -- This provides most of hledger's API that's useful for scripts. import Hledger.Cli.Script -- Haskell has a built-in String type; hledger also uses the more efficient Text type. -import qualified Data.Text as T -import qualified Data.Text.IO as T +import Data.Text qualified as T +import Data.Text.IO qualified as T -- If you use hledgerCommandMode, and getHledgerCliOpts below, your script will -- support -h/--help, -f/--file and other common hledger options. diff --git a/bin/hledger-smooth.hs b/bin/hledger-smooth.hs index 1deb91ca3..2a096d630 100755 --- a/bin/hledger-smooth.hs +++ b/bin/hledger-smooth.hs @@ -20,7 +20,7 @@ import Data.List import Data.Maybe import Data.String.QQ (s) -import qualified Data.Text as T +import Data.Text qualified as T import Data.Time.Calendar import Safe -- import Hledger diff --git a/bin/hledger-swap-dates.hs b/bin/hledger-swap-dates.hs index e4d7dd77a..adefd1a2e 100755 --- a/bin/hledger-swap-dates.hs +++ b/bin/hledger-swap-dates.hs @@ -9,7 +9,7 @@ {-# LANGUAGE RecordWildCards #-} import Data.String.QQ (s) -import qualified Data.Text.IO as T +import Data.Text.IO qualified as T import Hledger import Hledger.Cli.Script diff --git a/dev.hs b/dev.hs index d59956cac..5f3807818 100755 --- a/dev.hs +++ b/dev.hs @@ -24,7 +24,7 @@ -- import Control.Monad.Except import Criterion.Main -- import Data.Text.Lazy as LT -import qualified Data.Text as T +import Data.Text qualified as T -- import System.Environment import System.TimeIt (timeItT) import Text.Printf @@ -33,10 +33,10 @@ import Hledger import Data.Default (def) -- import Hledger.Utils.Regex (toRegexCI) -- import Hledger.Utils.Debug --- import qualified Hledger.Read.JournalReader as JR --- import qualified Hledger.Read.TimeclockReader as TR --- import qualified Hledger.Read.TimeclockReaderNoJU as TRNOJU --- import qualified Hledger.Read.TimeclockReaderPP as TRPP +-- import Hledger.Read.JournalReader qualified as JR +-- import Hledger.Read.TimeclockReader qualified as TR +-- import Hledger.Read.TimeclockReaderNoJU qualified as TRNOJU +-- import Hledger.Read.TimeclockReaderPP qualified as TRPP -- import Control.DeepSeq (NFData) -- import Data.Data diff --git a/examples/onelinecsv.hs b/examples/onelinecsv.hs index cfd60a31d..feea843f6 100755 --- a/examples/onelinecsv.hs +++ b/examples/onelinecsv.hs @@ -6,7 +6,7 @@ {- example of generating one CSV line per txn. assumes hledger-lib 1.0+ -} import Control.Monad -import qualified Data.Text as T +import Data.Text qualified as T import Data.List import Hledger diff --git a/hledger-lib/CHANGES.md b/hledger-lib/CHANGES.md index 0a9ca6e19..32f31f574 100644 --- a/hledger-lib/CHANGES.md +++ b/hledger-lib/CHANGES.md @@ -1422,16 +1422,16 @@ including: - add support for GHC 8.8, base-compat 0.11 (#1090) We are now using the new fail from the MonadFail class, which we - always import qualified as Fail.fail, from base-compat-batteries + always import as qualified Fail.fail, from base-compat-batteries Control.Monad.Fail.Compat to work with old GHC versions. If old fail is needed (shouldn't be) it should be imported qualified as Prelude.Fail, using imports such as: import Prelude hiding (fail) - import qualified Prelude (fail) + import Prelude qualified (fail) import Control.Monad.State.Strict hiding (fail) import "base-compat-batteries" Prelude.Compat hiding (fail) - import qualified "base-compat-batteries" Control.Monad.Fail.Compat as Fail + import "base-compat-batteries" qualified Control.Monad.Fail.Compat as Fail - hledger and hledger-lib unit tests have been ported to tasty. diff --git a/hledger-lib/Hledger/Data/Account.hs b/hledger-lib/Hledger/Data/Account.hs index cc0210278..e1118d70a 100644 --- a/hledger-lib/Hledger/Data/Account.hs +++ b/hledger-lib/Hledger/Data/Account.hs @@ -42,17 +42,17 @@ module Hledger.Data.Account ) where import Control.Applicative ((<|>)) -import qualified Data.HashSet as HS -import qualified Data.HashMap.Strict as HM -import qualified Data.IntMap as IM +import Data.HashSet qualified as HS +import Data.HashMap.Strict qualified as HM +import Data.IntMap qualified as IM import Data.List (find, sortOn) #if !MIN_VERSION_base(4,20,0) import Data.List (foldl') #endif import Data.List.NonEmpty (NonEmpty(..), groupWith) -import qualified Data.Map as M +import Data.Map qualified as M import Data.Maybe (fromMaybe) -import qualified Data.Text as T +import Data.Text qualified as T import Data.These (These(..)) import Data.Time (Day(..), fromGregorian) import Safe (headMay) diff --git a/hledger-lib/Hledger/Data/AccountName.hs b/hledger-lib/Hledger/Data/AccountName.hs index a733194fc..7104d2ef8 100644 --- a/hledger-lib/Hledger/Data/AccountName.hs +++ b/hledger-lib/Hledger/Data/AccountName.hs @@ -63,13 +63,13 @@ where import Control.Applicative ((<|>)) import Control.Monad (foldM) import Data.Foldable (asum, find, toList) -import qualified Data.List.NonEmpty as NE -import qualified Data.Map as M +import Data.List.NonEmpty qualified as NE +import Data.Map qualified as M import Data.Maybe (mapMaybe) import Data.MemoUgly (memo) -import qualified Data.Set as S +import Data.Set qualified as S import Data.Text (Text) -import qualified Data.Text as T +import Data.Text qualified as T import Data.Tree (Tree(..), unfoldTree) import Safe import Text.DocLayout (realLength) diff --git a/hledger-lib/Hledger/Data/Amount.hs b/hledger-lib/Hledger/Data/Amount.hs index cf8f903d1..54cd0aa5f 100644 --- a/hledger-lib/Hledger/Data/Amount.hs +++ b/hledger-lib/Hledger/Data/Amount.hs @@ -187,12 +187,12 @@ import Data.List (find, intercalate, intersperse, mapAccumL, partition) import Data.List (foldl') #endif import Data.List.NonEmpty (NonEmpty(..), nonEmpty) -import qualified Data.Map.Strict as M -import qualified Data.Set as S +import Data.Map.Strict qualified as M +import Data.Set qualified as S import Data.Maybe (fromMaybe, isNothing) import Data.Semigroup (Semigroup(..)) -import qualified Data.Text as T -import qualified Data.Text.Lazy.Builder as TB +import Data.Text qualified as T +import Data.Text.Lazy.Builder qualified as TB import Data.Word (Word8) import Safe (headDef, lastDef, lastMay) import System.Console.ANSI (Color(..),ColorIntensity(..)) diff --git a/hledger-lib/Hledger/Data/Balancing.hs b/hledger-lib/Hledger/Data/Balancing.hs index cd09f9118..c8e480c5e 100644 --- a/hledger-lib/Hledger/Data/Balancing.hs +++ b/hledger-lib/Hledger/Data/Balancing.hs @@ -38,15 +38,15 @@ import Data.Bifunctor (second) import Data.Foldable (asum) import Data.Function ((&)) import Data.Functor ((<&>), void) -import qualified Data.HashTable.Class as H (toList) -import qualified Data.HashTable.ST.Cuckoo as H +import Data.HashTable.Class qualified as H (toList) +import Data.HashTable.ST.Cuckoo qualified as H import Data.List (partition, sortOn) import Data.List.Extra (nubSort) import Data.Maybe (fromJust, fromMaybe, isJust, isNothing, mapMaybe) -import qualified Data.Set as S -import qualified Data.Text as T +import Data.Set qualified as S +import Data.Text qualified as T import Data.Time.Calendar (fromGregorian) -import qualified Data.Map as M +import Data.Map qualified as M import Safe (headErr) import Text.Printf (printf) diff --git a/hledger-lib/Hledger/Data/Currency.hs b/hledger-lib/Hledger/Data/Currency.hs index 8a91a1fe9..7c3e6b56a 100644 --- a/hledger-lib/Hledger/Data/Currency.hs +++ b/hledger-lib/Hledger/Data/Currency.hs @@ -15,7 +15,7 @@ module Hledger.Data.Currency ( currencyCodeToSymbol, ) where -import qualified Data.Map as M +import Data.Map qualified as M import Data.Text (Text) -- | An ISO 4217 currency code, like EUR. Usually three upper case letters. diff --git a/hledger-lib/Hledger/Data/Dates.hs b/hledger-lib/Hledger/Data/Dates.hs index 30650a10d..4f9a563af 100644 --- a/hledger-lib/Hledger/Data/Dates.hs +++ b/hledger-lib/Hledger/Data/Dates.hs @@ -88,7 +88,7 @@ import Prelude hiding (Applicative(..)) import Control.Applicative (Applicative(..)) import Control.Applicative.Permutations import Control.Monad (guard, unless) -import qualified Control.Monad.Fail as Fail (MonadFail, fail) +import Control.Monad.Fail qualified as Fail (MonadFail, fail) import Data.Char (digitToInt, isDigit) import Data.Default (def) import Data.Foldable (asum) @@ -97,9 +97,9 @@ import Data.Functor (($>)) import Data.List (elemIndex, group, sort, sortBy) import Data.Maybe (catMaybes, fromMaybe, isJust, mapMaybe) import Data.Ord (comparing) -import qualified Data.Set as Set +import Data.Set qualified as Set import Data.Text (Text) -import qualified Data.Text as T +import Data.Text qualified as T import Data.Time.Format hiding (months) import Data.Time.Calendar (Day, addDays, addGregorianYearsClip, addGregorianMonthsClip, diffDays, diff --git a/hledger-lib/Hledger/Data/Errors.hs b/hledger-lib/Hledger/Data/Errors.hs index ec9b10d38..47f1fff1a 100644 --- a/hledger-lib/Hledger/Data/Errors.hs +++ b/hledger-lib/Hledger/Data/Errors.hs @@ -19,7 +19,7 @@ where import Data.Function ((&)) import Data.List (find) import Data.Text (Text) -import qualified Data.Text as T +import Data.Text qualified as T import Hledger.Data.Transaction (showTransaction) import Hledger.Data.Posting (postingStripCosts) diff --git a/hledger-lib/Hledger/Data/Journal.hs b/hledger-lib/Hledger/Data/Journal.hs index 131effe3c..1dedaa782 100644 --- a/hledger-lib/Hledger/Data/Journal.hs +++ b/hledger-lib/Hledger/Data/Journal.hs @@ -131,11 +131,11 @@ import Data.List ((\\), find, sortBy, union, intercalate) import Data.List (foldl') #endif import Data.List.Extra (nubSort) -import qualified Data.Map.Strict as M +import Data.Map.Strict qualified as M import Data.Maybe (catMaybes, fromMaybe, mapMaybe, maybeToList) -import qualified Data.Set as S +import Data.Set qualified as S import Data.Text (Text) -import qualified Data.Text as T +import Data.Text qualified as T import Safe (headMay, headDef, maximumMay, minimumMay, lastDef) import Data.Time.Calendar (Day, addDays, fromGregorian, diffDays) import Data.Time.Clock.POSIX (POSIXTime) diff --git a/hledger-lib/Hledger/Data/JournalChecks.hs b/hledger-lib/Hledger/Data/JournalChecks.hs index 379f6df8d..19c0e9fb6 100644 --- a/hledger-lib/Hledger/Data/JournalChecks.hs +++ b/hledger-lib/Hledger/Data/JournalChecks.hs @@ -24,8 +24,8 @@ where import Data.Char (isSpace) import Data.List.Extra import Data.Maybe -import qualified Data.Map.Strict as M -import qualified Data.Text as T +import Data.Map.Strict qualified as M +import Data.Text qualified as T import Safe (atMay, lastMay, headMay) import Text.Printf (printf) diff --git a/hledger-lib/Hledger/Data/JournalChecks/Ordereddates.hs b/hledger-lib/Hledger/Data/JournalChecks/Ordereddates.hs index 34d7519d7..54043eaf5 100755 --- a/hledger-lib/Hledger/Data/JournalChecks/Ordereddates.hs +++ b/hledger-lib/Hledger/Data/JournalChecks/Ordereddates.hs @@ -6,7 +6,7 @@ where import Control.Monad (forM) import Data.List (groupBy) import Text.Printf (printf) -import qualified Data.Text as T (pack, unlines) +import Data.Text qualified as T (pack, unlines) import Hledger.Data.Errors (makeTransactionErrorExcerpt) import Hledger.Data.Transaction (transactionFile) diff --git a/hledger-lib/Hledger/Data/JournalChecks/Uniqueleafnames.hs b/hledger-lib/Hledger/Data/JournalChecks/Uniqueleafnames.hs index b6f5e53bf..71eff5f3e 100755 --- a/hledger-lib/Hledger/Data/JournalChecks/Uniqueleafnames.hs +++ b/hledger-lib/Hledger/Data/JournalChecks/Uniqueleafnames.hs @@ -8,7 +8,7 @@ where import Data.Function (on) import Data.List (groupBy, sortBy) import Data.Text (Text) -import qualified Data.Text as T +import Data.Text qualified as T import Safe (headErr) import Text.Printf (printf) diff --git a/hledger-lib/Hledger/Data/Json.hs b/hledger-lib/Hledger/Data/Json.hs index b95762056..859c89c56 100644 --- a/hledger-lib/Hledger/Data/Json.hs +++ b/hledger-lib/Hledger/Data/Json.hs @@ -20,12 +20,12 @@ import Data.Aeson import Data.Aeson.Encode.Pretty (Config(..), Indent(..), NumberFormat(..), encodePretty', encodePrettyToTextBuilder') --import Data.Aeson.TH -import qualified Data.ByteString.Lazy as BL +import Data.ByteString.Lazy qualified as BL import Data.Decimal (DecimalRaw(..), roundTo) -import qualified Data.IntMap as IM +import Data.IntMap qualified as IM import Data.Maybe (fromMaybe) -import qualified Data.Text.Lazy as TL -import qualified Data.Text.Lazy.Builder as TB +import Data.Text.Lazy qualified as TL +import Data.Text.Lazy.Builder qualified as TB import Data.Time (Day(..)) import Text.Megaparsec (Pos, SourcePos, mkPos, unPos) diff --git a/hledger-lib/Hledger/Data/Ledger.hs b/hledger-lib/Hledger/Data/Ledger.hs index 1c3d30d01..2f656a864 100644 --- a/hledger-lib/Hledger/Data/Ledger.hs +++ b/hledger-lib/Hledger/Data/Ledger.hs @@ -24,7 +24,7 @@ module Hledger.Data.Ledger ( ) where -import qualified Data.Map as M +import Data.Map qualified as M import Safe (headDef) import Text.Printf diff --git a/hledger-lib/Hledger/Data/Period.hs b/hledger-lib/Hledger/Data/Period.hs index b2c7ed60c..4a0869db8 100644 --- a/hledger-lib/Hledger/Data/Period.hs +++ b/hledger-lib/Hledger/Data/Period.hs @@ -35,7 +35,7 @@ module Hledger.Data.Period ( where import Data.Text (Text) -import qualified Data.Text as T +import Data.Text qualified as T import Data.Time.Calendar import Data.Time.Calendar.MonthDay import Data.Time.Calendar.OrdinalDate diff --git a/hledger-lib/Hledger/Data/PeriodData.hs b/hledger-lib/Hledger/Data/PeriodData.hs index 6de7767e0..de74259f0 100644 --- a/hledger-lib/Hledger/Data/PeriodData.hs +++ b/hledger-lib/Hledger/Data/PeriodData.hs @@ -31,7 +31,7 @@ import Data.Foldable1 (Foldable1(..)) import Control.Applicative (liftA2) #endif import Data.Bifunctor (first) -import qualified Data.IntMap.Strict as IM +import Data.IntMap.Strict qualified as IM #if !MIN_VERSION_base(4,20,0) import Data.List (foldl') #endif diff --git a/hledger-lib/Hledger/Data/PeriodicTransaction.hs b/hledger-lib/Hledger/Data/PeriodicTransaction.hs index 77e165d4f..8b16f8567 100644 --- a/hledger-lib/Hledger/Data/PeriodicTransaction.hs +++ b/hledger-lib/Hledger/Data/PeriodicTransaction.hs @@ -13,8 +13,8 @@ where import Data.Function ((&)) import Data.Maybe (isNothing) -import qualified Data.Text as T -import qualified Data.Text.IO as T +import Data.Text qualified as T +import Data.Text.IO qualified as T import Text.Printf import Hledger.Data.Types diff --git a/hledger-lib/Hledger/Data/Posting.hs b/hledger-lib/Hledger/Data/Posting.hs index db3630963..95e991045 100644 --- a/hledger-lib/Hledger/Data/Posting.hs +++ b/hledger-lib/Hledger/Data/Posting.hs @@ -85,17 +85,17 @@ where import Data.Default (def) import Data.Foldable (asum) import Data.Function ((&)) -import qualified Data.Map as M +import Data.Map qualified as M import Data.Maybe (fromMaybe, isJust, mapMaybe) import Data.List (sort, union) #if !MIN_VERSION_base(4,20,0) import Data.List (foldl') #endif -import qualified Data.Set as S +import Data.Set qualified as S import Data.Text (Text) -import qualified Data.Text as T -import qualified Data.Text.Lazy as TL -import qualified Data.Text.Lazy.Builder as TB +import Data.Text qualified as T +import Data.Text.Lazy qualified as TL +import Data.Text.Lazy.Builder qualified as TB import Data.Time.Calendar (Day) import Safe (maximumBound) import Text.DocLayout (realLength) diff --git a/hledger-lib/Hledger/Data/StringFormat.hs b/hledger-lib/Hledger/Data/StringFormat.hs index 39993a7a0..5183554a0 100644 --- a/hledger-lib/Hledger/Data/StringFormat.hs +++ b/hledger-lib/Hledger/Data/StringFormat.hs @@ -21,7 +21,7 @@ import Data.Char (isPrint) import Data.Default (Default(..)) import Data.Maybe (isJust) import Data.Text (Text) -import qualified Data.Text as T +import Data.Text qualified as T import Text.Megaparsec import Text.Megaparsec.Char (char, digitChar, string) diff --git a/hledger-lib/Hledger/Data/Timeclock.hs b/hledger-lib/Hledger/Data/Timeclock.hs index be99dcabe..e90d94a8c 100644 --- a/hledger-lib/Hledger/Data/Timeclock.hs +++ b/hledger-lib/Hledger/Data/Timeclock.hs @@ -18,7 +18,7 @@ where import Data.List (partition, sortBy, uncons) import Data.Maybe (fromMaybe) -import qualified Data.Text as T +import Data.Text qualified as T import Data.Time.Calendar (addDays) import Data.Time.Clock (addUTCTime, getCurrentTime) import Data.Time.Format (defaultTimeLocale, formatTime, parseTimeM) diff --git a/hledger-lib/Hledger/Data/Transaction.hs b/hledger-lib/Hledger/Data/Transaction.hs index fad101830..bfe7257ac 100644 --- a/hledger-lib/Hledger/Data/Transaction.hs +++ b/hledger-lib/Hledger/Data/Transaction.hs @@ -68,10 +68,10 @@ import Data.Foldable (foldlM) import Data.Maybe (fromMaybe, isJust, mapMaybe) import Data.Semigroup (Endo(..)) import Data.Text (Text) -import qualified Data.Map as M -import qualified Data.Text as T -import qualified Data.Text.Lazy as TL -import qualified Data.Text.Lazy.Builder as TB +import Data.Map qualified as M +import Data.Text qualified as T +import Data.Text.Lazy qualified as TL +import Data.Text.Lazy.Builder qualified as TB import Data.Time.Calendar (Day, fromGregorian) import Hledger.Utils diff --git a/hledger-lib/Hledger/Data/TransactionModifier.hs b/hledger-lib/Hledger/Data/TransactionModifier.hs index 861856c40..4e7459b5a 100644 --- a/hledger-lib/Hledger/Data/TransactionModifier.hs +++ b/hledger-lib/Hledger/Data/TransactionModifier.hs @@ -15,9 +15,9 @@ where import Prelude hiding (Applicative(..)) import Control.Applicative (Applicative(..), (<|>)) import Data.Function ((&)) -import qualified Data.Map as M +import Data.Map qualified as M import Data.Maybe (catMaybes) -import qualified Data.Text as T +import Data.Text qualified as T import Data.Time.Calendar (Day) import Safe (headDef) import Hledger.Data.Types @@ -65,7 +65,7 @@ modifyTransactions atypes atags styles d verbosetags tmods ts = do -- Currently the only kind of modification possible is adding automated -- postings when certain other postings are present. -- --- >>> import qualified Data.Text.IO as T +-- >>> import Data.Text.IO qualified as T -- >>> t = nulltransaction{tpostings=["ping" `post` usd 1]} -- >>> tmpost acc amt = TMPostingRule (acc `post` amt) False -- >>> test = either putStr (T.putStr.showTransaction) . fmap ($ t) . transactionModifierToFunction (const Nothing) (const []) mempty nulldate True diff --git a/hledger-lib/Hledger/Data/Types.hs b/hledger-lib/Hledger/Data/Types.hs index b5f991400..aaf8375b4 100644 --- a/hledger-lib/Hledger/Data/Types.hs +++ b/hledger-lib/Hledger/Data/Types.hs @@ -40,17 +40,17 @@ import Data.Bifunctor (first) import Data.Decimal (Decimal, DecimalRaw(..)) import Data.Default (Default(..)) import Data.Functor (($>)) -import qualified Data.IntMap.Strict as IM +import Data.IntMap.Strict qualified as IM import Data.List (intercalate, sortBy) --XXX https://hackage.haskell.org/package/containers/docs/Data-Map.html --Note: You should use Data.Map.Strict instead of this module if: --You will eventually need all the values stored. --The stored values don't represent large virtual data structures to be lazily computed. -import qualified Data.Map as M +import Data.Map qualified as M import Data.Ord (comparing) import Data.Semigroup (Min(..)) import Data.Text (Text) -import qualified Data.Text as T +import Data.Text qualified as T import Data.Time.Calendar (Day) import Data.Time.Clock.POSIX (POSIXTime) import Data.Time.LocalTime (LocalTime) diff --git a/hledger-lib/Hledger/Data/Valuation.hs b/hledger-lib/Hledger/Data/Valuation.hs index 36c657d4b..fc0f756ee 100644 --- a/hledger-lib/Hledger/Data/Valuation.hs +++ b/hledger-lib/Hledger/Data/Valuation.hs @@ -35,9 +35,9 @@ import Control.Applicative ((<|>)) import Data.Function ((&), on) import Data.List (partition, intercalate, sortBy) import Data.List.Extra (nubSortBy) -import qualified Data.Map as M -import qualified Data.Set as S -import qualified Data.Text as T +import Data.Map qualified as M +import Data.Set qualified as S +import Data.Text qualified as T import Data.Time.Calendar (Day, fromGregorian) import Data.MemoUgly (memo) import GHC.Generics (Generic) diff --git a/hledger-lib/Hledger/Query.hs b/hledger-lib/Hledger/Query.hs index bfb78cd93..b9760526f 100644 --- a/hledger-lib/Hledger/Query.hs +++ b/hledger-lib/Hledger/Query.hs @@ -83,7 +83,7 @@ import Data.Either (partitionEithers) import Data.List (partition, intercalate) import Data.Maybe (fromMaybe, isJust, mapMaybe) import Data.Text (Text) -import qualified Data.Text as T +import Data.Text qualified as T import Data.Time.Calendar (Day, fromGregorian ) import Safe (headErr, readMay, maximumByMay, maximumMay, minimumMay) import Text.Megaparsec (between, noneOf, sepBy, try, (), notFollowedBy) diff --git a/hledger-lib/Hledger/Read.hs b/hledger-lib/Hledger/Read.hs index d44f3b647..27bad1165 100644 --- a/hledger-lib/Hledger/Read.hs +++ b/hledger-lib/Hledger/Read.hs @@ -131,7 +131,7 @@ module Hledger.Read ( ) where --- ** imports -import qualified Control.Exception as C +import Control.Exception qualified as C import Control.Monad (unless, when, forM, (>=>)) import "mtl" Control.Monad.Except (ExceptT(..), runExceptT, liftEither) import Control.Monad.IO.Class (MonadIO, liftIO) @@ -143,8 +143,8 @@ import Data.Maybe (catMaybes, fromMaybe) import Data.Ord (comparing) import Data.Semigroup (sconcat) import Data.Text (Text) -import qualified Data.Text as T -import qualified Data.Text.IO as T +import Data.Text qualified as T +import Data.Text.IO qualified as T import Data.Time (Day) import Safe (headDef, headMay) import System.Directory (doesFileExist) diff --git a/hledger-lib/Hledger/Read/Common.hs b/hledger-lib/Hledger/Read/Common.hs index 893c47cdb..651a2c4d9 100644 --- a/hledger-lib/Hledger/Read/Common.hs +++ b/hledger-lib/Hledger/Read/Common.hs @@ -129,7 +129,7 @@ where --- ** imports import Control.Applicative.Permutations (runPermutation, toPermutationWithDefault) import Control.Monad (foldM, liftM2, when, unless, (>=>), (<=<)) -import qualified Control.Monad.Fail as Fail (fail) +import Control.Monad.Fail qualified as Fail (fail) import Control.Monad.Except (ExceptT(..), liftEither, withExceptT) import Control.Monad.IO.Class (MonadIO, liftIO) import Control.Monad.State.Strict (MonadState, evalStateT, modify', get, put) @@ -143,10 +143,10 @@ import Data.Functor ((<&>), ($>), void) import Data.List (find, genericReplicate, union) import Data.List.NonEmpty (NonEmpty(..)) import Data.Maybe (catMaybes, fromMaybe, isJust, listToMaybe) -import qualified Data.Map as M -import qualified Data.Semigroup as Sem +import Data.Map qualified as M +import Data.Semigroup qualified as Sem import Data.Text (Text, stripEnd) -import qualified Data.Text as T +import Data.Text qualified as T import Data.Time.Calendar (Day, fromGregorianValid, toGregorian) import Data.Time.Clock.POSIX (getPOSIXTime) import Data.Time.LocalTime (LocalTime(..), TimeOfDay(..)) diff --git a/hledger-lib/Hledger/Read/JournalReader.hs b/hledger-lib/Hledger/Read/JournalReader.hs index 06cca583b..c22441099 100644 --- a/hledger-lib/Hledger/Read/JournalReader.hs +++ b/hledger-lib/Hledger/Read/JournalReader.hs @@ -71,7 +71,7 @@ module Hledger.Read.JournalReader ( where --- ** imports -import qualified Control.Exception as C +import Control.Exception qualified as C import Control.Monad (forM_, when, void, unless, filterM) import Control.Monad.IO.Class (MonadIO, liftIO) import Control.Monad.Except (ExceptT(..), runExceptT) @@ -79,12 +79,12 @@ import Control.Monad.State.Strict (evalStateT,get,modify',put) import Control.Monad.Trans.Class (lift) import Data.Char (toLower) import Data.Either (isRight, lefts) -import qualified Data.Map.Strict as M +import Data.Map.Strict qualified as M import Data.Text (Text) import Data.String import Data.List import Data.Maybe -import qualified Data.Text as T +import Data.Text qualified as T import Data.Time.Calendar import Data.Time.LocalTime import Safe @@ -99,10 +99,10 @@ import Hledger.Data import Hledger.Read.Common import Hledger.Utils -import qualified Hledger.Read.CsvReader as CsvReader (reader) -import qualified Hledger.Read.RulesReader as RulesReader (reader) -import qualified Hledger.Read.TimeclockReader as TimeclockReader (reader) -import qualified Hledger.Read.TimedotReader as TimedotReader (reader) +import Hledger.Read.CsvReader qualified as CsvReader (reader) +import Hledger.Read.RulesReader qualified as RulesReader (reader) +import Hledger.Read.TimeclockReader qualified as TimeclockReader (reader) +import Hledger.Read.TimedotReader qualified as TimedotReader (reader) import System.Directory (canonicalizePath, doesFileExist) import Data.Functor ((<&>)) diff --git a/hledger-lib/Hledger/Read/RulesReader.hs b/hledger-lib/Hledger/Read/RulesReader.hs index c42776914..1a68c09cd 100644 --- a/hledger-lib/Hledger/Read/RulesReader.hs +++ b/hledger-lib/Hledger/Read/RulesReader.hs @@ -48,16 +48,16 @@ import Control.Concurrent (forkIO) import Control.DeepSeq (deepseq) import Control.Monad (unless, void, when) import Control.Monad.Except (ExceptT(..), liftEither, throwError) -import qualified Control.Monad.Fail as Fail +import Control.Monad.Fail qualified as Fail import Control.Monad.IO.Class (MonadIO, liftIO) import Control.Monad.State.Strict (StateT, get, modify', evalStateT) import Control.Monad.Trans.Class (lift) import Data.Char (toLower, isDigit, isSpace, isAlphaNum, ord) import Data.Bifunctor (first) -import qualified Data.ByteString as B -import qualified Data.ByteString.Lazy as BL -import qualified Data.Csv as Cassava -import qualified Data.Csv.Parser.Megaparsec as CassavaMegaparsec +import Data.ByteString qualified as B +import Data.ByteString.Lazy qualified as BL +import Data.Csv qualified as Cassava +import Data.Csv.Parser.Megaparsec qualified as CassavaMegaparsec import Data.Encoding (encodingFromStringExplicit, DynEncoding) import Data.Either (fromRight) import Data.Functor ((<&>)) @@ -70,11 +70,11 @@ import Data.List (foldl') import Data.List.Extra (groupOn) import Data.Maybe (catMaybes, fromMaybe, isJust) import Data.MemoUgly (memo) -import qualified Data.Set as S +import Data.Set qualified as S import Data.Text (Text) -import qualified Data.Text as T -import qualified Data.Text.Encoding as T -import qualified Data.Text.IO as T +import Data.Text qualified as T +import Data.Text.Encoding qualified as T +import Data.Text.IO qualified as T import Data.Time ( Day, TimeZone, UTCTime, LocalTime, ZonedTime(ZonedTime), defaultTimeLocale, getCurrentTimeZone, localDay, parseTimeM, utcToLocalTime, localTimeToUTC, zonedTimeToUTC, utctDay) import Safe (atMay, headMay, lastMay, readMay) diff --git a/hledger-lib/Hledger/Read/TimedotReader.hs b/hledger-lib/Hledger/Read/TimedotReader.hs index b8c385ed4..41c0377dd 100644 --- a/hledger-lib/Hledger/Read/TimedotReader.hs +++ b/hledger-lib/Hledger/Read/TimedotReader.hs @@ -44,7 +44,7 @@ import Control.Monad.Except (ExceptT, liftEither) import Control.Monad.State.Strict import Data.Char (isSpace) import Data.Text (Text) -import qualified Data.Text as T +import Data.Text qualified as T import Data.Time (Day) import Text.Megaparsec hiding (parse) import Text.Megaparsec.Char diff --git a/hledger-lib/Hledger/Reports/AccountTransactionsReport.hs b/hledger-lib/Hledger/Reports/AccountTransactionsReport.hs index b212a6658..d91aeb16b 100644 --- a/hledger-lib/Hledger/Reports/AccountTransactionsReport.hs +++ b/hledger-lib/Hledger/Reports/AccountTransactionsReport.hs @@ -27,7 +27,7 @@ import Data.List (mapAccumR, nub, partition, sortBy) import Data.List.Extra (nubSort) import Data.Maybe (catMaybes) import Data.Ord (Down(..), comparing) -import qualified Data.Text as T +import Data.Text qualified as T import Data.Time.Calendar (Day) import Hledger.Data diff --git a/hledger-lib/Hledger/Reports/BudgetReport.hs b/hledger-lib/Hledger/Reports/BudgetReport.hs index d6d2a4c41..9a44311d6 100644 --- a/hledger-lib/Hledger/Reports/BudgetReport.hs +++ b/hledger-lib/Hledger/Reports/BudgetReport.hs @@ -21,8 +21,8 @@ import Data.Foldable (toList) import Data.List (find, maximumBy, intercalate) import Data.Maybe (catMaybes, fromMaybe, isJust) import Data.Ord (comparing) -import qualified Data.Set as S -import qualified Data.Text as T +import Data.Set qualified as S +import Data.Text qualified as T import Data.These (These(..), these) import Data.Time (Day) import Safe (minimumDef) diff --git a/hledger-lib/Hledger/Reports/MultiBalanceReport.hs b/hledger-lib/Hledger/Reports/MultiBalanceReport.hs index b26c22a83..0f403ecac 100644 --- a/hledger-lib/Hledger/Reports/MultiBalanceReport.hs +++ b/hledger-lib/Hledger/Reports/MultiBalanceReport.hs @@ -41,8 +41,8 @@ import Control.Monad (guard) import Data.Foldable (toList) import Data.List (sortOn) import Data.List.NonEmpty (NonEmpty((:|))) -import qualified Data.HashSet as HS -import qualified Data.IntMap.Strict as IM +import Data.HashSet qualified as HS +import Data.IntMap.Strict qualified as IM import Data.Maybe (fromMaybe, isJust) import Data.Ord (Down(..)) import Data.Semigroup (sconcat) diff --git a/hledger-lib/Hledger/Reports/ReportOptions.hs b/hledger-lib/Hledger/Reports/ReportOptions.hs index 695b1a349..0391000b7 100644 --- a/hledger-lib/Hledger/Reports/ReportOptions.hs +++ b/hledger-lib/Hledger/Reports/ReportOptions.hs @@ -79,7 +79,7 @@ import Data.Functor.Identity (Identity(..)) import Data.List (partition) import Data.List.Extra (find, isPrefixOf, nubSort, stripPrefix) import Data.Maybe (fromMaybe, isJust, isNothing) -import qualified Data.Text as T +import Data.Text qualified as T import Data.Time.Calendar (Day, addDays) import Data.Default (Default(..)) import Safe (headMay, lastDef, lastMay, maximumMay, readMay) diff --git a/hledger-lib/Hledger/Reports/ReportTypes.hs b/hledger-lib/Hledger/Reports/ReportTypes.hs index 88aad3afa..3ce03ab35 100644 --- a/hledger-lib/Hledger/Reports/ReportTypes.hs +++ b/hledger-lib/Hledger/Reports/ReportTypes.hs @@ -45,7 +45,7 @@ import GHC.Generics (Generic) import Hledger.Data import Hledger.Query (Query) import Hledger.Reports.ReportOptions (ReportOpts) -import qualified Data.Text as T +import Data.Text qualified as T import Data.List (intercalate) type Percentage = Decimal diff --git a/hledger-lib/Hledger/Utils.hs b/hledger-lib/Hledger/Utils.hs index 0e70661a9..00fa81a23 100644 --- a/hledger-lib/Hledger/Utils.hs +++ b/hledger-lib/Hledger/Utils.hs @@ -76,8 +76,8 @@ import Data.List.Extra (chunksOf, foldl1', uncons, unsnoc) #if !MIN_VERSION_base(4,20,0) import Data.List (foldl') #endif -import qualified Data.Set as Set -import qualified Data.Text as T (pack, unpack) +import Data.Set qualified as Set +import Data.Text qualified as T (pack, unpack) import Data.Tree (foldTree, Tree (Node, subForest)) import Language.Haskell.TH (DecsQ, Name, mkName, nameBase) import Lens.Micro ((&), (.~)) diff --git a/hledger-lib/Hledger/Utils/IO.hs b/hledger-lib/Hledger/Utils/IO.hs index a0a72c534..135cb799e 100644 --- a/hledger-lib/Hledger/Utils/IO.hs +++ b/hledger-lib/Hledger/Utils/IO.hs @@ -131,11 +131,11 @@ import Data.FileEmbed (makeRelativeToProject, embedStringFile) import Data.Functor ((<&>)) import Data.List hiding (uncons) import Data.Maybe (isJust, catMaybes) -import qualified Data.Text as T +import Data.Text qualified as T import Data.Text.Encoding.Error (UnicodeException) -import qualified Data.Text.IO as T -import qualified Data.Text.Lazy as TL -import qualified Data.Text.Lazy.Builder as TB +import Data.Text.IO qualified as T +import Data.Text.Lazy qualified as TL +import Data.Text.Lazy.Builder qualified as TB import Data.Time.Clock (getCurrentTime) import Data.Time.LocalTime (LocalTime, ZonedTime, getCurrentTimeZone, utcToLocalTime, utcToZonedTime) import Data.Word (Word16) @@ -154,7 +154,7 @@ import System.FilePath (isRelative, ()) import "Glob" System.FilePath.Glob (glob) import System.Info (os) import System.IO (Handle, IOMode (..), hClose, hGetEncoding, hIsTerminalDevice, hPutStr, hPutStrLn, hSetNewlineMode, hSetEncoding, openFile, stderr, stdin, stdout, universalNewlineMode, utf8_bom, utf8) -import qualified System.IO.Encoding as Enc +import System.IO.Encoding qualified as Enc import System.IO.Unsafe (unsafePerformIO) import System.Process (CreateProcess(..), StdStream(CreatePipe), createPipe, shell, waitForProcess, withCreateProcess) import Text.Pretty.Simple (CheckColorTty(..), OutputOptions(..), defaultOutputOptionsDarkBg, defaultOutputOptionsNoColor, pShowOpt, pPrintOpt) diff --git a/hledger-lib/Hledger/Utils/Parse.hs b/hledger-lib/Hledger/Utils/Parse.hs index 9be0fc182..84998c441 100644 --- a/hledger-lib/Hledger/Utils/Parse.hs +++ b/hledger-lib/Hledger/Utils/Parse.hs @@ -90,7 +90,7 @@ module Hledger.Utils.Parse ( where import Control.Monad (when) -import qualified Data.Text as T +import Data.Text qualified as T import Safe (tailErr) import Text.Megaparsec import Text.Printf @@ -105,9 +105,9 @@ import Text.Megaparsec.Char import Control.Monad.Except (ExceptT, MonadError, catchError, throwError) import Control.Monad.Trans.Class (lift) -import qualified Data.List.NonEmpty as NE +import Data.List.NonEmpty qualified as NE import Data.Monoid (Alt(..)) -import qualified Data.Set as S +import Data.Set qualified as S import Hledger.Utils.Debug (debugLevel, dbg0Msg) diff --git a/hledger-lib/Hledger/Utils/Regex.hs b/hledger-lib/Hledger/Utils/Regex.hs index b8fb3581b..b65414113 100644 --- a/hledger-lib/Hledger/Utils/Regex.hs +++ b/hledger-lib/Hledger/Utils/Regex.hs @@ -74,7 +74,7 @@ import Data.List (foldl') #endif import Data.MemoUgly (memo) import Data.Text (Text) -import qualified Data.Text as T +import Data.Text qualified as T import Text.Regex.TDFA ( Regex, CompOption(..), defaultCompOpt, defaultExecOpt, makeRegexOptsM, AllMatches(getAllMatches), match, MatchText, diff --git a/hledger-lib/Hledger/Utils/String.hs b/hledger-lib/Hledger/Utils/String.hs index f0f48ee3d..7b90edc55 100644 --- a/hledger-lib/Hledger/Utils/String.hs +++ b/hledger-lib/Hledger/Utils/String.hs @@ -40,7 +40,7 @@ module Hledger.Utils.String ( import Data.Char (isSpace, toLower, toUpper) import Data.List (intercalate, dropWhileEnd) -import qualified Data.Text as T +import Data.Text qualified as T import Safe (headErr, tailErr) import Text.Megaparsec ((<|>), between, many, noneOf, sepBy) import Text.Megaparsec.Char (char) diff --git a/hledger-lib/Hledger/Utils/Test.hs b/hledger-lib/Hledger/Utils/Test.hs index 37629ffb4..4e14d6d5e 100644 --- a/hledger-lib/Hledger/Utils/Test.hs +++ b/hledger-lib/Hledger/Utils/Test.hs @@ -25,7 +25,7 @@ import Control.Monad.Except (ExceptT(..), liftEither, runExceptT, withExceptT) import Control.Monad.State.Strict (StateT, evalStateT, execStateT) import Data.Default (Default(..)) import Data.List (isInfixOf) -import qualified Data.Text as T +import Data.Text qualified as T import Test.Tasty hiding (defaultMain) import Test.Tasty.HUnit -- import Test.Tasty.QuickCheck as QC diff --git a/hledger-lib/Hledger/Utils/Text.hs b/hledger-lib/Hledger/Utils/Text.hs index 27570440e..c33783d4c 100644 --- a/hledger-lib/Hledger/Utils/Text.hs +++ b/hledger-lib/Hledger/Utils/Text.hs @@ -55,9 +55,9 @@ import Data.Char (digitToInt) import Data.Default (def) import Data.Maybe (catMaybes) import Data.Text (Text) -import qualified Data.Text as T -import qualified Data.Text.Lazy as TL -import qualified Data.Text.Lazy.Builder as TB +import Data.Text qualified as T +import Data.Text.Lazy qualified as TL +import Data.Text.Lazy.Builder qualified as TB import Text.DocLayout (charWidth, realLength) import Test.Tasty (testGroup) diff --git a/hledger-lib/Hledger/Write/Beancount.hs b/hledger-lib/Hledger/Write/Beancount.hs index 16c5af84a..6d4c09952 100644 --- a/hledger-lib/Hledger/Write/Beancount.hs +++ b/hledger-lib/Hledger/Write/Beancount.hs @@ -24,9 +24,9 @@ where import Data.Char import Data.Default (def) import Data.Text (Text) -import qualified Data.Text as T -import qualified Data.Text.Lazy as TL -import qualified Data.Text.Lazy.Builder as TB +import Data.Text qualified as T +import Data.Text.Lazy qualified as TL +import Data.Text.Lazy.Builder qualified as TB import Safe (maximumBound) import Text.DocLayout (realLength) import Text.Printf diff --git a/hledger-lib/Hledger/Write/Csv.hs b/hledger-lib/Hledger/Write/Csv.hs index 42c6393d2..435206963 100644 --- a/hledger-lib/Hledger/Write/Csv.hs +++ b/hledger-lib/Hledger/Write/Csv.hs @@ -23,9 +23,9 @@ where import Prelude hiding (Applicative(..)) import Data.List (intersperse) import Data.Text (Text) -import qualified Data.Text as T -import qualified Data.Text.Lazy as TL -import qualified Data.Text.Lazy.Builder as TB +import Data.Text qualified as T +import Data.Text.Lazy qualified as TL +import Data.Text.Lazy.Builder qualified as TB import Hledger.Utils diff --git a/hledger-lib/Hledger/Write/Html.hs b/hledger-lib/Hledger/Write/Html.hs index 0f1191a64..9e07c09ff 100644 --- a/hledger-lib/Hledger/Write/Html.hs +++ b/hledger-lib/Hledger/Write/Html.hs @@ -23,9 +23,9 @@ module Hledger.Write.Html ( tests_Hledger_Write_Html ) where -import qualified Data.Text as T (Text) -import qualified Data.Text.Lazy as TL (Text, toStrict) -import qualified Lucid as L (renderText, toHtml) +import Data.Text qualified as T (Text) +import Data.Text.Lazy qualified as TL (Text, toStrict) +import Lucid qualified as L (renderText, toHtml) import Test.Tasty (testGroup) import Hledger.Write.Html.Lucid (Html, formatRow, styledTableHtml) diff --git a/hledger-lib/Hledger/Write/Html/Attribute.hs b/hledger-lib/Hledger/Write/Html/Attribute.hs index 875ed22c3..af68ae2e7 100644 --- a/hledger-lib/Hledger/Write/Html/Attribute.hs +++ b/hledger-lib/Hledger/Write/Html/Attribute.hs @@ -21,7 +21,7 @@ module Hledger.Write.Html.Attribute ( vpad, ) where -import qualified Data.Text as Text +import Data.Text qualified as Text import Data.Text (Text) diff --git a/hledger-lib/Hledger/Write/Html/Blaze.hs b/hledger-lib/Hledger/Write/Html/Blaze.hs index 86b456f56..12aa9435a 100644 --- a/hledger-lib/Hledger/Write/Html/Blaze.hs +++ b/hledger-lib/Hledger/Write/Html/Blaze.hs @@ -9,14 +9,14 @@ module Hledger.Write.Html.Blaze ( formatCell, ) where -import qualified Hledger.Write.Html.Attribute as Attr -import qualified Hledger.Write.Spreadsheet as Spr +import Hledger.Write.Html.Attribute qualified as Attr +import Hledger.Write.Spreadsheet qualified as Spr import Hledger.Write.Html.HtmlCommon (Lines, borderStyles) import Hledger.Write.Spreadsheet (Type(..), Style(..), Emphasis(..), Cell(..)) -import qualified Text.Blaze.Html4.Transitional.Attributes as HtmlAttr -import qualified Text.Blaze.Html4.Transitional as Html -import qualified Data.Text as Text +import Text.Blaze.Html4.Transitional.Attributes qualified as HtmlAttr +import Text.Blaze.Html4.Transitional qualified as Html +import Data.Text qualified as Text import Text.Blaze.Html4.Transitional (Html, toHtml, (!)) import Data.Foldable (traverse_) diff --git a/hledger-lib/Hledger/Write/Html/HtmlCommon.hs b/hledger-lib/Hledger/Write/Html/HtmlCommon.hs index 76139732c..5f42544af 100644 --- a/hledger-lib/Hledger/Write/Html/HtmlCommon.hs +++ b/hledger-lib/Hledger/Write/Html/HtmlCommon.hs @@ -11,7 +11,7 @@ module Hledger.Write.Html.HtmlCommon ( import Data.Text (Text) import Hledger.Write.Spreadsheet (Cell(..)) -import qualified Hledger.Write.Spreadsheet as Spr +import Hledger.Write.Spreadsheet qualified as Spr borderStyles :: Lines border => Cell border text -> [Text] diff --git a/hledger-lib/Hledger/Write/Html/Lucid.hs b/hledger-lib/Hledger/Write/Html/Lucid.hs index a9a8be805..b50a80583 100644 --- a/hledger-lib/Hledger/Write/Html/Lucid.hs +++ b/hledger-lib/Hledger/Write/Html/Lucid.hs @@ -12,14 +12,14 @@ module Hledger.Write.Html.Lucid ( ) where import Data.Foldable (traverse_) -import qualified Data.Text as Text -import qualified Lucid.Base as L -import qualified Lucid as L +import Data.Text qualified as Text +import Lucid.Base qualified as L +import Lucid qualified as L -import qualified Hledger.Write.Html.Attribute as Attr +import Hledger.Write.Html.Attribute qualified as Attr import Hledger.Write.Html.HtmlCommon import Hledger.Write.Spreadsheet (Type(..), Style(..), Emphasis(..), Cell(..)) -import qualified Hledger.Write.Spreadsheet as Spr +import Hledger.Write.Spreadsheet qualified as Spr type Html = L.Html () diff --git a/hledger-lib/Hledger/Write/Ods.hs b/hledger-lib/Hledger/Write/Ods.hs index 1c1ad11f4..b6fe1fbad 100644 --- a/hledger-lib/Hledger/Write/Ods.hs +++ b/hledger-lib/Hledger/Write/Ods.hs @@ -16,23 +16,23 @@ import Prelude hiding (Applicative(..)) import Control.Monad (guard) import Control.Applicative (Applicative(..)) -import qualified Data.Text.Lazy as TL -import qualified Data.Text as T +import Data.Text.Lazy qualified as TL +import Data.Text qualified as T import Data.Text (Text) -import qualified Data.Foldable as Fold -import qualified Data.List as List -import qualified Data.Map as Map -import qualified Data.Set as Set +import Data.Foldable qualified as Fold +import Data.List qualified as List +import Data.Map qualified as Map +import Data.Set qualified as Set import Data.Foldable (fold) import Data.Map (Map) import Data.Set (Set) import Data.Maybe (catMaybes) -import qualified System.IO as IO +import System.IO qualified as IO import Text.Printf (printf) -import qualified Hledger.Write.Spreadsheet as Spr +import Hledger.Write.Spreadsheet qualified as Spr import Hledger.Write.Spreadsheet (Type(..), Style(..), Emphasis(..), Cell(..)) import Hledger.Data.Types (CommoditySymbol, AmountPrecision(..)) import Hledger.Data.Types (acommodity, aquantity, astyle, asprecision) diff --git a/hledger-lib/Hledger/Write/Spreadsheet.hs b/hledger-lib/Hledger/Write/Spreadsheet.hs index 665bdca42..8c27ba651 100644 --- a/hledger-lib/Hledger/Write/Spreadsheet.hs +++ b/hledger-lib/Hledger/Write/Spreadsheet.hs @@ -28,12 +28,12 @@ module Hledger.Write.Spreadsheet ( integerCell, ) where -import qualified Hledger.Data.Amount as Amt +import Hledger.Data.Amount qualified as Amt import Hledger.Data.Types (Amount, MixedAmount, acommodity) import Hledger.Data.Amount (AmountFormat) -import qualified Data.List as List -import qualified Data.Text as Text +import Data.List qualified as List +import Data.Text qualified as Text import Data.Text (Text) import Text.WideString (WideBuilder) diff --git a/hledger-lib/Text/Tabular/AsciiWide.hs b/hledger-lib/Text/Tabular/AsciiWide.hs index 4d2fa894d..f0b20450a 100644 --- a/hledger-lib/Text/Tabular/AsciiWide.hs +++ b/hledger-lib/Text/Tabular/AsciiWide.hs @@ -30,8 +30,8 @@ import Data.Default (Default(..)) import Data.List (intersperse, transpose) import Data.Semigroup (stimesMonoid) import Data.Text (Text) -import qualified Data.Text as T -import qualified Data.Text.Lazy as TL +import Data.Text qualified as T +import Data.Text.Lazy qualified as TL import Data.Text.Lazy.Builder (Builder, fromString, fromText, singleton, toLazyText) import Safe (maximumMay) import Text.Tabular diff --git a/hledger-lib/Text/WideString.hs b/hledger-lib/Text/WideString.hs index b31ae88f2..8450f66af 100644 --- a/hledger-lib/Text/WideString.hs +++ b/hledger-lib/Text/WideString.hs @@ -9,8 +9,8 @@ module Text.WideString ( ) where import Data.Text (Text) -import qualified Data.Text.Lazy as TL -import qualified Data.Text.Lazy.Builder as TB +import Data.Text.Lazy qualified as TL +import Data.Text.Lazy.Builder qualified as TB import Text.DocLayout (realLength) diff --git a/hledger-ui/Hledger/UI/AccountsScreen.hs b/hledger-ui/Hledger/UI/AccountsScreen.hs index 0522855b3..a54164955 100644 --- a/hledger-ui/Hledger/UI/AccountsScreen.hs +++ b/hledger-ui/Hledger/UI/AccountsScreen.hs @@ -30,9 +30,9 @@ import Data.List hiding (reverse, (!?)) import Data.List hiding (reverse) #endif import Data.Maybe -import qualified Data.Text as T +import Data.Text qualified as T import Data.Time.Calendar (Day) -import qualified Data.Vector as V +import Data.Vector qualified as V import Data.Vector ((!?)) import Graphics.Vty (Event(..),Key(..),Modifier(..), Button (BLeft, BScrollDown, BScrollUp)) import Lens.Micro.Platform diff --git a/hledger-ui/Hledger/UI/Main.hs b/hledger-ui/Hledger/UI/Main.hs index 2823b216f..ace322bec 100644 --- a/hledger-ui/Hledger/UI/Main.hs +++ b/hledger-ui/Hledger/UI/Main.hs @@ -37,7 +37,7 @@ import Data.Function ((&)) import Data.List (find) import Data.List.Extra (nubSort) import Data.Maybe (fromMaybe) -import qualified Data.Text as T +import Data.Text qualified as T import Graphics.Vty (Mode (Mouse), Vty (outputIface), Output (setMode)) import Graphics.Vty.CrossPlatform (mkVty) import Lens.Micro ((^.)) @@ -46,7 +46,7 @@ import System.Environment (withProgName) import System.FilePath (takeDirectory) import System.FSNotify (Event(Modified), watchDir, withManager, EventIsDirectory (IsFile)) import Brick hiding (bsDraw) -import qualified Brick.BChan as BC +import Brick.BChan qualified as BC import Hledger import Hledger.Cli hiding (progname,prognameandversion) diff --git a/hledger-ui/Hledger/UI/MenuScreen.hs b/hledger-ui/Hledger/UI/MenuScreen.hs index 7291dcb50..172ca5056 100644 --- a/hledger-ui/Hledger/UI/MenuScreen.hs +++ b/hledger-ui/Hledger/UI/MenuScreen.hs @@ -17,9 +17,9 @@ import Brick.Widgets.List import Control.Monad import Control.Monad.IO.Class (liftIO) import Data.Maybe -import qualified Data.Text as T +import Data.Text qualified as T import Data.Time.Calendar (Day) -import qualified Data.Vector as V +import Data.Vector qualified as V import Data.Vector ((!?)) import Graphics.Vty (Event(..),Key(..),Modifier(..), Button (BLeft, BScrollDown, BScrollUp)) import Lens.Micro.Platform diff --git a/hledger-ui/Hledger/UI/RegisterScreen.hs b/hledger-ui/Hledger/UI/RegisterScreen.hs index 74c01b8b6..5c49747af 100644 --- a/hledger-ui/Hledger/UI/RegisterScreen.hs +++ b/hledger-ui/Hledger/UI/RegisterScreen.hs @@ -25,8 +25,8 @@ import Data.List hiding ((!?)) import Data.List #endif import Data.Maybe -import qualified Data.Text as T -import qualified Data.Vector as V +import Data.Text qualified as T +import Data.Vector qualified as V import Data.Vector ((!?)) import Graphics.Vty (Event(..),Key(..),Modifier(..), Button (BLeft, BScrollDown, BScrollUp)) import Brick diff --git a/hledger-ui/Hledger/UI/Theme.hs b/hledger-ui/Hledger/UI/Theme.hs index fefd74dee..199ca4f81 100644 --- a/hledger-ui/Hledger/UI/Theme.hs +++ b/hledger-ui/Hledger/UI/Theme.hs @@ -17,7 +17,7 @@ module Hledger.UI.Theme ( ) where -import qualified Data.Map as M +import Data.Map qualified as M import Data.Maybe import Graphics.Vty import Brick diff --git a/hledger-ui/Hledger/UI/TransactionScreen.hs b/hledger-ui/Hledger/UI/TransactionScreen.hs index 1d8ff408d..c726a8b35 100644 --- a/hledger-ui/Hledger/UI/TransactionScreen.hs +++ b/hledger-ui/Hledger/UI/TransactionScreen.hs @@ -18,7 +18,7 @@ import Brick.Widgets.List (listMoveTo) import Control.Monad.IO.Class (liftIO) import Data.List import Data.Maybe -import qualified Data.Text as T +import Data.Text qualified as T import Graphics.Vty (Event(..),Key(..),Modifier(..), Button (BLeft)) import System.Exit (ExitCode (..)) diff --git a/hledger-ui/Hledger/UI/UIOptions.hs b/hledger-ui/Hledger/UI/UIOptions.hs index 6b0129513..52c4ea347 100644 --- a/hledger-ui/Hledger/UI/UIOptions.hs +++ b/hledger-ui/Hledger/UI/UIOptions.hs @@ -6,7 +6,7 @@ module Hledger.UI.UIOptions where import Data.Default (def) import Data.Either (fromRight) import Data.List (intercalate) -import qualified Data.Map as M +import Data.Map qualified as M import Data.Maybe (fromMaybe) import GitHash (tGitInfoCwdTry) import Lens.Micro (set) diff --git a/hledger-ui/Hledger/UI/UIScreens.hs b/hledger-ui/Hledger/UI/UIScreens.hs index bbc3d38f2..d182345a2 100644 --- a/hledger-ui/Hledger/UI/UIScreens.hs +++ b/hledger-ui/Hledger/UI/UIScreens.hs @@ -42,10 +42,10 @@ where import Brick.Widgets.List (listMoveTo, listSelectedElement, list) import Data.List import Data.Maybe -import qualified Data.Text as T +import Data.Text qualified as T import Data.Time.Calendar (Day, diffDays) import Safe -import qualified Data.Vector as V +import Data.Vector qualified as V import Hledger.Cli hiding (mode, progname,prognameandversion) import Hledger.UI.UIOptions diff --git a/hledger-ui/Hledger/UI/UIState.hs b/hledger-ui/Hledger/UI/UIState.hs index dab638ea2..d7a97f7c5 100644 --- a/hledger-ui/Hledger/UI/UIState.hs +++ b/hledger-ui/Hledger/UI/UIState.hs @@ -49,7 +49,7 @@ import Data.Either (fromRight) import Data.List ((\\), sort) import Data.Maybe (fromMaybe) import Data.Semigroup (Max(..)) -import qualified Data.Text as T +import Data.Text qualified as T import Data.Text.Zipper (gotoEOL) import Data.Time.Calendar (Day) import Lens.Micro ((^.), over, set) diff --git a/hledger-ui/Hledger/UI/UIUtils.hs b/hledger-ui/Hledger/UI/UIUtils.hs index a5a2a1a66..dd6f31b40 100644 --- a/hledger-ui/Hledger/UI/UIUtils.hs +++ b/hledger-ui/Hledger/UI/UIUtils.hs @@ -56,7 +56,7 @@ import Control.Concurrent.STM (atomically, writeTChan) -- GHC only import Control.Monad.IO.Class import Data.Bifunctor (second) import Data.List -import qualified Data.Text as T +import Data.Text qualified as T import Data.Time (addDays) import Graphics.Vty (Event(..),Key(..),Modifier(..),Vty(..),Color,Attr,currentAttr,refresh, displayBounds @@ -72,7 +72,7 @@ import Hledger.Cli.DocFiles import Hledger.UI.UITypes import Data.Vector (Vector) -import qualified Data.Vector as V +import Data.Vector qualified as V -- | On posix platforms, send the system STOP signal to suspend the -- current program. On windows, does nothing. diff --git a/hledger-web/Hledger/Web/App.hs b/hledger-web/Hledger/Web/App.hs index 93cfec3fa..0c340c5a8 100644 --- a/hledger-web/Hledger/Web/App.hs +++ b/hledger-web/Hledger/Web/App.hs @@ -21,12 +21,12 @@ module Hledger.Web.App where import Control.Applicative ((<|>)) import Control.Monad (join, when, unless) -- import Control.Monad.Except (runExceptT) -- now re-exported by Hledger -import qualified Data.ByteString.Char8 as BC +import Data.ByteString.Char8 qualified as BC import Data.Traversable (for) import Data.IORef (IORef, readIORef, writeIORef) import Data.Maybe (fromMaybe) import Data.Text (Text) -import qualified Data.Text as T +import Data.Text qualified as T import Data.Time.Calendar (Day) import Network.HTTP.Conduit (Manager) import Network.HTTP.Types (status403) diff --git a/hledger-web/Hledger/Web/Handler/AddR.hs b/hledger-web/Hledger/Web/Handler/AddR.hs index 97cbee897..def538701 100644 --- a/hledger-web/Hledger/Web/Handler/AddR.hs +++ b/hledger-web/Hledger/Web/Handler/AddR.hs @@ -11,7 +11,7 @@ module Hledger.Web.Handler.AddR ) where import Data.Aeson.Types (Result(..)) -import qualified Data.Text as T +import Data.Text qualified as T import Network.HTTP.Types.Status (status400) import Text.Blaze.Html (preEscapedToHtml) import Yesod diff --git a/hledger-web/Hledger/Web/Handler/MiscR.hs b/hledger-web/Hledger/Web/Handler/MiscR.hs index 71b2ec97f..464eab8ea 100644 --- a/hledger-web/Hledger/Web/Handler/MiscR.hs +++ b/hledger-web/Hledger/Web/Handler/MiscR.hs @@ -22,10 +22,10 @@ module Hledger.Web.Handler.MiscR , getOpenApiR ) where -import qualified Data.Map as M -import qualified Data.Text as T -import qualified Data.Yaml as Yaml -import qualified Data.ByteString as BS +import Data.Map qualified as M +import Data.Text qualified as T +import Data.Yaml qualified as Yaml +import Data.ByteString qualified as BS import Yesod.Default.Handlers (getFaviconR, getRobotsR) import Hledger diff --git a/hledger-web/Hledger/Web/Handler/RegisterR.hs b/hledger-web/Hledger/Web/Handler/RegisterR.hs index 2997faa01..528424994 100644 --- a/hledger-web/Hledger/Web/Handler/RegisterR.hs +++ b/hledger-web/Hledger/Web/Handler/RegisterR.hs @@ -10,7 +10,7 @@ module Hledger.Web.Handler.RegisterR where import Data.List (intersperse, nub, partition) -import qualified Data.Text as T +import Data.Text qualified as T import Safe (tailSafe) import Text.Hamlet (hamletFile) diff --git a/hledger-web/Hledger/Web/Handler/UploadR.hs b/hledger-web/Hledger/Web/Handler/UploadR.hs index 76440a7bb..629e4b460 100644 --- a/hledger-web/Hledger/Web/Handler/UploadR.hs +++ b/hledger-web/Hledger/Web/Handler/UploadR.hs @@ -10,10 +10,10 @@ module Hledger.Web.Handler.UploadR ) where import Control.Monad.Except (runExceptT) -import qualified Data.ByteString.Lazy as BL +import Data.ByteString.Lazy qualified as BL import Data.Conduit (connect) import Data.Conduit.Binary (sinkLbs) -import qualified Data.Text.Encoding as TE +import Data.Text.Encoding qualified as TE import Hledger.Web.Import import Hledger.Web.Widget.Common (fromFormSuccess, journalFile404, writeJournalTextIfValidAndChanged) diff --git a/hledger-web/Hledger/Web/Main.hs b/hledger-web/Hledger/Web/Main.hs index 26e3ad7c4..9febc1fcd 100644 --- a/hledger-web/Hledger/Web/Main.hs +++ b/hledger-web/Hledger/Web/Main.hs @@ -30,7 +30,7 @@ import Control.Exception.Backtrace (setBacktraceMechanismState, BacktraceMechani #endif import Control.Monad (when) import Data.String (fromString) -import qualified Data.Text as T +import Data.Text qualified as T import Network.Socket import Network.Wai (Application) import Network.Wai.Handler.Warp (runSettings, runSettingsSocket, defaultSettings, setHost, setPort) diff --git a/hledger-web/Hledger/Web/Settings.hs b/hledger-web/Hledger/Web/Settings.hs index be22e5c1e..4e11638ba 100644 --- a/hledger-web/Hledger/Web/Settings.hs +++ b/hledger-web/Hledger/Web/Settings.hs @@ -13,7 +13,7 @@ module Hledger.Web.Settings where import Data.Default (def) import Data.Maybe (fromMaybe) import Data.Text (Text) -import qualified Data.Text as T +import Data.Text qualified as T import Data.Yaml import Language.Haskell.TH.Syntax (Q, Exp) import Text.Hamlet diff --git a/hledger-web/Hledger/Web/Test.hs b/hledger-web/Hledger/Web/Test.hs index 678e89cc9..8992de998 100644 --- a/hledger-web/Hledger/Web/Test.hs +++ b/hledger-web/Hledger/Web/Test.hs @@ -43,7 +43,7 @@ module Hledger.Web.Test ( import Data.String (fromString) import Data.Function ((&)) -import qualified Data.Text as T +import Data.Text qualified as T import Test.Hspec (hspec) import Yesod.Default.Config import Yesod.Test diff --git a/hledger-web/Hledger/Web/WebOptions.hs b/hledger-web/Hledger/Web/WebOptions.hs index febfb18ed..1b6976552 100644 --- a/hledger-web/Hledger/Web/WebOptions.hs +++ b/hledger-web/Hledger/Web/WebOptions.hs @@ -7,7 +7,7 @@ module Hledger.Web.WebOptions where import Data.ByteString (ByteString) -import qualified Data.ByteString.Char8 as BC +import Data.ByteString.Char8 qualified as BC import Data.ByteString.UTF8 (fromString) import Data.Default (Default(def)) import Data.Maybe (fromMaybe) @@ -20,7 +20,7 @@ import Safe (lastMay) import Hledger.Cli hiding (packageversion, progname, prognameandversion) import Hledger.Web.Settings (defhost, defport, defbaseurl) -import qualified Data.Text as T +import Data.Text qualified as T import Data.Char (toLower) import Data.List (isPrefixOf) import Data.Either (fromRight) diff --git a/hledger-web/Hledger/Web/Widget/AddForm.hs b/hledger-web/Hledger/Web/Widget/AddForm.hs index fa76ca22e..d8d815214 100644 --- a/hledger-web/Hledger/Web/Widget/AddForm.hs +++ b/hledger-web/Hledger/Web/Widget/AddForm.hs @@ -19,10 +19,10 @@ import Data.Bifunctor (first) import Data.Foldable (toList) import Data.List (dropWhileEnd, unfoldr) import Data.Maybe (isJust, fromMaybe) -import qualified Data.Set as S +import Data.Set qualified as S import Data.Text (Text) import Data.Text.Encoding.Base64 (encodeBase64) -import qualified Data.Text as T +import Data.Text qualified as T import Data.Time (Day) import Text.Blaze.Internal (Markup, preEscapedText) import Text.Megaparsec (bundleErrors, eof, parseErrorTextPretty, runParser) diff --git a/hledger-web/Hledger/Web/Widget/Common.hs b/hledger-web/Hledger/Web/Widget/Common.hs index 16364cfe1..1a6e6e529 100644 --- a/hledger-web/Hledger/Web/Widget/Common.hs +++ b/hledger-web/Hledger/Web/Widget/Common.hs @@ -23,11 +23,11 @@ import Control.Monad.Except (ExceptT, mapExceptT) import Data.Foldable (find, for_) import Data.List (elemIndex) import Data.Text (Text) -import qualified Data.Text as T +import Data.Text qualified as T import System.FilePath (takeFileName) import Text.Blaze ((!), textValue) -import qualified Text.Blaze.Html5 as H -import qualified Text.Blaze.Html5.Attributes as A +import Text.Blaze.Html5 qualified as H +import Text.Blaze.Html5.Attributes qualified as A import Text.Blaze.Internal (preEscapedString) import Text.Hamlet (hamletFile) import Text.Printf (printf) @@ -36,7 +36,7 @@ import Yesod import Hledger import Hledger.Cli.Utils (writeFileWithBackupIfChanged) import Hledger.Web.Settings (manualurl) -import qualified Hledger.Query as Query +import Hledger.Query qualified as Query journalFile404 :: FilePath -> Journal -> HandlerFor m (FilePath, Text) diff --git a/hledger/Hledger/Cli.hs b/hledger/Hledger/Cli.hs index 820880f25..407582e31 100644 --- a/hledger/Hledger/Cli.hs +++ b/hledger/Hledger/Cli.hs @@ -107,7 +107,7 @@ import Data.Either (isRight) import Data.Function ((&)) import Data.Functor ((<&>)) import Data.List -import qualified Data.List.NonEmpty as NE +import Data.List.NonEmpty qualified as NE import Data.Maybe (isJust, fromMaybe, fromJust) import Data.Text (pack, Text) import Data.Time.Clock.POSIX (getPOSIXTime) diff --git a/hledger/Hledger/Cli/Anchor.hs b/hledger/Hledger/Cli/Anchor.hs index 897d730d7..4c0f9c2c6 100644 --- a/hledger/Hledger/Cli/Anchor.hs +++ b/hledger/Hledger/Cli/Anchor.hs @@ -7,15 +7,15 @@ module Hledger.Cli.Anchor ( headerDateSpanCell, ) where -import qualified Data.Text as Text +import Data.Text qualified as Text import Data.Text (Text) import Data.Time (Day) import Data.Maybe (fromMaybe) -import qualified Text.URI as Uri -import qualified Text.URI.QQ as UriQQ +import Text.URI qualified as Uri +import Text.URI.QQ qualified as UriQQ -import qualified Hledger.Write.Spreadsheet as Spr +import Hledger.Write.Spreadsheet qualified as Spr import Hledger.Write.Spreadsheet (headerCell) import Hledger.Utils.IO (error') import Hledger.Utils.Text (quoteIfSpaced) diff --git a/hledger/Hledger/Cli/Anon.hs b/hledger/Hledger/Cli/Anon.hs index 327810f00..89774d053 100644 --- a/hledger/Hledger/Cli/Anon.hs +++ b/hledger/Hledger/Cli/Anon.hs @@ -18,7 +18,7 @@ import Control.Arrow (first) import Data.Hashable (hash) import Data.Word (Word32) import Numeric (showHex) -import qualified Data.Text as T +import Data.Text qualified as T import Hledger.Data import Data.Map (mapKeys) diff --git a/hledger/Hledger/Cli/CliOptions.hs b/hledger/Hledger/Cli/CliOptions.hs index 501673ee4..e126ca5ba 100644 --- a/hledger/Hledger/Cli/CliOptions.hs +++ b/hledger/Hledger/Cli/CliOptions.hs @@ -90,17 +90,17 @@ module Hledger.Cli.CliOptions ( ) where -import qualified Control.Exception as C +import Control.Exception qualified as C import Control.Monad (when) import Data.Char import Data.Default import Data.List.Extra (intercalate, isInfixOf, nubSort) -import qualified Data.List.NonEmpty as NE (NonEmpty, fromList, nonEmpty) +import Data.List.NonEmpty qualified as NE (NonEmpty, fromList, nonEmpty) import Data.List.Split (splitOn) import Data.Maybe --import Data.String.Here -- import Data.Text (Text) -import qualified Data.Text as T +import Data.Text qualified as T import Data.Void (Void) import GitHash (tGitInfoCwdTry) import Safe diff --git a/hledger/Hledger/Cli/Commands.hs b/hledger/Hledger/Cli/Commands.hs index 47022b3c8..27b7d1822 100644 --- a/hledger/Hledger/Cli/Commands.hs +++ b/hledger/Hledger/Cli/Commands.hs @@ -60,7 +60,7 @@ import Data.Either (isRight) import Data.List import Data.List.Extra (groupSortOn, nubSort) import Data.Text (Text) -import qualified Data.Text as T +import Data.Text qualified as T import Data.Time.Calendar import Safe (headErr) import String.ANSI diff --git a/hledger/Hledger/Cli/Commands/Accounts.hs b/hledger/Hledger/Cli/Commands/Accounts.hs index 1449b6998..0fb632121 100644 --- a/hledger/Hledger/Cli/Commands/Accounts.hs +++ b/hledger/Hledger/Cli/Commands/Accounts.hs @@ -23,8 +23,8 @@ module Hledger.Cli.Commands.Accounts ( import Control.Monad (forM_) import Data.List import Data.Maybe (fromMaybe) -import qualified Data.Text as T -import qualified Data.Text.IO as T +import Data.Text qualified as T +import Data.Text.IO qualified as T import Safe (headDef) import System.Console.CmdArgs.Explicit as C diff --git a/hledger/Hledger/Cli/Commands/Add.hs b/hledger/Hledger/Cli/Commands/Add.hs index 1751ea8fe..6aaceceaf 100644 --- a/hledger/Hledger/Cli/Commands/Add.hs +++ b/hledger/Hledger/Cli/Commands/Add.hs @@ -31,10 +31,10 @@ import Data.Functor.Identity (Identity(..)) import Data.List (isPrefixOf, nub) import Data.Maybe (fromJust, fromMaybe, isJust) import Data.Text (Text) -import qualified Data.Text as T -import qualified Data.Text.IO as T -import qualified Data.Text.Lazy as TL -import qualified Data.Text.Lazy.IO as TL +import Data.Text qualified as T +import Data.Text.IO qualified as T +import Data.Text.Lazy qualified as TL +import Data.Text.Lazy.IO qualified as TL import Data.Time.Calendar (Day, toGregorian) import Data.Time.Format (formatTime, defaultTimeLocale) import Lens.Micro ((^.)) diff --git a/hledger/Hledger/Cli/Commands/Aregister.hs b/hledger/Hledger/Cli/Commands/Aregister.hs index a63badf63..28301cdc9 100644 --- a/hledger/Hledger/Cli/Commands/Aregister.hs +++ b/hledger/Hledger/Cli/Commands/Aregister.hs @@ -24,14 +24,14 @@ import Data.List (find, nub) import Data.Maybe (fromMaybe) import Data.Text (Text) import Data.Foldable (for_) -import qualified Data.Map as Map -import qualified Data.Text as T -import qualified Data.Text.Lazy as TL -import qualified Data.Text.Lazy.Builder as TB +import Data.Map qualified as Map +import Data.Text qualified as T +import Data.Text.Lazy qualified as TL +import Data.Text.Lazy.Builder qualified as TB import Control.Monad (when) -import qualified Lucid as L hiding (Html) +import Lucid qualified as L hiding (Html) import System.Console.CmdArgs.Explicit (flagNone, flagReq) -import qualified System.IO as IO +import System.IO qualified as IO import Text.Tabular.AsciiWide hiding (render) import Hledger @@ -40,7 +40,7 @@ import Hledger.Cli.Utils import Hledger.Write.Csv (CSV, printCSV, printTSV) import Hledger.Write.Html (formatRow, htmlAsLazyText, toHtml) import Hledger.Write.Ods (printFods) -import qualified Hledger.Write.Spreadsheet as Spr +import Hledger.Write.Spreadsheet qualified as Spr aregistermode = hledgerCommandMode $(embedFileRelative "Hledger/Cli/Commands/Aregister.txt") diff --git a/hledger/Hledger/Cli/Commands/Balance.hs b/hledger/Hledger/Cli/Commands/Balance.hs index 50cec6b3d..daa6eb468 100644 --- a/hledger/Hledger/Cli/Commands/Balance.hs +++ b/hledger/Hledger/Cli/Commands/Balance.hs @@ -281,14 +281,14 @@ import Data.List (find, transpose) #if !MIN_VERSION_base(4,20,0) import Data.List (foldl') #endif -import qualified Data.Map as Map -import qualified Data.Set as S +import Data.Map qualified as Map +import Data.Set qualified as S import Data.Maybe (mapMaybe, fromMaybe) import Data.Tuple (swap) import Data.Text (Text) -import qualified Data.Text as T -import qualified Data.Text.Lazy as TL -import qualified Data.Text.Lazy.Builder as TB +import Data.Text qualified as T +import Data.Text.Lazy qualified as TL +import Data.Text.Lazy.Builder qualified as TB import Data.Time (addDays, fromGregorian) import System.Console.CmdArgs.Explicit as C (flagNone, flagReq, flagOpt) import Safe (headMay, maximumMay) @@ -296,7 +296,7 @@ import Text.Tabular.AsciiWide (Header(..), Align(..), Properties(..), Cell(..), Table(..), TableOpts(..), cellWidth, concatTables, renderColumns, renderRowB, renderTableByRowsB, textCell) -import qualified System.IO as IO +import System.IO qualified as IO import Hledger import Hledger.Cli.CliOptions @@ -308,7 +308,7 @@ import Hledger.Write.Html (Html, styledTableHtml, htmlAsLazyText, toHtml) import Hledger.Write.Spreadsheet (rawTableContent, headerCell, addHeaderBorders, addRowSpanHeader, cellFromMixedAmount, cellsFromMixedAmount) -import qualified Hledger.Write.Spreadsheet as Ods +import Hledger.Write.Spreadsheet qualified as Ods -- | Command line options for this command. diff --git a/hledger/Hledger/Cli/Commands/Close.hs b/hledger/Hledger/Cli/Commands/Close.hs index 4031f79d4..052cdbd25 100644 --- a/hledger/Hledger/Cli/Commands/Close.hs +++ b/hledger/Hledger/Cli/Commands/Close.hs @@ -11,8 +11,8 @@ where import Data.Function (on) import Data.List (groupBy) import Data.Maybe (fromMaybe) -import qualified Data.Text as T -import qualified Data.Text.IO as T +import Data.Text qualified as T +import Data.Text.IO qualified as T import Data.Time.Calendar (addDays) import System.Console.CmdArgs.Explicit as C diff --git a/hledger/Hledger/Cli/Commands/Codes.hs b/hledger/Hledger/Cli/Commands/Codes.hs index 85a549aa1..cdeb56b88 100644 --- a/hledger/Hledger/Cli/Commands/Codes.hs +++ b/hledger/Hledger/Cli/Commands/Codes.hs @@ -15,8 +15,8 @@ module Hledger.Cli.Commands.Codes ( ,codes ) where -import qualified Data.Text as T -import qualified Data.Text.IO as T +import Data.Text qualified as T +import Data.Text.IO qualified as T import Hledger import Hledger.Cli.CliOptions diff --git a/hledger/Hledger/Cli/Commands/Commodities.hs b/hledger/Hledger/Cli/Commands/Commodities.hs index 7dfafa300..620c903fa 100644 --- a/hledger/Hledger/Cli/Commands/Commodities.hs +++ b/hledger/Hledger/Cli/Commands/Commodities.hs @@ -12,9 +12,9 @@ module Hledger.Cli.Commands.Commodities ( ,commodities ) where -import qualified Data.Map as M -import qualified Data.Set as S -import qualified Data.Text.IO as T +import Data.Map qualified as M +import Data.Set qualified as S +import Data.Text.IO qualified as T import System.Console.CmdArgs.Explicit import Hledger diff --git a/hledger/Hledger/Cli/Commands/Demo.hs b/hledger/Hledger/Cli/Commands/Demo.hs index d1f0c33b6..88e8bae30 100644 --- a/hledger/Hledger/Cli/Commands/Demo.hs +++ b/hledger/Hledger/Cli/Commands/Demo.hs @@ -47,7 +47,7 @@ import Data.List (isPrefixOf, find, findIndex, isInfixOf, dropWhileEnd) import Control.Applicative ((<|>)) import Data.ByteString as B (ByteString) import Data.Maybe -import qualified Data.ByteString.Char8 as B +import Data.ByteString.Char8 qualified as B import Safe (tailMay) import System.IO.Temp (withSystemTempFile) import System.IO (hClose) diff --git a/hledger/Hledger/Cli/Commands/Descriptions.hs b/hledger/Hledger/Cli/Commands/Descriptions.hs index 98f0661e6..7529abdc9 100644 --- a/hledger/Hledger/Cli/Commands/Descriptions.hs +++ b/hledger/Hledger/Cli/Commands/Descriptions.hs @@ -15,7 +15,7 @@ module Hledger.Cli.Commands.Descriptions ( ) where import Data.List.Extra (nubSort) -import qualified Data.Text.IO as T +import Data.Text.IO qualified as T import Hledger import Hledger.Cli.CliOptions diff --git a/hledger/Hledger/Cli/Commands/Diff.hs b/hledger/Hledger/Cli/Commands/Diff.hs index 83bb628aa..c020df173 100644 --- a/hledger/Hledger/Cli/Commands/Diff.hs +++ b/hledger/Hledger/Cli/Commands/Diff.hs @@ -18,7 +18,7 @@ import Data.Ord (comparing) import Data.Maybe (fromJust) import Data.Time (diffDays) import Data.Either (partitionEithers) -import qualified Data.Text.IO as T +import Data.Text.IO qualified as T import Lens.Micro (set) import Safe (headDef) diff --git a/hledger/Hledger/Cli/Commands/Files.hs b/hledger/Hledger/Cli/Commands/Files.hs index 96506710f..49c793b14 100644 --- a/hledger/Hledger/Cli/Commands/Files.hs +++ b/hledger/Hledger/Cli/Commands/Files.hs @@ -11,7 +11,7 @@ module Hledger.Cli.Commands.Files ( ,files ) where -import qualified Data.Text as T +import Data.Text qualified as T import Safe (headMay) import Hledger diff --git a/hledger/Hledger/Cli/Commands/Import.hs b/hledger/Hledger/Cli/Commands/Import.hs index 425c41d3f..393ea596d 100644 --- a/hledger/Hledger/Cli/Commands/Import.hs +++ b/hledger/Hledger/Cli/Commands/Import.hs @@ -11,7 +11,7 @@ where import Control.Monad import Data.List -import qualified Data.Text.IO as T +import Data.Text.IO qualified as T import System.Console.CmdArgs.Explicit import Text.Printf diff --git a/hledger/Hledger/Cli/Commands/Notes.hs b/hledger/Hledger/Cli/Commands/Notes.hs index 5b85208dc..a02b96c85 100644 --- a/hledger/Hledger/Cli/Commands/Notes.hs +++ b/hledger/Hledger/Cli/Commands/Notes.hs @@ -16,7 +16,7 @@ module Hledger.Cli.Commands.Notes ( ) where import Data.List.Extra (nubSort) -import qualified Data.Text.IO as T +import Data.Text.IO qualified as T import Hledger import Hledger.Cli.CliOptions diff --git a/hledger/Hledger/Cli/Commands/Payees.hs b/hledger/Hledger/Cli/Commands/Payees.hs index 12227ecc8..5bd6c1ea8 100644 --- a/hledger/Hledger/Cli/Commands/Payees.hs +++ b/hledger/Hledger/Cli/Commands/Payees.hs @@ -14,7 +14,7 @@ module Hledger.Cli.Commands.Payees ( ,payees ) where -import qualified Data.Text.IO as T +import Data.Text.IO qualified as T import System.Console.CmdArgs.Explicit import Hledger diff --git a/hledger/Hledger/Cli/Commands/Prices.hs b/hledger/Hledger/Cli/Commands/Prices.hs index 2b7020864..9bd362e7a 100644 --- a/hledger/Hledger/Cli/Commands/Prices.hs +++ b/hledger/Hledger/Cli/Commands/Prices.hs @@ -9,8 +9,8 @@ module Hledger.Cli.Commands.Prices ( where import Data.List -import qualified Data.Text as T -import qualified Data.Text.IO as T +import Data.Text qualified as T +import Data.Text.IO qualified as T import Hledger import Hledger.Cli.CliOptions import System.Console.CmdArgs.Explicit diff --git a/hledger/Hledger/Cli/Commands/Print.hs b/hledger/Hledger/Cli/Commands/Print.hs index 1edb4cabb..5dd9570d3 100644 --- a/hledger/Hledger/Cli/Commands/Print.hs +++ b/hledger/Hledger/Cli/Commands/Print.hs @@ -24,10 +24,10 @@ import Data.List (intersperse, intercalate) import Data.List.Extra (nubSort) import Data.Text (Text) import Data.Map (Map) -import qualified Data.Map as Map -import qualified Data.Text as T -import qualified Data.Text.Lazy as TL -import qualified Data.Text.Lazy.Builder as TB +import Data.Map qualified as Map +import Data.Text qualified as T +import Data.Text.Lazy qualified as TL +import Data.Text.Lazy.Builder qualified as TB import Lens.Micro ((^.), _Just, has) import Safe (lastMay, minimumDef) import System.Console.CmdArgs.Explicit @@ -37,12 +37,12 @@ import Hledger.Write.Beancount (accountNameToBeancount, showTransactionBeancount import Hledger.Write.Csv (CSV, printCSV, printTSV) import Hledger.Write.Ods (printFods) import Hledger.Write.Html.Lucid (styledTableHtml) -import qualified Hledger.Write.Spreadsheet as Spr +import Hledger.Write.Spreadsheet qualified as Spr import Hledger.Cli.CliOptions import Hledger.Cli.Utils import Hledger.Cli.Anchor (setAccountAnchor) -import qualified Lucid -import qualified System.IO as IO +import Lucid qualified +import System.IO qualified as IO import Data.Maybe (isJust, catMaybes, fromMaybe) import Hledger.Write.Beancount (commodityToBeancount, tagsToBeancountMetadata) diff --git a/hledger/Hledger/Cli/Commands/Register.hs b/hledger/Hledger/Cli/Commands/Register.hs index c1b7e844e..9b625e199 100644 --- a/hledger/Hledger/Cli/Commands/Register.hs +++ b/hledger/Hledger/Cli/Commands/Register.hs @@ -21,27 +21,27 @@ module Hledger.Cli.Commands.Register ( import Data.Default (def) import Data.Maybe (fromMaybe, isJust) import Data.Text (Text) -import qualified Data.Map as Map -import qualified Data.Text as T -import qualified Data.Text.Lazy as TL -import qualified Data.Text.Lazy.IO as TL -import qualified Data.Text.Lazy.Builder as TB +import Data.Map qualified as Map +import Data.Text qualified as T +import Data.Text.Lazy qualified as TL +import Data.Text.Lazy.IO qualified as TL +import Data.Text.Lazy.Builder qualified as TB import System.Console.CmdArgs.Explicit (flagNone, flagReq) import Hledger hiding (per) import Hledger.Write.Csv (CSV, printCSV, printTSV) import Hledger.Write.Ods (printFods) import Hledger.Write.Html.Lucid (styledTableHtml) -import qualified Hledger.Write.Spreadsheet as Spr +import Hledger.Write.Spreadsheet qualified as Spr import Hledger.Cli.CliOptions import Hledger.Cli.Utils import Hledger.Cli.Anchor (setAccountAnchor, dateCell) import Text.Tabular.AsciiWide (Cell(..), Align(..), Properties(..), Header(Header, Group), renderRowB, textCell, tableBorders, borderSpaces) -import qualified Lucid +import Lucid qualified import Data.List (sortBy) import Data.Char (toUpper) import Data.List.Extra (intersect) -import qualified System.IO as IO +import System.IO qualified as IO registermode = hledgerCommandMode $(embedFileRelative "Hledger/Cli/Commands/Register.txt") diff --git a/hledger/Hledger/Cli/Commands/Rewrite.hs b/hledger/Hledger/Cli/Commands/Rewrite.hs index 816fa3d13..eb061363b 100644 --- a/hledger/Hledger/Cli/Commands/Rewrite.hs +++ b/hledger/Hledger/Cli/Commands/Rewrite.hs @@ -17,15 +17,15 @@ import Data.List (sortOn) import Data.List (foldl') #endif import Data.Text (Text) -import qualified Data.Text as T -import qualified Data.Text.IO as T +import Data.Text qualified as T +import Data.Text.IO qualified as T import Hledger import Hledger.Cli.CliOptions import Hledger.Cli.Commands.Print import System.Console.CmdArgs.Explicit import Text.Printf import Text.Megaparsec hiding (pos1) -import qualified Data.Algorithm.Diff as D +import Data.Algorithm.Diff qualified as D rewritemode = hledgerCommandMode $(embedFileRelative "Hledger/Cli/Commands/Rewrite.txt") diff --git a/hledger/Hledger/Cli/Commands/Roi.hs b/hledger/Hledger/Cli/Commands/Roi.hs index 0e84bbd5a..a1d2ff8e1 100644 --- a/hledger/Hledger/Cli/Commands/Roi.hs +++ b/hledger/Hledger/Cli/Commands/Roi.hs @@ -23,8 +23,8 @@ import Data.Function (on) import Data.List import Numeric.RootFinding import Data.Decimal -import qualified Data.Text as T -import qualified Data.Text.Lazy.IO as TL +import Data.Text qualified as T +import Data.Text.Lazy.IO qualified as TL import Safe (headDef) import System.Console.CmdArgs.Explicit as CmdArgs diff --git a/hledger/Hledger/Cli/Commands/Run.hs b/hledger/Hledger/Cli/Commands/Run.hs index 59426aac7..286f0f80b 100644 --- a/hledger/Hledger/Cli/Commands/Run.hs +++ b/hledger/Hledger/Cli/Commands/Run.hs @@ -17,11 +17,11 @@ module Hledger.Cli.Commands.Run ( ,runOrReplStub ) where -import qualified Data.List.NonEmpty as NE -import qualified Data.Map.Strict as Map +import Data.List.NonEmpty qualified as NE +import Data.Map.Strict qualified as Map import Data.Semigroup (sconcat) -import qualified Data.Text as T -import qualified Data.Text.IO as T +import Data.Text qualified as T +import Data.Text.IO qualified as T import System.Console.CmdArgs.Explicit as C ( Mode ) import Hledger import Hledger.Cli.CliOptions diff --git a/hledger/Hledger/Cli/Commands/Setup.hs b/hledger/Hledger/Cli/Commands/Setup.hs index 09c2e244f..335a404dd 100644 --- a/hledger/Hledger/Cli/Commands/Setup.hs +++ b/hledger/Hledger/Cli/Commands/Setup.hs @@ -53,14 +53,14 @@ where import Control.Exception import Control.Monad --- import qualified Data.ByteString as B +-- import Data.ByteString qualified as B import Data.Char import Data.Default (def) import Data.List -import qualified Data.Map as M +import Data.Map qualified as M import Data.Maybe -import qualified Data.Text as T -import qualified Data.Text.Encoding as T +import Data.Text qualified as T +import Data.Text.Encoding qualified as T import Network.HTTP.Client import Network.HTTP.Types (statusCode, hLocation) import Network.HTTP.Req as R diff --git a/hledger/Hledger/Cli/Commands/Stats.hs b/hledger/Hledger/Cli/Commands/Stats.hs index ea39ba30a..2798865d0 100644 --- a/hledger/Hledger/Cli/Commands/Stats.hs +++ b/hledger/Hledger/Cli/Commands/Stats.hs @@ -19,12 +19,12 @@ import Data.Default (def) import System.FilePath (takeFileName) import Data.List (intercalate, nub, sortOn) import Data.List.Extra (nubSort) -import qualified Data.Map as Map +import Data.Map qualified as Map import Data.Maybe (fromMaybe) import Data.HashSet (size, fromList) -import qualified Data.Text as T -import qualified Data.Text.Lazy as TL -import qualified Data.Text.Lazy.Builder as TB +import Data.Text qualified as T +import Data.Text.Lazy qualified as TL +import Data.Text.Lazy.Builder qualified as TB import Data.Time.Calendar (Day, addDays, diffDays) import Data.Time.Clock.POSIX (getPOSIXTime) import GHC.Stats diff --git a/hledger/Hledger/Cli/Commands/Tags.hs b/hledger/Hledger/Cli/Commands/Tags.hs index f3b53ec82..f1f124c69 100644 --- a/hledger/Hledger/Cli/Commands/Tags.hs +++ b/hledger/Hledger/Cli/Commands/Tags.hs @@ -8,10 +8,10 @@ module Hledger.Cli.Commands.Tags ( ) where -import qualified Control.Monad.Fail as Fail +import Control.Monad.Fail qualified as Fail import Data.List.Extra (nubSort) -import qualified Data.Text as T -import qualified Data.Text.IO as T +import Data.Text qualified as T +import Data.Text.IO qualified as T import Safe import System.Console.CmdArgs.Explicit diff --git a/hledger/Hledger/Cli/CompoundBalanceCommand.hs b/hledger/Hledger/Cli/CompoundBalanceCommand.hs index f1d8d4a1b..9ed423264 100644 --- a/hledger/Hledger/Cli/CompoundBalanceCommand.hs +++ b/hledger/Hledger/Cli/CompoundBalanceCommand.hs @@ -19,16 +19,16 @@ import Data.Bifunctor (second) import Data.Function ((&)) import Data.List.NonEmpty (NonEmpty((:|))) import Data.Maybe (fromMaybe, mapMaybe, maybeToList) -import qualified Data.Map as Map -import qualified Data.List as List -import qualified Data.List.NonEmpty as NonEmpty -import qualified Data.Text as T -import qualified Data.Text.Lazy as TL -import qualified Data.Text.Lazy.Builder as TB +import Data.Map qualified as Map +import Data.List qualified as List +import Data.List.NonEmpty qualified as NonEmpty +import Data.Text qualified as T +import Data.Text.Lazy qualified as TL +import Data.Text.Lazy.Builder qualified as TB import Data.Time.Calendar (Day, addDays) import Lucid as L hiding (Html, value_) import System.Console.CmdArgs.Explicit as C (Mode, flagNone, flagReq) -import qualified System.IO as IO +import System.IO qualified as IO import Text.Tabular.AsciiWide as Tabular hiding (render) import Hledger @@ -39,7 +39,7 @@ import Hledger.Write.Csv (CSV, printCSV, printTSV) import Hledger.Write.Html (htmlAsLazyText, styledTableHtml, Html) import Hledger.Write.Html.Attribute (stylesheet, tableStyle, alignleft) import Hledger.Write.Ods (printFods) -import qualified Hledger.Write.Spreadsheet as Spr +import Hledger.Write.Spreadsheet qualified as Spr -- | Description of a compound balance report command, -- from which we generate the command's cmdargs mode and IO action. diff --git a/hledger/Hledger/Cli/Conf.hs b/hledger/Hledger/Cli/Conf.hs index 42d1b596f..7c68dba2e 100644 --- a/hledger/Hledger/Cli/Conf.hs +++ b/hledger/Hledger/Cli/Conf.hs @@ -26,10 +26,10 @@ import Control.Exception (handle) import Control.Monad (void, forM) import Control.Monad.Identity (Identity) import Data.Functor ((<&>)) -import qualified Data.Map as M +import Data.Map qualified as M import Data.Maybe (catMaybes) import Data.Text (Text) -import qualified Data.Text as T (pack) +import Data.Text qualified as T (pack) import Safe (headMay, lastDef) import System.Directory (getHomeDirectory, getXdgDirectory, XdgDirectory (XdgConfig), doesFileExist, getCurrentDirectory) import System.FilePath ((), takeDirectory) diff --git a/hledger/Hledger/Cli/DocFiles.hs b/hledger/Hledger/Cli/DocFiles.hs index 9be240953..695a16cd0 100644 --- a/hledger/Hledger/Cli/DocFiles.hs +++ b/hledger/Hledger/Cli/DocFiles.hs @@ -21,7 +21,7 @@ module Hledger.Cli.DocFiles ( import Control.Exception import Data.ByteString (ByteString) -import qualified Data.ByteString.Char8 as BC +import Data.ByteString.Char8 qualified as BC import Data.Maybe (fromMaybe) import Data.String import System.Environment (setEnv) diff --git a/hledger/Hledger/Cli/Script.hs b/hledger/Hledger/Cli/Script.hs index 8883c0f8e..62ead48bf 100644 --- a/hledger/Hledger/Cli/Script.hs +++ b/hledger/Hledger/Cli/Script.hs @@ -32,7 +32,7 @@ import Text.Printf as M hiding (formatString) import "text" Data.Text as M (Text, pack, unpack) -- can't re-export much of Data.Text & Data.Text.IO, they need to be qualified import Safe as M hiding (at) --- import qualified System.Console.CmdArgs.Explicit as M +-- import System.Console.CmdArgs.Explicit qualified as M import System.Directory as M import System.Environment as M import System.Exit as M diff --git a/hledger/Hledger/Cli/Utils.hs b/hledger/Hledger/Cli/Utils.hs index 5ffcf441a..b9b88f2e3 100644 --- a/hledger/Hledger/Cli/Utils.hs +++ b/hledger/Hledger/Cli/Utils.hs @@ -30,13 +30,13 @@ where import Control.Monad.Except (ExceptT) import Control.Monad.IO.Class (liftIO) import Data.List -import qualified Data.List.NonEmpty as NE (toList) +import Data.List.NonEmpty qualified as NE (toList) import Data.Maybe -import qualified Data.Text as T -import qualified Data.Text.IO as T -import qualified Data.Text.Lazy as TL -import qualified Data.Text.Lazy.Builder as TB -import qualified Data.Text.Lazy.IO as TL +import Data.Text qualified as T +import Data.Text.IO qualified as T +import Data.Text.Lazy qualified as TL +import Data.Text.Lazy.Builder qualified as TB +import Data.Text.Lazy.IO qualified as TL import Data.Time (Day) import Data.Time.Clock.POSIX (POSIXTime, utcTimeToPOSIXSeconds) import Lens.Micro ((^.)) diff --git a/hledger/Hledger/Cli/Version.hs b/hledger/Hledger/Cli/Version.hs index 49a7b705d..3d5422b57 100644 --- a/hledger/Hledger/Cli/Version.hs +++ b/hledger/Hledger/Cli/Version.hs @@ -36,10 +36,10 @@ import Data.Time (Day) import Text.Megaparsec import Data.Void (Void) import Text.Megaparsec.Char -import qualified Text.Megaparsec.Char.Lexer as L +import Text.Megaparsec.Char.Lexer qualified as L import Hledger.Data.Dates (parsedate) import Data.Bifunctor -import qualified Data.List.NonEmpty as NE +import Data.List.NonEmpty qualified as NE -- | A Cabal/Hackage-compatible package version string: one or more dot-separated integers. diff --git a/hledger/app/hledger-cli.hs b/hledger/app/hledger-cli.hs index b464da8d9..bbe347da1 100755 --- a/hledger/app/hledger-cli.hs +++ b/hledger/app/hledger-cli.hs @@ -2,7 +2,7 @@ module Main (main) where -import qualified Hledger.Cli (main) +import Hledger.Cli qualified (main) -- Have to write this explicitly for GHC 9.0.1a for some reason: main :: IO () diff --git a/tools/changelogEdit.hs b/tools/changelogEdit.hs index 03fc47054..fdb5a4526 100755 --- a/tools/changelogEdit.hs +++ b/tools/changelogEdit.hs @@ -42,7 +42,7 @@ import Data.Char import Data.Default import GHC.Generics import Data.List.Extra --- import qualified Data.Text as T +-- import Data.Text qualified as T import System.Environment import System.IO.Extra -- import System.IO diff --git a/tools/criterionbench.hs b/tools/criterionbench.hs index aeb634b78..97d64d63f 100755 --- a/tools/criterionbench.hs +++ b/tools/criterionbench.hs @@ -3,7 +3,7 @@ of time variance and charts the results. -} import Criterion.Main import System.Environment (withArgs) -import qualified HledgerMain +import HledgerMain qualified main = defaultMain [ bench "balance_100x100x10" $ nfIO $ withArgs ["balance", "-f", "100x100x10.ledger", ">/dev/null"] HledgerMain.main diff --git a/tools/progressionbench.hs b/tools/progressionbench.hs index 2b60e8923..158bab88e 100755 --- a/tools/progressionbench.hs +++ b/tools/progressionbench.hs @@ -3,7 +3,7 @@ import Criterion.Main hiding (defaultMain, defaultMainWith) import Progression.Main import System.Environment (withArgs) -import qualified HledgerMain +import HledgerMain qualified main = defaultMain $ bench "balance_100x100x10" $ nfIO $ withArgs ["balance", "-f", "100x100x10.ledger", ">/dev/null"] HledgerMain.main