diff --git a/Info.hs b/Info.hs index d8a065a..3aa87e1 100644 --- a/Info.hs +++ b/Info.hs @@ -121,9 +121,9 @@ infoThing str = do filterOutChildren :: (a -> TyThing) -> [a] -> [a] filterOutChildren get_thing xs - = [x | x <- xs, not (getName (get_thing x) `elemNameSet` implicits)] + = [x | x <- xs, not (getName (get_thing x) `elemNameSet` implicits)] where - implicits = mkNameSet [getName t | x <- xs, t <- implicitTyThings (get_thing x)] + implicits = mkNameSet [getName t | x <- xs, t <- implicitTyThings (get_thing x)] pprInfo :: PrintExplicitForalls -> (TyThing, GHC.Fixity, [Gap.ClsInst]) -> SDoc pprInfo pefas (thing, fixity, insts) @@ -132,8 +132,8 @@ pprInfo pefas (thing, fixity, insts) $$ vcat (map pprInstance insts) where show_fixity fx - | fx == defaultFixity = Outputable.empty - | otherwise = ppr fx <+> ppr (getName thing) + | fx == defaultFixity = Outputable.empty + | otherwise = ppr fx <+> ppr (getName thing) ---------------------------------------------------------------- diff --git a/Lint.hs b/Lint.hs index 700c480..8741ec7 100644 --- a/Lint.hs +++ b/Lint.hs @@ -6,9 +6,9 @@ import Language.Haskell.HLint import Types lintSyntax :: Options -> String -> IO String -lintSyntax opt file = pretty <$> lint opt file +lintSyntax opt file = pack <$> lint opt file where - pretty = unlines . map (intercalate "\0" . lines) + pack = unlines . map (intercalate "\0" . lines) lint :: Options -> String -> IO [String] lint opt file = map show <$> hlint ([file, "--quiet"] ++ hlintOpts opt)