Fix the wrong hlint ci setting (#730)

* Fix the wrong hlint ci setting * Make hlint happy
mihaimaruseac · May 3, 2023 · ce45bf2 · ce45bf2
1 parent 52eddfb
commit ce45bf2
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 12 deletions.
diff --git a/.github/workflows/static-checks.yaml b/.github/workflows/static-checks.yaml
@@ -22,7 +22,7 @@ jobs:
         uses: haskell/actions/hlint-setup@14f59b6b6cfb9fec5e47296d6604e9c4e961a5b1 # v2.3.8
 
       - name: Run HLint
-        uses: haskell/actions/hlint-setup@14f59b6b6cfb9fec5e47296d6604e9c4e961a5b1 # v2.3.8
+        uses: haskell/actions/hlint-run@14f59b6b6cfb9fec5e47296d6604e9c4e961a5b1 # v2.3.8
         with:
           path: .
           fail-on: warning

diff --git a/app/Main.hs b/app/Main.hs
@@ -1,6 +1,3 @@
-{-# LANGUAGE OverloadedStrings #-}
-{-# LANGUAGE Unsafe #-}
-
 -- | Main entry point to hindent.
 --
 -- hindent

diff --git a/src/HIndent/CabalFile.hs b/src/HIndent/CabalFile.hs
@@ -84,10 +84,10 @@ packageStanzas pd =
           BenchmarkExeV10 _ path -> [path]
           _ -> []
    in mconcat
-        [ maybeToList $ fmap libStanza $ library pd
-        , fmap exeStanza $ executables pd
-        , fmap testStanza $ testSuites pd
-        , fmap benchStanza $ benchmarks pd
+        [ maybeToList $ libStanza <$> library pd
+        , exeStanza <$> executables pd
+        , testStanza <$> testSuites pd
+        , benchStanza <$> benchmarks pd
         ]
 
 -- | Find cabal files that are "above" the source path
@@ -100,7 +100,7 @@ findCabalFiles dir rel = do
     []
       | dir == "/" -> return Nothing
     [] -> findCabalFiles (takeDirectory dir) (takeFileName dir </> rel)
-    _ -> return $ Just (fmap (\n -> dir </> n) cabalnames, rel)
+    _ -> return $ Just (fmap (dir </>) cabalnames, rel)
 
 getGenericPackageDescription :: FilePath -> IO (Maybe GenericPackageDescription)
 #if MIN_VERSION_Cabal(2, 2, 0)
@@ -129,8 +129,7 @@ getCabalStanza srcpath = do
             Just gpd -> do
               return $ packageStanzas $ flattenPackageDescription gpd
       return $
-        case filter (\stanza -> stanzaIsSourceFilePath stanza relpath) $
-             mconcat stanzass of
+        case filter (`stanzaIsSourceFilePath` relpath) $ mconcat stanzass of
           [] -> Nothing
           (stanza:_) -> Just stanza -- just pick the first one
     Nothing -> return Nothing

diff --git a/src/HIndent/ModulePreprocessing/CommentRelocation.hs b/src/HIndent/ModulePreprocessing/CommentRelocation.hs
@@ -4,7 +4,6 @@
 {-# LANGUAGE RecordWildCards #-}
 {-# LANGUAGE ScopedTypeVariables #-}
 {-# LANGUAGE TypeApplications #-}
-{-# LANGUAGE ViewPatterns #-}
 
 -- | Comment relocation for pretty-printing comments correctly.
 --