Skip to content

Commit

Permalink
Consistent approach to spaces in deriving
Browse files Browse the repository at this point in the history
  • Loading branch information
mpilgrem committed Dec 28, 2022
1 parent c4dd64e commit ceea033
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 12 deletions.
2 changes: 1 addition & 1 deletion src/Data/Attoparsec/Args.hs
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import Stack.Prelude
data EscapingMode
= Escaping
| NoEscaping
deriving (Show,Eq,Enum)
deriving (Show, Eq, Enum)

-- | Parse arguments using 'argsParser'.
parseArgs :: EscapingMode -> Text -> Either String [String]
Expand Down
4 changes: 2 additions & 2 deletions src/Stack/Types/Config.hs
Original file line number Diff line number Diff line change
Expand Up @@ -1964,15 +1964,15 @@ instance FromJSON PvpBounds where
newtype DockerEntrypoint = DockerEntrypoint
{ deUser :: Maybe DockerUser
-- ^ UID/GID/etc of host user, if we wish to perform UID/GID switch in container
} deriving (Read,Show)
} deriving (Read, Show)

-- | Docker host user info
data DockerUser = DockerUser
{ duUid :: UserID -- ^ uid
, duGid :: GroupID -- ^ gid
, duGroups :: [GroupID] -- ^ Supplemental groups
, duUmask :: FileMode -- ^ File creation mask }
} deriving (Read,Show)
} deriving (Read, Show)

data GhcOptionKey
= GOKOldEverything
Expand Down
8 changes: 4 additions & 4 deletions src/Stack/Types/Config/Build.hs
Original file line number Diff line number Diff line change
Expand Up @@ -364,7 +364,7 @@ data TestOpts =
,toDisableRun :: !Bool -- ^ Disable running of tests
,toMaximumTimeSeconds :: !(Maybe Int) -- ^ test suite timeout in seconds
,toAllowStdin :: !Bool -- ^ Whether to allow standard input
} deriving (Eq,Show)
} deriving (Eq, Show)

defaultTestOpts :: TestOpts
defaultTestOpts = TestOpts
Expand Down Expand Up @@ -426,7 +426,7 @@ instance Monoid TestOptsMonoid where
-- | Haddock Options
newtype HaddockOpts =
HaddockOpts { hoAdditionalArgs :: [String] -- ^ Arguments passed to haddock program
} deriving (Eq,Show)
} deriving (Eq, Show)

newtype HaddockOptsMonoid =
HaddockOptsMonoid {hoMonoidAdditionalArgs :: [String]
Expand Down Expand Up @@ -456,7 +456,7 @@ data BenchmarkOpts =
BenchmarkOpts
{ beoAdditionalArgs :: !(Maybe String) -- ^ Arguments passed to the benchmark program
, beoDisableRun :: !Bool -- ^ Disable running of benchmarks
} deriving (Eq,Show)
} deriving (Eq, Show)

defaultBenchmarkOpts :: BenchmarkOpts
defaultBenchmarkOpts = BenchmarkOpts
Expand Down Expand Up @@ -493,7 +493,7 @@ data FileWatchOpts
= NoFileWatch
| FileWatch
| FileWatchPoll
deriving (Show,Eq)
deriving (Show, Eq)

newtype CabalVerbosity = CabalVerbosity Verbosity
deriving (Eq, Show)
Expand Down
2 changes: 1 addition & 1 deletion src/Stack/Types/GhcPkgId.hs
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ instance Exception GhcPkgIdParseFail where

-- | A ghc-pkg package identifier.
newtype GhcPkgId = GhcPkgId Text
deriving (Eq,Ord,Data,Typeable,Generic,PersistField,PersistFieldSql)
deriving (Eq, Ord, Data, Typeable, Generic, PersistField, PersistFieldSql)

instance Hashable GhcPkgId
instance NFData GhcPkgId
Expand Down
6 changes: 3 additions & 3 deletions src/Stack/Types/Package.hs
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ instance Exception PackageException where
data PackageLibraries
= NoLibraries
| HasLibraries !(Set Text) -- ^ the foreign library names, sub libraries get built automatically without explicit component name passing
deriving (Show,Typeable)
deriving (Show, Typeable)

-- | Name of an executable.
newtype ExeName = ExeName { unExeName :: Text }
Expand Down Expand Up @@ -178,7 +178,7 @@ data Package =
-- ^ If present: custom-setup dependencies
,packageCabalSpec :: !CabalSpecVersion -- ^ Cabal spec range
}
deriving (Show,Typeable)
deriving (Show, Typeable)

packageIdent :: Package -> PackageIdentifier
packageIdent p = PackageIdentifier (packageName p) (packageVersion p)
Expand Down Expand Up @@ -230,7 +230,7 @@ data PackageConfig =
,packageConfigCompilerVersion :: ActualCompiler -- ^ GHC version
,packageConfigPlatform :: !Platform -- ^ host platform
}
deriving (Show,Typeable)
deriving (Show, Typeable)

-- | Compares the package name.
instance Ord Package where
Expand Down
2 changes: 1 addition & 1 deletion src/Stack/Types/TemplateName.hs
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ instance Exception TypeTemplateNameException where

-- | A template name.
data TemplateName = TemplateName !Text !TemplatePath
deriving (Ord,Eq,Show)
deriving (Ord, Eq, Show)

data TemplatePath = AbsPath (Path Abs File)
-- ^ an absolute path on the filesystem
Expand Down

0 comments on commit ceea033

Please sign in to comment.