From d55f686f68afb6b3d271e4e8d1ff084db7388291 Mon Sep 17 00:00:00 2001 From: Simon Michael Date: Fri, 10 Jan 2014 08:29:25 -0800 Subject: [PATCH] avoid a Text.Printf name collision with GHC 7.7+ (fixes #153) --- hledger-lib/Hledger/Data/FormatStrings.hs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/hledger-lib/Hledger/Data/FormatStrings.hs b/hledger-lib/Hledger/Data/FormatStrings.hs index d19965daf..8bb04abe1 100644 --- a/hledger-lib/Hledger/Data/FormatStrings.hs +++ b/hledger-lib/Hledger/Data/FormatStrings.hs @@ -67,13 +67,13 @@ formatLiteral = do c = (satisfy isPrintableButNotPercentage "printable character") <|> try (string "%%" >> return '%') -formatString :: GenParser Char st FormatString -formatString = +formatStr :: GenParser Char st FormatString +formatStr = formatField <|> formatLiteral formatStrings :: GenParser Char st [FormatString] -formatStrings = many formatString +formatStrings = many formatStr testFormat :: FormatString -> String -> String -> Assertion testFormat fs value expected = assertEqual name expected actual