Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/GHC/Utils/GhcPkg/Main/Compat.hs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{-# LANGUAGE NoImplicitPrelude #-}
{-# LANGUAGE OverloadedRecordDot #-}
{-# LANGUAGE OverloadedStrings #-}
{-# LANGUAGE NoImplicitPrelude #-}
{-# LANGUAGE OverloadedRecordDot #-}
{-# LANGUAGE OverloadedStrings #-}

{-|
Module : GHC.Utils.GhcPkg.Main.Compat
Expand Down
6 changes: 3 additions & 3 deletions src/Stack/Component.hs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{-# LANGUAGE NoImplicitPrelude #-}
{-# LANGUAGE OverloadedRecordDot #-}
{-# LANGUAGE OverloadedStrings #-}
{-# LANGUAGE NoImplicitPrelude #-}
{-# LANGUAGE OverloadedRecordDot #-}
{-# LANGUAGE OverloadedStrings #-}

{-|
Module : Stack.Component
Expand Down
4 changes: 2 additions & 2 deletions src/Stack/List.hs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{-# LANGUAGE NoImplicitPrelude #-}
{-# LANGUAGE OverloadedStrings #-}
{-# LANGUAGE NoImplicitPrelude #-}
{-# LANGUAGE OverloadedStrings #-}

{-|
Module : Stack.List
Expand Down
4 changes: 2 additions & 2 deletions src/Stack/Options/IdeParser.hs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{-# LANGUAGE NoImplicitPrelude #-}
{-# LANGUAGE OverloadedStrings #-}
{-# LANGUAGE NoImplicitPrelude #-}
{-# LANGUAGE OverloadedStrings #-}

{-|
Module : Stack.Options.IdeParser
Expand Down
6 changes: 3 additions & 3 deletions src/Stack/Options/LsParser.hs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{-# LANGUAGE NoImplicitPrelude #-}
{-# LANGUAGE ApplicativeDo #-}
{-# LANGUAGE OverloadedStrings #-}
{-# LANGUAGE NoImplicitPrelude #-}
{-# LANGUAGE ApplicativeDo #-}
{-# LANGUAGE OverloadedStrings #-}

{-|
Module : Stack.Options.LsParser
Expand Down
4 changes: 2 additions & 2 deletions src/Stack/Storage/Util.hs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{-# LANGUAGE NoImplicitPrelude #-}
{-# LANGUAGE TypeFamilies #-}
{-# LANGUAGE NoImplicitPrelude #-}
{-# LANGUAGE TypeFamilies #-}

{-|
Module : Stack.Storage.Util
Expand Down
4 changes: 2 additions & 2 deletions src/Stack/Types/Build/ConstructPlan.hs
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@ import Stack.Types.Curator ( Curator )
import Stack.Types.DumpPackage ( DumpPackage )
import Stack.Types.EnvConfig
( EnvConfig (..), HasEnvConfig (..), HasSourceMap (..) )
import Stack.Types.GhcPkgId ( GhcPkgId )
import Stack.Types.GHCVariant ( HasGHCVariant (..) )
import Stack.Types.GhcPkgId ( GhcPkgId )
import Stack.Types.Installed
( InstallLocation, Installed (..), installedVersion )
import Stack.Types.IsMutable ( IsMutable )
Expand All @@ -56,7 +56,7 @@ import Stack.Types.Package
)
import Stack.Types.ParentMap ( ParentMap )
import Stack.Types.Plan
( ComponentKey, Task (..), TaskType (..), taskProvides )
( ComponentKey, Task (..), TaskType (..), taskProvides )
import Stack.Types.Platform ( HasPlatform (..) )
import Stack.Types.Runner ( HasRunner (..) )

Expand Down
8 changes: 4 additions & 4 deletions src/Stack/Types/BuildOptsCLI.hs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{-# LANGUAGE NoImplicitPrelude #-}
{-# LANGUAGE NoFieldSelectors #-}
{-# LANGUAGE OverloadedRecordDot #-}
{-# LANGUAGE OverloadedStrings #-}
{-# LANGUAGE NoImplicitPrelude #-}
{-# LANGUAGE NoFieldSelectors #-}
{-# LANGUAGE OverloadedRecordDot #-}
{-# LANGUAGE OverloadedStrings #-}

{-|
Module : Stack.Types.BuildOptsCLI
Expand Down
6 changes: 3 additions & 3 deletions src/Stack/Types/Casa.hs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{-# LANGUAGE NoImplicitPrelude #-}
{-# LANGUAGE NoFieldSelectors #-}
{-# LANGUAGE OverloadedStrings #-}
{-# LANGUAGE NoImplicitPrelude #-}
{-# LANGUAGE NoFieldSelectors #-}
{-# LANGUAGE OverloadedStrings #-}

{-|
Module : Stack.Types.Casa
Expand Down
6 changes: 3 additions & 3 deletions src/Stack/Types/Compiler.hs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{-# LANGUAGE NoImplicitPrelude #-}
{-# LANGUAGE OverloadedStrings #-}
{-# LANGUAGE TypeFamilies #-}
{-# LANGUAGE NoImplicitPrelude #-}
{-# LANGUAGE OverloadedStrings #-}
{-# LANGUAGE TypeFamilies #-}

{-|
Module : Stack.Types.Compiler
Expand Down
8 changes: 4 additions & 4 deletions src/Stack/Types/Component.hs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{-# LANGUAGE NoImplicitPrelude #-}
{-# LANGUAGE DuplicateRecordFields #-}
{-# LANGUAGE NoFieldSelectors #-}
{-# LANGUAGE OverloadedRecordDot #-}
{-# LANGUAGE NoImplicitPrelude #-}
{-# LANGUAGE DuplicateRecordFields #-}
{-# LANGUAGE NoFieldSelectors #-}
{-# LANGUAGE OverloadedRecordDot #-}

{-|
Module : Stack.Types.Component
Expand Down
4 changes: 2 additions & 2 deletions src/Stack/Types/ComponentUtils.hs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{-# LANGUAGE NoImplicitPrelude #-}
{-# LANGUAGE DuplicateRecordFields #-}
{-# LANGUAGE NoImplicitPrelude #-}
{-# LANGUAGE DuplicateRecordFields #-}

{-|
Module : Stack.Types.ComponentUtils
Expand Down
6 changes: 3 additions & 3 deletions src/Stack/Types/Config/Exception.hs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{-# LANGUAGE NoImplicitPrelude #-}
{-# LANGUAGE OverloadedStrings #-}
{-# LANGUAGE TypeFamilies #-}
{-# LANGUAGE NoImplicitPrelude #-}
{-# LANGUAGE OverloadedStrings #-}
{-# LANGUAGE TypeFamilies #-}

{-|
Module : Stack.Types.Config.Exception
Expand Down
4 changes: 2 additions & 2 deletions src/Stack/Types/ConfigSetOpts.hs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{-# LANGUAGE NoImplicitPrelude #-}
{-# LANGUAGE NoFieldSelectors #-}
{-# LANGUAGE NoImplicitPrelude #-}
{-# LANGUAGE NoFieldSelectors #-}

{-|
Module : Stack.Types.ConfigSetOpts
Expand Down
4 changes: 2 additions & 2 deletions src/Stack/Types/ConfigureOpts.hs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{-# LANGUAGE NoImplicitPrelude #-}
{-# LANGUAGE NoFieldSelectors #-}
{-# LANGUAGE NoImplicitPrelude #-}
{-# LANGUAGE NoFieldSelectors #-}

{-|
Module : Stack.Types.ConfigureOpts
Expand Down
4 changes: 2 additions & 2 deletions src/Stack/Types/GhciOpts.hs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{-# LANGUAGE NoImplicitPrelude #-}
{-# LANGUAGE NoFieldSelectors #-}
{-# LANGUAGE NoImplicitPrelude #-}
{-# LANGUAGE NoFieldSelectors #-}

{-|
Module : Stack.Types.GhciOpts
Expand Down
4 changes: 2 additions & 2 deletions src/Stack/Types/HpcReportOpts.hs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{-# LANGUAGE NoImplicitPrelude #-}
{-# LANGUAGE NoFieldSelectors #-}
{-# LANGUAGE NoImplicitPrelude #-}
{-# LANGUAGE NoFieldSelectors #-}

{-|
Module : Stack.Types.HpcReportOpts
Expand Down
4 changes: 2 additions & 2 deletions src/Stack/Types/LsOpts.hs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{-# LANGUAGE NoImplicitPrelude #-}
{-# LANGUAGE NoFieldSelectors #-}
{-# LANGUAGE NoImplicitPrelude #-}
{-# LANGUAGE NoFieldSelectors #-}

{-|
Module : Stack.Types.LsOpts
Expand Down
4 changes: 2 additions & 2 deletions src/Stack/Types/SDistOpts.hs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{-# LANGUAGE NoImplicitPrelude #-}
{-# LANGUAGE NoFieldSelectors #-}
{-# LANGUAGE NoImplicitPrelude #-}
{-# LANGUAGE NoFieldSelectors #-}

{-|
Module : Stack.Types.SDistOpts
Expand Down
4 changes: 2 additions & 2 deletions src/Stack/Types/SetupOpts.hs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{-# LANGUAGE NoImplicitPrelude #-}
{-# LANGUAGE NoFieldSelectors #-}
{-# LANGUAGE NoImplicitPrelude #-}
{-# LANGUAGE NoFieldSelectors #-}

{-|
Module : Stack.Types.SetupOpts
Expand Down
4 changes: 2 additions & 2 deletions src/windows/System/Terminal.hs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{-# LANGUAGE NoImplicitPrelude #-}
{-# LANGUAGE OverloadedStrings #-}
{-# LANGUAGE NoImplicitPrelude #-}
{-# LANGUAGE OverloadedStrings #-}

{-|
Module : System.Terminal
Expand Down
4 changes: 2 additions & 2 deletions tests/integration/IntegrationSpec.hs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{-# LANGUAGE NoImplicitPrelude #-}
{-# LANGUAGE OverloadedStrings #-}
{-# LANGUAGE NoImplicitPrelude #-}
{-# LANGUAGE OverloadedStrings #-}

import Conduit
( (.|), connect, filterC, filterMC, foldMapC, mapM_C
Expand Down
8 changes: 4 additions & 4 deletions tests/unit/Stack/Build/ConstructPlanSpec.hs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{-# LANGUAGE NoImplicitPrelude #-}
{-# LANGUAGE OverloadedStrings #-}
{-# LANGUAGE NoImplicitPrelude #-}
{-# LANGUAGE OverloadedRecordDot #-}
{-# LANGUAGE OverloadedStrings #-}

module Stack.Build.ConstructPlanSpec
( main
Expand All @@ -9,9 +9,11 @@ module Stack.Build.ConstructPlanSpec

import qualified Data.Map.Strict as Map
import qualified Data.Set as Set
import Database.Persist ( PersistField (..), PersistValue (..) )
import Distribution.CabalSpecVersion ( CabalSpecVersion (..) )
import Distribution.Compiler ( PerCompilerFlavor (..) )
import Distribution.License ( License (BSD3) )
import Distribution.ModuleName ( ModuleName )
import qualified Distribution.ModuleName as Cabal
import Distribution.PackageDescription
( BenchmarkInterface (..), BenchmarkType (..)
Expand All @@ -27,7 +29,6 @@ import Distribution.Types.ModuleRenaming
import Distribution.Types.PackageName ( mkPackageName )
import Distribution.Types.Version ( mkVersion )
import Distribution.Types.VersionRange ( anyVersion )
import Distribution.ModuleName ( ModuleName )
import Stack.Build.Backpack ( addInstantiationTasks )
import Stack.Build.ConstructPlan ( shouldSplitComponents )
import Stack.Build.ExecutePackage
Expand All @@ -38,7 +39,6 @@ import Stack.Package
)
import Stack.Prelude
import Stack.Types.Build.ConstructPlan ( AddDepRes (..) )
import Database.Persist ( PersistField (..), PersistValue (..) )
import Stack.Types.Cache ( CachePkgSrc (..), ConfigCacheType (..) )
import Stack.Types.CompCollection
( foldAndMakeCollection, getBuildableSet )
Expand Down
3 changes: 1 addition & 2 deletions tests/unit/Stack/Build/ExecuteSpec.hs
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,11 @@ module Stack.Build.ExecuteSpec
, spec
) where

import Control.Concurrent.Execute ( ActionId (..), ActionType (..) )
import qualified Data.Map.Strict as Map
import qualified Data.Set as Set
import Distribution.Types.PackageName ( mkPackageName )
import Distribution.Types.Version ( mkVersion )
import Control.Concurrent.Execute
( ActionId (..), ActionType (..) )
import Stack.Build.Execute
( finalTestsAndBenches, intraPackageDeps, missingToDeps )
import Stack.Build.ExecutePackage
Expand Down
2 changes: 1 addition & 1 deletion tests/unit/Stack/Ghci/ScriptSpec.hs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{-# LANGUAGE NoImplicitPrelude #-}
{-# LANGUAGE OverloadedStrings #-}
{-# LANGUAGE OverloadedLists #-}
{-# LANGUAGE OverloadedStrings #-}
{-# LANGUAGE TemplateHaskell #-}

-- | Test suite for the GhciScript DSL
Expand Down
8 changes: 4 additions & 4 deletions tests/unit/Stack/Types/TemplateNameSpec.hs
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ module Stack.Types.TemplateNameSpec
( spec
) where

import Stack.Types.TemplateName
import Path.Internal
import System.Info (os)
import Test.Hspec
import Path.Internal
import Stack.Types.TemplateName
import System.Info ( os )
import Test.Hspec

spec :: Spec
spec =
Expand Down
Loading