avoid a Text.Printf name collision with GHC 7.7+ (fixes #153)
This commit is contained in:
		
							parent
							
								
									2a23ebd74f
								
							
						
					
					
						commit
						d55f686f68
					
				| @ -67,13 +67,13 @@ formatLiteral = do | |||||||
|       c =     (satisfy isPrintableButNotPercentage <?> "printable character") |       c =     (satisfy isPrintableButNotPercentage <?> "printable character") | ||||||
|           <|> try (string "%%" >> return '%') |           <|> try (string "%%" >> return '%') | ||||||
| 
 | 
 | ||||||
| formatString :: GenParser Char st FormatString | formatStr :: GenParser Char st FormatString | ||||||
| formatString = | formatStr = | ||||||
|         formatField |         formatField | ||||||
|     <|> formatLiteral |     <|> formatLiteral | ||||||
| 
 | 
 | ||||||
| formatStrings :: GenParser Char st [FormatString] | formatStrings :: GenParser Char st [FormatString] | ||||||
| formatStrings = many formatString | formatStrings = many formatStr | ||||||
| 
 | 
 | ||||||
| testFormat :: FormatString -> String -> String -> Assertion | testFormat :: FormatString -> String -> String -> Assertion | ||||||
| testFormat fs value expected = assertEqual name expected actual | testFormat fs value expected = assertEqual name expected actual | ||||||
|  | |||||||
		Loading…
	
		Reference in New Issue
	
	Block a user