switch to universum prelude

also don't keep adjusted maps around if not necessary

1 files changed, 7 insertions, 9 deletions

diff --git a/lib/WriteRepo.hs b/lib/WriteRepo.hs
index 36c0df7..e4815fe 100644
--- a/lib/WriteRepo.hs
+++ b/lib/WriteRepo.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE DataKinds           #-}
 {-# LANGUAGE LambdaCase          #-}
 {-# LANGUAGE ScopedTypeVariables #-}
 
@@ -5,14 +6,11 @@
 -- | Module for writing an already linted map Repository back out again.
 module WriteRepo (writeAdjustedRepository) where
 
+import           Universum
+
 import           CheckDir               (DirResult (..), resultIsFatal)
-import           CheckMap               (MapResult (..))
-import           Control.Monad          (forM_, unless)
-import           Control.Monad.Extra    (ifM)
+import           CheckMap               (MapResult (..), ResultKind (..))
 import           Data.Aeson             (encodeFile)
-import           Data.Map.Strict        (toList)
-import           Data.Maybe             (mapMaybe)
-import           Data.Set               (Set)
 import qualified Data.Set               as S
 import           LintConfig             (LintConfig (configDontCopyAssets),
                                          LintConfig')
@@ -27,7 +25,7 @@ import           Types                  (Dep (Local))
 
 
 
-writeAdjustedRepository :: LintConfig' -> FilePath -> FilePath -> DirResult -> IO ExitCode
+writeAdjustedRepository :: LintConfig' -> FilePath -> FilePath -> DirResult Full -> IO ExitCode
 writeAdjustedRepository config inPath outPath result
   | resultIsFatal config result =
       pure (ExitFailure 1)
@@ -36,7 +34,7 @@ writeAdjustedRepository config inPath outPath result
         createDirectoryIfMissing True outPath
 
         -- write out all maps
-        forM_ (toList $ dirresultMaps result) $ \(path,out) -> do
+        forM_ (toPairs $ dirresultMaps result) $ \(path,out) -> do
           createDirectoryIfMissing True (takeDirectory (outPath </> path))
           encodeFile (outPath </> path) $ mapresultAdjusted out
 
@@ -51,7 +49,7 @@ writeAdjustedRepository config inPath outPath result
                        Local path -> Just . normalise mapdir $ path
                        _          -> Nothing)
                      $ mapresultDepends mapresult)
-                . toList $ dirresultMaps result
+                . toPairs $ dirresultMaps result
 
           -- copy all assets
           forM_ localdeps $ \path ->