Skip to content

Commit e2ca123

Browse files
committed
Reformat explicit imports to maintain alphabetical order
1 parent 6b1eee6 commit e2ca123

File tree

9 files changed

+31
-28
lines changed

9 files changed

+31
-28
lines changed

src/Stack/Build/ConstructPlan.hs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,8 @@ import Stack.Types.GhcPkgId ( GhcPkgId )
6868
import Stack.Types.GlobalOpts ( GlobalOpts (..) )
6969
import Stack.Types.Installed
7070
( InstallLocation (..), Installed (..), InstalledMap
71-
, installedVersion )
71+
, installedVersion
72+
)
7273
import Stack.Types.IsMutable ( IsMutable (..) )
7374
import Stack.Types.NamedComponent ( exeComponents, renderComponent )
7475
import Stack.Types.Package

src/Stack/Build/Execute.hs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -180,16 +180,16 @@ import Stack.Types.GhcPkgId ( GhcPkgId, ghcPkgIdString, unGhcPkgId )
180180
import Stack.Types.GlobalOpts ( GlobalOpts (..) )
181181
import Stack.Types.Installed
182182
( InstallLocation (..), Installed (..), InstalledMap
183-
, InstalledLibraryInfo (..), installedPackageIdentifier )
183+
, InstalledLibraryInfo (..), installedPackageIdentifier
184+
)
184185
import Stack.Types.IsMutable ( IsMutable (..) )
185186
import Stack.Types.NamedComponent
186187
( NamedComponent, benchComponents, exeComponents, isCBench
187188
, isCTest, renderComponent, testComponents
188189
)
189190
import Stack.Types.Package
190-
( LocalPackage (..), Package (..)
191-
, installedMapGhcPkgId, packageIdentifier
192-
, runMemoizedWith, simpleInstalledLib
191+
( LocalPackage (..), Package (..), installedMapGhcPkgId
192+
, packageIdentifier, runMemoizedWith, simpleInstalledLib
193193
, toCabalMungedPackageName
194194
)
195195
import Stack.Types.PackageFile ( PackageWarning (..) )

src/Stack/Build/Installed.hs

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,11 @@ import Stack.Types.EnvConfig
3030
)
3131
import Stack.Types.GhcPkgId ( GhcPkgId )
3232
import Stack.Types.Installed
33-
( InstallLocation (..), Installed (..), InstalledLibraryInfo (..)
34-
, InstallMap, InstalledMap, InstalledPackageLocation (..)
35-
, PackageDatabase (..), PackageDbVariety (..), toPackageDbVariety )
33+
( InstallLocation (..), InstallMap, Installed (..)
34+
, InstalledLibraryInfo (..), InstalledMap
35+
, InstalledPackageLocation (..), PackageDatabase (..)
36+
, PackageDbVariety (..), toPackageDbVariety
37+
)
3638
import Stack.Types.SourceMap
3739
( DepPackage (..), ProjectPackage (..), SourceMap (..) )
3840

src/Stack/Ghci.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ import Stack.Types.EnvConfig
6868
, shaPathForBytes
6969
)
7070
import Stack.Types.EnvSettings ( defaultEnvSettings )
71-
import Stack.Types.Installed ( InstallMap, InstalledMap)
71+
import Stack.Types.Installed ( InstallMap, InstalledMap )
7272
import Stack.Types.NamedComponent
7373
( NamedComponent (..), isCLib, renderPkgComponent )
7474
import Stack.Types.Package

src/Stack/Package.hs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -93,10 +93,10 @@ import Stack.Types.Dependency
9393
, libraryDepFromVersionRange
9494
)
9595
import Stack.Types.EnvConfig ( HasEnvConfig )
96-
9796
import Stack.Types.Installed
98-
( Installed (..), InstallMap, InstalledMap
99-
, installedToPackageIdOpt )
97+
( InstallMap, Installed (..), InstalledMap
98+
, installedToPackageIdOpt
99+
)
100100
import Stack.Types.NamedComponent
101101
( NamedComponent (..), subLibComponents )
102102
import Stack.Types.Package

src/Stack/SDist.hs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,8 @@ import Stack.Types.Installed
7474
, InstalledLibraryInfo (..), installedVersion
7575
)
7676
import Stack.Types.Package
77-
( LocalPackage (..), Package (..)
78-
, PackageConfig (..), packageIdentifier
77+
( LocalPackage (..), Package (..), PackageConfig (..)
78+
, packageIdentifier
7979
)
8080
import Stack.Types.Platform ( HasPlatform (..) )
8181
import Stack.Types.PvpBounds ( PvpBounds (..), PvpBoundsType (..) )

src/Stack/Types/Build/ConstructPlan.hs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,7 @@ import Stack.Types.EnvConfig
3737
import Stack.Types.GhcPkgId ( GhcPkgId )
3838
import Stack.Types.GHCVariant ( HasGHCVariant (..) )
3939
import Stack.Types.Installed
40-
( InstallLocation, Installed (..)
41-
, installedVersion)
40+
( InstallLocation, Installed (..), installedVersion )
4241
import Stack.Types.Package
4342
( ExeName (..), LocalPackage (..), Package (..)
4443
, PackageSource (..)

src/Stack/Types/Installed.hs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{-# LANGUAGE NoImplicitPrelude #-}
22

3-
-- | This module contains all the types related to the idea of installing a package
4-
-- in the pkg-db or an executable on the file system.
3+
-- | This module contains all the types related to the idea of installing a
4+
-- package in the pkg-db or an executable on the file system.
55
module Stack.Types.Installed
66
( InstallLocation (..)
77
, InstalledPackageLocation (..)
@@ -20,12 +20,12 @@ module Stack.Types.Installed
2020
, installedVersion
2121
) where
2222

23+
import qualified Data.Map as M
2324
import qualified Distribution.SPDX.License as SPDX
24-
import Distribution.License (License)
25+
import Distribution.License ( License )
2526
import Stack.Prelude
26-
import Stack.Types.ComponentUtils (StackUnqualCompName)
27-
import Stack.Types.GhcPkgId (GhcPkgId, ghcPkgIdString)
28-
import qualified Data.Map as M
27+
import Stack.Types.ComponentUtils ( StackUnqualCompName )
28+
import Stack.Types.GhcPkgId ( GhcPkgId, ghcPkgIdString )
2929

3030
-- | Type representing user package databases that packages can be installed
3131
-- into.

src/Stack/Types/Package.hs

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -65,18 +65,19 @@ import Stack.Types.ComponentUtils (toCabalName)
6565
import Stack.Types.Dependency ( DepValue )
6666
import Stack.Types.EnvConfig ( EnvConfig, HasEnvConfig (..) )
6767
import Stack.Types.GhcPkgId ( GhcPkgId )
68+
import Stack.Types.Installed
69+
( InstallLocation (..), InstallMap, Installed (..)
70+
, InstalledLibraryInfo (..), InstalledMap
71+
, InstalledPackageLocation (..), PackageDatabase (..)
72+
, PackageDbVariety(..), simpleInstalledLib
73+
, toPackageDbVariety
74+
)
6875
import Stack.Types.NamedComponent ( NamedComponent )
6976
import Stack.Types.PackageFile
7077
( DotCabalDescriptor (..), DotCabalPath (..)
7178
, StackPackageFile
7279
)
7380
import Stack.Types.SourceMap ( CommonPackage, FromSnapshot )
74-
import Stack.Types.Installed
75-
( Installed(..), InstalledLibraryInfo(..), InstalledMap
76-
, InstallMap, PackageDbVariety(..), PackageDatabase(..)
77-
, InstalledPackageLocation(..), InstallLocation(..)
78-
, toPackageDbVariety, simpleInstalledLib
79-
)
8081

8182
-- | Type representing exceptions thrown by functions exported by the
8283
-- "Stack.Package" module.

0 commit comments

Comments
 (0)