From e37caf0f27095dd2e0470734d0576ac25a62b0de Mon Sep 17 00:00:00 2001 From: Simon Michael Date: Mon, 1 Sep 2025 05:52:23 +0100 Subject: [PATCH] imp:journal: better error when attempting to include a rules file --- hledger-lib/Hledger/Read/CsvReader.hs | 2 +- hledger-lib/Hledger/Read/RulesReader.hs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hledger-lib/Hledger/Read/CsvReader.hs b/hledger-lib/Hledger/Read/CsvReader.hs index 9e54c47e4..aca42a47d 100644 --- a/hledger-lib/Hledger/Read/CsvReader.hs +++ b/hledger-lib/Hledger/Read/CsvReader.hs @@ -46,7 +46,7 @@ reader sep = Reader {rFormat = Sep sep ,rExtensions = [show sep] ,rReadFn = parse sep - ,rParser = const $ fail "sorry, CSV files can't be included yet" -- PARTIAL: + ,rParser = const $ fail "sorry, CSV files can't be included yet" -- This unnecessarily shows the CSV file's first line in the error message, -- but gives a more useful message than just calling error'. -- XXX Note every call to error' in Hledger.Read.* is potentially a similar problem - diff --git a/hledger-lib/Hledger/Read/RulesReader.hs b/hledger-lib/Hledger/Read/RulesReader.hs index 73697c7db..9c297edce 100644 --- a/hledger-lib/Hledger/Read/RulesReader.hs +++ b/hledger-lib/Hledger/Read/RulesReader.hs @@ -108,7 +108,7 @@ reader = Reader {rFormat = Rules ,rExtensions = ["rules"] ,rReadFn = parse - ,rParser = error' "sorry, rules files can't be included" -- PARTIAL: + ,rParser = const $ fail "sorry, rules files can't be included yet" } isFileName f = takeFileName f == f