fix: Cleanup some hlint warnings.

TokTok · Dec 18, 2023 · ed2ba7e · ed2ba7e
1 parent de55692
commit ed2ba7e
Show file tree

Hide file tree

Showing 10 changed files with 11 additions and 16 deletions.
diff --git a/src/Language/Cimple/Ast.hs b/src/Language/Cimple/Ast.hs
@@ -1,10 +1,8 @@
-{-# LANGUAGE DeriveFunctor     #-}
 {-# LANGUAGE DeriveGeneric     #-}
 {-# LANGUAGE DeriveTraversable #-}
 {-# LANGUAGE DerivingVia       #-}
 {-# LANGUAGE FlexibleInstances #-}
 {-# LANGUAGE Strict            #-}
-{-# LANGUAGE StrictData        #-}
 module Language.Cimple.Ast
     ( AssignOp (..)
     , BinaryOp (..)

diff --git a/src/Language/Cimple/DescribeAst.hs b/src/Language/Cimple/DescribeAst.hs
@@ -1,7 +1,6 @@
 {-# LANGUAGE FlexibleInstances #-}
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE Strict            #-}
-{-# LANGUAGE StrictData        #-}
 module Language.Cimple.DescribeAst
     ( HasLocation (..)
     , describeLexeme
@@ -34,7 +33,7 @@ describeNode node = case unFix node of
     PreprocIf{}     -> "#if/#endif block"
     PreprocIfdef{}  -> "#ifdef/#endif block"
     PreprocIfndef{} -> "#ifndef/#endif block"
-    _               -> show $ (const ellipsis) <$> unFix node
+    _               -> show $ ellipsis <$ unFix node
   where
     ellipsis :: String
     ellipsis = "..."

diff --git a/src/Language/Cimple/Diagnostics.hs b/src/Language/Cimple/Diagnostics.hs
@@ -1,7 +1,6 @@
 {-# LANGUAGE FlexibleInstances #-}
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE Strict            #-}
-{-# LANGUAGE StrictData        #-}
 module Language.Cimple.Diagnostics
   ( Diagnostics
   , HasDiagnostics (..)

diff --git a/src/Language/Cimple/Flatten.hs b/src/Language/Cimple/Flatten.hs
@@ -3,7 +3,6 @@
 {-# LANGUAGE FlexibleInstances     #-}
 {-# LANGUAGE MultiParamTypeClasses #-}
 {-# LANGUAGE Strict                #-}
-{-# LANGUAGE StrictData            #-}
 {-# LANGUAGE TypeOperators         #-}
 module Language.Cimple.Flatten (lexemes) where
 
@@ -81,7 +80,7 @@ instance GenConcatsFlatten (Fix (CommentF a)) a where
     gconcatsFlatten (Fix (DocRParen x)) = gconcatsFlatten x
     gconcatsFlatten (Fix (DocSee r x)) = r : gconcatsFlatten x
     gconcatsFlatten (Fix (DocSentence x p)) = gconcatsFlatten x ++ [p]
-    gconcatsFlatten (Fix (DocULItem i x)) = concat [gconcatsFlatten i, gconcatsFlatten x]
+    gconcatsFlatten (Fix (DocULItem i x)) = gconcatsFlatten i ++ gconcatsFlatten x
     gconcatsFlatten (Fix (DocWord x)) = [x]
 
 instance GenConcatsFlatten t a => GenConcats (Rec0 t) a where

diff --git a/src/Language/Cimple/IO.hs b/src/Language/Cimple/IO.hs
@@ -1,5 +1,4 @@
-{-# LANGUAGE Strict     #-}
-{-# LANGUAGE StrictData #-}
+{-# LANGUAGE Strict #-}
 module Language.Cimple.IO
     ( parseExpr
     , parseFile

diff --git a/src/Language/Cimple/MapAst.hs b/src/Language/Cimple/MapAst.hs
@@ -4,7 +4,6 @@
 {-# LANGUAGE RecordWildCards       #-}
 {-# LANGUAGE ScopedTypeVariables   #-}
 {-# LANGUAGE Strict                #-}
-{-# LANGUAGE StrictData            #-}
 {-# LANGUAGE TypeFamilies          #-}
 module Language.Cimple.MapAst
     ( mapAst

diff --git a/src/Language/Cimple/Pretty.hs b/src/Language/Cimple/Pretty.hs
@@ -1,6 +1,8 @@
 {-# OPTIONS_GHC -Wno-missing-signatures #-}
 {-# LANGUAGE LambdaCase        #-}
 {-# LANGUAGE OverloadedStrings #-}
+{-# HLINT ignore "Functor law" #-}
+{-# HLINT ignore "Use <$" #-}
 module Language.Cimple.Pretty
     ( plain
     , render
@@ -275,8 +277,9 @@ ppVerbatimComment =
 ppCommentInfo :: Comment (Lexeme Text) -> Doc
 ppCommentInfo = foldFix go
   where
-  ppBody     = vcat . zipWith (<>) (        repeat (dullyellow (text " * "  )))
-  ppIndented = vcat . zipWith (<>) (empty : repeat (dullyellow (text " *   ")))
+  commentStart t = repeat (dullyellow (text t))
+  ppBody     = vcat . zipWith (<>) (        commentStart " * "  )
+  ppIndented = vcat . zipWith (<>) (empty : commentStart " *   ")
   ppRef      = underline . cyan . ppLexeme
   ppAttr     = maybe empty (blue . ppLexeme)
 

diff --git a/src/Language/Cimple/SemCheck/Includes.hs b/src/Language/Cimple/SemCheck/Includes.hs
@@ -1,5 +1,4 @@
-{-# LANGUAGE Strict     #-}
-{-# LANGUAGE StrictData #-}
+{-# LANGUAGE Strict #-}
 module Language.Cimple.SemCheck.Includes
   ( collectIncludes
   , normaliseIncludes

diff --git a/src/Language/Cimple/TraverseAst.hs b/src/Language/Cimple/TraverseAst.hs
@@ -5,7 +5,6 @@
 {-# LANGUAGE RecordWildCards       #-}
 {-# LANGUAGE ScopedTypeVariables   #-}
 {-# LANGUAGE Strict                #-}
-{-# LANGUAGE StrictData            #-}
 {-# LANGUAGE TypeFamilies          #-}
 module Language.Cimple.TraverseAst
     ( traverseAst

diff --git a/tools/count-tokens.hs b/tools/count-tokens.hs
@@ -1,6 +1,7 @@
 {-# LANGUAGE Strict #-}
 module Main (main) where
 
+import           Data.Bifunctor       (bimap)
 import qualified Data.ByteString.Lazy as LBS
 import qualified Data.Text            as Text
 import           Data.Time.Clock      (diffUTCTime, getCurrentTime)
@@ -27,7 +28,7 @@ processFile source = do
         Right ok -> return ok
 
 processFiles :: [FilePath] -> IO (Int, Int)
-processFiles = fmap ((\(a, b) -> (sum a, sum b)) . unzip) . mapM processFile
+processFiles = fmap (bimap sum sum . unzip) . mapM processFile
 
 main :: IO ()
 main = do