From 4caded904c54d1cd85bf54239517e93650a404f5 Mon Sep 17 00:00:00 2001 From: stuebinm Date: Tue, 11 Oct 2022 13:39:16 +0200 Subject: use template haskell aeson, not generics this has been bothering me for MONTHS, and it compiles faster now. also fixed some warnings --- lib/CheckDir.hs | 1 - lib/CheckMap.hs | 2 +- lib/Dirgraph.hs | 2 +- lib/Util.hs | 4 ++-- 4 files changed, 4 insertions(+), 5 deletions(-) (limited to 'lib') diff --git a/lib/CheckDir.hs b/lib/CheckDir.hs index eaf9aee..8bf33cf 100644 --- a/lib/CheckDir.hs +++ b/lib/CheckDir.hs @@ -35,7 +35,6 @@ import qualified Data.Text as T import Data.Tiled (Tiledmap) import Dirgraph (graphToDot, invertGraph, resultToGraph, takeSubGraph, unreachableFrom) -import GHC.Generics (Generic) import LintConfig (LintConfig', configMaxLintLevel) import Paths (normalise, normaliseWithFrag) import System.Directory.Extra (doesFileExist) diff --git a/lib/CheckMap.hs b/lib/CheckMap.hs index 73464a8..279a2c1 100644 --- a/lib/CheckMap.hs +++ b/lib/CheckMap.hs @@ -44,7 +44,7 @@ import Util (PrettyPrint (prettyprint), prettyprint) data ResultKind = Full | Shrunk -type family Optional (a :: ResultKind) (b :: *) where +type family Optional (a :: ResultKind) (b :: Type) where Optional Full b = b Optional Shrunk b = () diff --git a/lib/Dirgraph.hs b/lib/Dirgraph.hs index 3fe1ce6..57852d0 100644 --- a/lib/Dirgraph.hs +++ b/lib/Dirgraph.hs @@ -8,7 +8,7 @@ module Dirgraph where import Universum import CheckMap (MapResult (mapresultDepends)) -import Data.Map.Strict (mapMaybeWithKey, mapWithKey, traverseWithKey) +import Data.Map.Strict (mapMaybeWithKey, mapWithKey) import qualified Data.Map.Strict as M import Data.Set ((\\)) import qualified Data.Set as S diff --git a/lib/Util.hs b/lib/Util.hs index 93060aa..5ec1b12 100644 --- a/lib/Util.hs +++ b/lib/Util.hs @@ -15,8 +15,8 @@ import Universum import Data.Aeson as Aeson import qualified Data.Set as S import qualified Data.Text as T -import Data.Tiled (Layer (layerData), PropertyValue (..), - Tileset (tilesetName), layerName, mkTiledId) +import Data.Tiled (Layer, PropertyValue (..), + Tileset (tilesetName), layerName) -- | helper function to create proxies mkProxy :: a -> Proxy a -- cgit v1.2.3