From e70ceee20ea8f064264f724e8390288ef2cb1017 Mon Sep 17 00:00:00 2001
From: stuebinm <stuebinm@disroot.org>
Date: Tue, 11 Oct 2022 13:41:30 +0200
Subject: [PATCH] code formatter
---
lib/CheckDir.hs | 2 +-
lib/CheckMap.hs | 4 ++--
lib/Dirgraph.hs | 2 +-
lib/Properties.hs | 5 +++--
lib/Util.hs | 4 ++--
lib/WriteRepo.hs | 2 +-
server/Handlers.hs | 4 ++--
server/HtmlOrphans.hs | 8 ++++----
server/Server.hs | 2 +-
tiled/Data/Tiled.hs | 8 ++++----
tiled/Data/Tiled/Abstract.hs | 6 +++---
tiled/Data/Tiled/TH.hs | 6 +++---
12 files changed, 27 insertions(+), 26 deletions(-)
diff --git a/lib/CheckDir.hs b/lib/CheckDir.hs
index 8bf33cf..104fdae 100644
--- a/lib/CheckDir.hs
+++ b/lib/CheckDir.hs
@@ -38,8 +38,8 @@ import Dirgraph (graphToDot, invertGraph, resultToGraph,
import LintConfig (LintConfig', configMaxLintLevel)
import Paths (normalise, normaliseWithFrag)
import System.Directory.Extra (doesFileExist)
-import System.FilePath (splitPath, (</>))
import qualified System.FilePath as FP
+import System.FilePath (splitPath, (</>))
import System.FilePath.Posix (takeDirectory)
import Text.Dot (showDot)
import Types (Dep (Local, LocalMap), Hint (Hint),
diff --git a/lib/CheckMap.hs b/lib/CheckMap.hs
index 279a2c1..a2a0f9f 100644
--- a/lib/CheckMap.hs
+++ b/lib/CheckMap.hs
@@ -32,8 +32,8 @@ import Data.Tiled (Layer (layerLayers, layerName),
import LintConfig (LintConfig (..), LintConfig')
import LintWriter (LintResult, invertLintResult,
resultToAdjusted, resultToBadges,
- resultToDeps, resultToLints, resultToOffers,
- runLintWriter, resultToCWs, resultToJitsis)
+ resultToCWs, resultToDeps, resultToJitsis,
+ resultToLints, resultToOffers, runLintWriter)
import Properties (checkLayer, checkMap, checkTileset)
import System.FilePath (takeFileName)
import Types (Dep (MapLink),
diff --git a/lib/Dirgraph.hs b/lib/Dirgraph.hs
index 57852d0..cc140a3 100644
--- a/lib/Dirgraph.hs
+++ b/lib/Dirgraph.hs
@@ -13,8 +13,8 @@ import qualified Data.Map.Strict as M
import Data.Set ((\\))
import qualified Data.Set as S
import Paths (normalise)
-import Text.Dot (Dot, (.->.))
import qualified Text.Dot as D
+import Text.Dot (Dot, (.->.))
import Types (Dep (LocalMap))
-- | a simple directed graph
diff --git a/lib/Properties.hs b/lib/Properties.hs
index 291827f..ab4cf45 100644
--- a/lib/Properties.hs
+++ b/lib/Properties.hs
@@ -37,8 +37,9 @@ import LayerData (Collision, layerOverlaps)
import LintConfig (LintConfig (..))
import LintWriter (LintWriter, adjust, askContext,
askFileDepth, complain, dependsOn, forbid,
- lintConfig, offersBadge, offersEntrypoint,
- suggest, warn, zoom, offersCWs, offersJitsi)
+ lintConfig, offersBadge, offersCWs,
+ offersEntrypoint, offersJitsi, suggest,
+ warn, zoom)
import Paths (PathResult (..), RelPath (..),
getExtension, isOldStyle, parsePath)
import Types (Dep (Link, Local, LocalMap, MapLink))
diff --git a/lib/Util.hs b/lib/Util.hs
index 5ec1b12..ef35139 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, PropertyValue (..),
- Tileset (tilesetName), layerName)
+import Data.Tiled (Layer, PropertyValue (..), Tileset (tilesetName),
+ layerName)
-- | helper function to create proxies
mkProxy :: a -> Proxy a
diff --git a/lib/WriteRepo.hs b/lib/WriteRepo.hs
index 2a62591..af4d4d7 100644
--- a/lib/WriteRepo.hs
+++ b/lib/WriteRepo.hs
@@ -18,8 +18,8 @@ import Paths (normalise)
import System.Directory.Extra (copyFile, createDirectoryIfMissing,
doesDirectoryExist)
import System.Exit (ExitCode (..))
-import System.FilePath (takeDirectory)
import qualified System.FilePath as FP
+import System.FilePath (takeDirectory)
import System.FilePath.Posix ((</>))
import Types (Dep (Local))
diff --git a/server/Handlers.hs b/server/Handlers.hs
index e45b210..8990f01 100644
--- a/server/Handlers.hs
+++ b/server/Handlers.hs
@@ -31,8 +31,8 @@ import Network.WebSockets (PendingConnection, acceptRequest,
import Servant (Handler, err404, throwError)
import Server (JobStatus (..), Org (orgUrl),
RemoteRef (reponame), ServerState,
- Sha1, getJobStatus,
- unState, adjustedWebPath)
+ Sha1, adjustedWebPath, getJobStatus,
+ unState)
import Worker (Job (Job))
diff --git a/server/HtmlOrphans.hs b/server/HtmlOrphans.hs
index 594d55f..e3887c6 100644
--- a/server/HtmlOrphans.hs
+++ b/server/HtmlOrphans.hs
@@ -26,10 +26,10 @@ import Handlers (AdminOverview (..))
import Lucid (HtmlT, ToHtml)
import Lucid.Base (ToHtml (toHtml))
import Lucid.Html5 (a_, body_, button_, class_, code_, disabled_,
- div_, em_, h1_, h2_, h3_, h4_, head_,
- href_, html_, id_, li_, link_, main_,
- onclick_, p_, rel_, script_, span_, src_,
- title_, type_, ul_)
+ div_, em_, h1_, h2_, h3_, h4_, head_, href_,
+ html_, id_, li_, link_, main_, onclick_, p_,
+ rel_, script_, span_, src_, title_, type_,
+ ul_)
import Server (JobStatus (..),
Org (Org, orgBacklinkPrefix, orgContactMail, orgHowtoLink, orgSlug),
RemoteRef (RemoteRef, reponame, reporef, repourl),
diff --git a/server/Server.hs b/server/Server.hs
index 84b4ae8..ac03a3b 100644
--- a/server/Server.hs
+++ b/server/Server.hs
@@ -54,11 +54,11 @@ import LintConfig (ConfigKind (..), LintConfig,
import Servant (FromHttpApiData)
import Servant.Client (BaseUrl, parseBaseUrl)
import qualified Text.Show as TS
+import qualified Toml as T
import Toml (BiMap (BiMap), TomlBiMap,
TomlBiMapError (ArbitraryError),
TomlCodec,
prettyTomlDecodeErrors, (.=))
-import qualified Toml as T
import WithCli (HasArguments)
-- | a reference in a remote git repository
diff --git a/tiled/Data/Tiled.hs b/tiled/Data/Tiled.hs
index 4372a97..9256375 100644
--- a/tiled/Data/Tiled.hs
+++ b/tiled/Data/Tiled.hs
@@ -22,11 +22,11 @@ module Data.Tiled where
import Universum
-import Data.Aeson hiding (Object)
-import qualified Data.Aeson as A
-import Data.Aeson.Types (typeMismatch)
-import Data.Aeson.TH (deriveJSON)
import Control.Exception (IOException)
+import Data.Aeson hiding (Object)
+import qualified Data.Aeson as A
+import Data.Aeson.TH (deriveJSON)
+import Data.Aeson.Types (typeMismatch)
import Data.Tiled.TH
diff --git a/tiled/Data/Tiled/Abstract.hs b/tiled/Data/Tiled/Abstract.hs
index 29e9022..2db749c 100644
--- a/tiled/Data/Tiled/Abstract.hs
+++ b/tiled/Data/Tiled/Abstract.hs
@@ -4,9 +4,9 @@ module Data.Tiled.Abstract where
import Universum
-import Data.Tiled (GlobalId (..), Layer (..), Object (..), Property (..),
- PropertyValue (..), Tile (..), Tiledmap (..),
- Tileset (..))
+import Data.Tiled (GlobalId (..), Layer (..), Object (..),
+ Property (..), PropertyValue (..), Tile (..),
+ Tiledmap (..), Tileset (..))
import qualified Data.Vector as V
class HasProperties a where
diff --git a/tiled/Data/Tiled/TH.hs b/tiled/Data/Tiled/TH.hs
index e0ad0e8..c6b346c 100644
--- a/tiled/Data/Tiled/TH.hs
+++ b/tiled/Data/Tiled/TH.hs
@@ -1,9 +1,9 @@
module Data.Tiled.TH where
-import Universum
+import Universum
-import qualified Data.Aeson.TH as TH
-import Data.Char (toLower)
+import qualified Data.Aeson.TH as TH
+import Data.Char (toLower)
aesonOptions :: Int -> TH.Options
aesonOptions l = TH.defaultOptions
--
GitLab