diff --git a/src/Swarm/Game/Exception.hs b/src/Swarm/Game/Exception.hs index c1b1db4b42..347b4acbbe 100644 --- a/src/Swarm/Game/Exception.hs +++ b/src/Swarm/Game/Exception.hs @@ -21,13 +21,13 @@ module Swarm.Game.Exception ( ) where import Control.Lens ((^.)) +import Data.Aeson (FromJSON, ToJSON) import Data.Map qualified as M import Data.Set qualified as S -import Data.Aeson (FromJSON, ToJSON) import Data.Text (Text) import Data.Text qualified as T -import Witch (from) import GHC.Generics (Generic) +import Witch (from) import Swarm.Game.Entity (EntityMap, deviceForCap, entityName) import Swarm.Language.Capability (Capability (CGod), capabilityName) diff --git a/src/Swarm/Language/Requirement.hs b/src/Swarm/Language/Requirement.hs index da61eb8194..e8c550e4f3 100644 --- a/src/Swarm/Language/Requirement.hs +++ b/src/Swarm/Language/Requirement.hs @@ -26,8 +26,8 @@ module Swarm.Language.Requirement ( requirements, ) where -import Data.Bifunctor (first) import Data.Aeson (FromJSON, ToJSON) +import Data.Bifunctor (first) import Data.Data (Data) import Data.Hashable (Hashable) import Data.Map (Map) diff --git a/src/Swarm/Util.hs b/src/Swarm/Util.hs index f376f1edcb..327363d507 100644 --- a/src/Swarm/Util.hs +++ b/src/Swarm/Util.hs @@ -67,9 +67,9 @@ import Control.Exception (catch) import Control.Exception.Base (IOException) import Control.Lens (ASetter', LensLike, LensLike', Over, (<>~)) import Control.Monad (forM, unless, when) +import Data.Aeson (FromJSONKey, ToJSONKey) import Data.Bifunctor (first) import Data.Char (isAlphaNum) -import Data.Aeson (FromJSONKey, ToJSONKey) import Data.Either.Validation import Data.Int (Int64) import Data.List (maximumBy, partition) diff --git a/test/unit/Main.hs b/test/unit/Main.hs index 8549752095..56fc8c9a0a 100644 --- a/test/unit/Main.hs +++ b/test/unit/Main.hs @@ -12,9 +12,9 @@ import Data.Aeson (eitherDecode, encode) import Data.Either import Data.Hashable import Data.List (subsequences) +import Data.Maybe import Data.Set (Set) import Data.Set qualified as S -import Data.Maybe import Data.String (fromString) import Data.Text (Text) import Data.Text qualified as T