Skip to content

Commit

Permalink
Ran stylish-haskell
Browse files Browse the repository at this point in the history
  • Loading branch information
mmhat committed Feb 13, 2025
1 parent a902587 commit 1df9954
Show file tree
Hide file tree
Showing 16 changed files with 33 additions and 60 deletions.
2 changes: 1 addition & 1 deletion dhall/src/Dhall/Eval.hs
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ import Data.Foldable (foldr', toList)
import Data.List.NonEmpty (NonEmpty (..))
import Data.Sequence (Seq, ViewL (..), ViewR (..))
import Data.Text (Text)
import Data.Time (Day, TimeOfDay(..), TimeZone)
import Data.Time (Day, TimeOfDay (..), TimeZone)
import Data.Void (Void)
import Dhall.Map (Map)
import Dhall.Set (Set)
Expand Down
7 changes: 1 addition & 6 deletions dhall/src/Dhall/Import/Headers.hs
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,7 @@ module Dhall.Import.Headers
, toOriginHeaders
) where

import Control.Applicative
( Alternative (..)
#if !MIN_VERSION_base(4,18,0)
, liftA2
#endif
)
import Control.Applicative (Alternative (..), liftA2)

Check warning on line 13 in dhall/src/Dhall/Import/Headers.hs

View workflow job for this annotation

GitHub Actions / macOS-latest - stack.yaml

The import of ‘liftA2’

Check warning on line 13 in dhall/src/Dhall/Import/Headers.hs

View workflow job for this annotation

GitHub Actions / macos-13 - stack.yaml

The import of ‘liftA2’

Check warning on line 13 in dhall/src/Dhall/Import/Headers.hs

View workflow job for this annotation

GitHub Actions / ubuntu-latest - stack.yaml

The import of ‘liftA2’

Check warning on line 13 in dhall/src/Dhall/Import/Headers.hs

View workflow job for this annotation

GitHub Actions / windows-latest - stack.yaml

The import of `liftA2'

Check warning on line 13 in dhall/src/Dhall/Import/Headers.hs

View workflow job for this annotation

GitHub Actions / ubuntu-latest - stack.ghc-9.8.yaml

The import of ‘liftA2’
import Control.Exception (SomeException)
import Control.Monad.Catch (handle, throwM)
import Data.Text (Text)
Expand Down
2 changes: 1 addition & 1 deletion dhall/src/Dhall/Lint.hs
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ module Dhall.Lint

import Control.Applicative ((<|>))

import Dhall.Optics (anyOf)
import Dhall.Optics (anyOf)
import Dhall.Syntax
( Binding (..)
, Chunks (..)
Expand Down
2 changes: 1 addition & 1 deletion dhall/src/Dhall/Main.hs
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ import Dhall.Import
, SemanticCacheMode (..)
, _semanticCacheMode
)
import Dhall.Package (PackagingMode(..), writePackage)
import Dhall.Package (PackagingMode (..), writePackage)
import Dhall.Parser (Src)
import Dhall.Pretty
( Ann
Expand Down
4 changes: 2 additions & 2 deletions dhall/src/Dhall/Map.hs
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,8 @@ import Instances.TH.Lift ()
import Language.Haskell.TH.Syntax (Lift)
import Prelude hiding (filter, lookup)

import qualified Data.Foldable.WithIndex as Foldable.WithIndex
import qualified Data.Functor.WithIndex as Functor.WithIndex
import qualified Data.Foldable.WithIndex as Foldable.WithIndex
import qualified Data.Functor.WithIndex as Functor.WithIndex
import qualified Data.List
import qualified Data.Map.Strict
import qualified Data.Set
Expand Down
17 changes: 6 additions & 11 deletions dhall/src/Dhall/Marshal/Decode.hs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{-# LANGUAGE ApplicativeDo #-}
{-# LANGUAGE ConstraintKinds #-}
{-# LANGUAGE CPP #-}
{-# LANGUAGE ConstraintKinds #-}
{-# LANGUAGE DefaultSignatures #-}
{-# LANGUAGE DeriveFunctor #-}
{-# LANGUAGE DerivingStrategies #-}
Expand Down Expand Up @@ -136,12 +136,7 @@ module Dhall.Marshal.Decode
) where


import Control.Applicative
( empty
#if !MIN_VERSION_base(4,18,0)
, liftA2
#endif
)
import Control.Applicative (empty, liftA2)

Check warning on line 139 in dhall/src/Dhall/Marshal/Decode.hs

View workflow job for this annotation

GitHub Actions / macOS-latest - stack.yaml

The import of ‘liftA2’

Check warning on line 139 in dhall/src/Dhall/Marshal/Decode.hs

View workflow job for this annotation

GitHub Actions / macos-13 - stack.yaml

The import of ‘liftA2’

Check warning on line 139 in dhall/src/Dhall/Marshal/Decode.hs

View workflow job for this annotation

GitHub Actions / ubuntu-latest - stack.yaml

The import of ‘liftA2’

Check warning on line 139 in dhall/src/Dhall/Marshal/Decode.hs

View workflow job for this annotation

GitHub Actions / windows-latest - stack.yaml

The import of `liftA2'

Check warning on line 139 in dhall/src/Dhall/Marshal/Decode.hs

View workflow job for this annotation

GitHub Actions / ubuntu-latest - stack.ghc-9.8.yaml

The import of ‘liftA2’
import Control.Exception (Exception)
import Control.Monad (guard)
import Control.Monad.Trans.State.Strict
Expand Down Expand Up @@ -180,9 +175,9 @@ import qualified Data.ByteString.Short
import qualified Data.Foldable
import qualified Data.Functor.Compose
import qualified Data.Functor.Product
import qualified Data.HashMap.Strict as HashMap
import qualified Data.HashMap.Strict as HashMap
import qualified Data.HashSet
import qualified Data.List as List
import qualified Data.List as List
import qualified Data.List.NonEmpty
import qualified Data.Map
import qualified Data.Maybe
Expand All @@ -192,9 +187,9 @@ import qualified Data.Set
import qualified Data.Text
import qualified Data.Text.Lazy
import qualified Data.Text.Short
import qualified Data.Time as Time
import qualified Data.Time as Time
import qualified Data.Vector
import qualified Dhall.Core as Core
import qualified Dhall.Core as Core
import qualified Dhall.Map
import qualified Dhall.Util

Expand Down
6 changes: 3 additions & 3 deletions dhall/src/Dhall/Marshal/Encode.hs
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ import qualified Data.ByteString
import qualified Data.ByteString.Lazy
import qualified Data.ByteString.Short
import qualified Data.Functor.Product
import qualified Data.HashMap.Strict as HashMap
import qualified Data.HashMap.Strict as HashMap
import qualified Data.HashSet
import qualified Data.Map
import qualified Data.Scientific
Expand All @@ -87,10 +87,10 @@ import qualified Data.Set
import qualified Data.Text
import qualified Data.Text.Lazy
import qualified Data.Text.Short
import qualified Data.Time as Time
import qualified Data.Time as Time
import qualified Data.Vector
import qualified Data.Void
import qualified Dhall.Core as Core
import qualified Dhall.Core as Core
import qualified Dhall.Map

import Dhall.Marshal.Internal
Expand Down
2 changes: 1 addition & 1 deletion dhall/src/Dhall/Optics.hs
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ module Dhall.Optics

import Control.Applicative (Const (..), WrappedMonad (..))
import Data.Coerce (coerce)
import Data.Monoid (Any (..))
import Data.Functor.Contravariant (Contravariant (contramap))
import Data.Monoid (Any (..))
import Data.Profunctor (Profunctor (dimap))
import Lens.Micro (ASetter, LensLike, Traversal)
import Lens.Micro.Internal (foldMapOf, (#.))
Expand Down
7 changes: 1 addition & 6 deletions dhall/src/Dhall/Parser/Combinators.hs
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,7 @@ module Dhall.Parser.Combinators
) where


import Control.Applicative
( Alternative (..)
#if !MIN_VERSION_base(4,18,0)
, liftA2
#endif
)
import Control.Applicative (Alternative (..), liftA2)

Check warning on line 26 in dhall/src/Dhall/Parser/Combinators.hs

View workflow job for this annotation

GitHub Actions / macOS-latest - stack.yaml

The import of ‘liftA2’

Check warning on line 26 in dhall/src/Dhall/Parser/Combinators.hs

View workflow job for this annotation

GitHub Actions / macos-13 - stack.yaml

The import of ‘liftA2’

Check warning on line 26 in dhall/src/Dhall/Parser/Combinators.hs

View workflow job for this annotation

GitHub Actions / ubuntu-latest - stack.yaml

The import of ‘liftA2’

Check warning on line 26 in dhall/src/Dhall/Parser/Combinators.hs

View workflow job for this annotation

GitHub Actions / windows-latest - stack.yaml

The import of `liftA2'

Check warning on line 26 in dhall/src/Dhall/Parser/Combinators.hs

View workflow job for this annotation

GitHub Actions / ubuntu-latest - stack.ghc-9.8.yaml

The import of ‘liftA2’
import Control.Exception (Exception)
import Control.Monad (MonadPlus (..))
import Data.String (IsString (..))
Expand Down
8 changes: 1 addition & 7 deletions dhall/src/Dhall/Parser/Expression.hs
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,7 @@
-- | Parsing Dhall expressions.
module Dhall.Parser.Expression where

import Control.Applicative
( Alternative (..)
#if !MIN_VERSION_base(4,18,0)
, liftA2
#endif
, optional
)
import Control.Applicative (Alternative (..), liftA2, optional)

Check warning on line 11 in dhall/src/Dhall/Parser/Expression.hs

View workflow job for this annotation

GitHub Actions / macOS-latest - stack.yaml

The import of ‘liftA2’

Check warning on line 11 in dhall/src/Dhall/Parser/Expression.hs

View workflow job for this annotation

GitHub Actions / macos-13 - stack.yaml

The import of ‘liftA2’

Check warning on line 11 in dhall/src/Dhall/Parser/Expression.hs

View workflow job for this annotation

GitHub Actions / ubuntu-latest - stack.yaml

The import of ‘liftA2’

Check warning on line 11 in dhall/src/Dhall/Parser/Expression.hs

View workflow job for this annotation

GitHub Actions / windows-latest - stack.yaml

The import of `liftA2'

Check warning on line 11 in dhall/src/Dhall/Parser/Expression.hs

View workflow job for this annotation

GitHub Actions / ubuntu-latest - stack.ghc-9.8.yaml

The import of ‘liftA2’
import Data.Foldable (foldl')
import Data.List.NonEmpty (NonEmpty (..))
import Data.Text (Text)
Expand Down
2 changes: 1 addition & 1 deletion dhall/src/Dhall/Syntax/Expr.hs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{-# LANGUAGE DeriveGeneric #-}
{-# LANGUAGE DeriveGeneric #-}
{-# LANGUAGE StandaloneKindSignatures #-}

module Dhall.Syntax.Expr
Expand Down
2 changes: 1 addition & 1 deletion dhall/src/Dhall/Syntax/Instances/Lift.hs
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import Language.Haskell.TH.Syntax (Lift)
#if !MIN_VERSION_template_haskell(2,21,0)
import qualified Data.Fixed as Fixed
#endif
import qualified Data.Time as Time
import qualified Data.Time as Time

deriving instance Lift Time.Day
deriving instance Lift Time.TimeOfDay
Expand Down
2 changes: 1 addition & 1 deletion dhall/src/Dhall/TypeCheck.hs
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ import Dhall.Eval
, (~>)
)
import Dhall.Optics (anyOf)
import Dhall.Pretty (Ann, UnescapedLabel(..))
import Dhall.Pretty (Ann, UnescapedLabel (..))
import Dhall.Src (Src)
import Lens.Micro (over)
import Prettyprinter (Doc, Pretty (..), vsep)
Expand Down
14 changes: 7 additions & 7 deletions dhall/tests/Dhall/Test/DirectoryTree.hs
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
{-# LANGUAGE CPP #-}
{-# LANGUAGE OverloadedLists #-}
{-# LANGUAGE CPP #-}
{-# LANGUAGE OverloadedLists #-}
{-# LANGUAGE OverloadedStrings #-}

module Dhall.Test.DirectoryTree (tests) where

import Control.Monad
import Data.Either (partitionEithers)
import Data.Either (partitionEithers)
import Data.Either.Validation
import Dhall.DirectoryTree
import Lens.Micro (set)
import System.FilePath ((</>))
import Lens.Micro (set)
import System.FilePath ((</>))
import Test.Tasty
import Test.Tasty.HUnit

import qualified Data.Text.IO
import qualified Dhall
import qualified Dhall.Core
import qualified System.Directory as Directory
import qualified System.FilePath as FilePath
import qualified System.Directory as Directory
import qualified System.FilePath as FilePath
import qualified System.PosixCompat.Files as Files

tests :: TestTree
Expand Down
2 changes: 1 addition & 1 deletion dhall/tests/Dhall/Test/Regression.hs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ module Dhall.Test.Regression where

import Data.Either.Validation (Validation (..))
import Data.Void (Void)
import Dhall.Core (Expr(..), ReifiedNormalizer(..))
import Dhall.Core (Expr (..), ReifiedNormalizer (..))
import Dhall.Import (Imported, MissingImports (..))
import Dhall.Parser (SourcedException (..), Src)
import Dhall.TypeCheck (TypeError)
Expand Down
14 changes: 4 additions & 10 deletions dhall/tests/Dhall/Test/Util.hs
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,7 @@ module Dhall.Test.Util
, managedTestEnvironment
) where

import Control.Applicative
( Alternative
, (<|>)
#if !MIN_VERSION_base(4,18,0)
, liftA2
#endif
)
import Control.Applicative (Alternative, liftA2, (<|>))

Check warning on line 31 in dhall/tests/Dhall/Test/Util.hs

View workflow job for this annotation

GitHub Actions / macOS-latest - stack.yaml

The import of ‘liftA2’

Check warning on line 31 in dhall/tests/Dhall/Test/Util.hs

View workflow job for this annotation

GitHub Actions / macos-13 - stack.yaml

The import of ‘liftA2’

Check warning on line 31 in dhall/tests/Dhall/Test/Util.hs

View workflow job for this annotation

GitHub Actions / ubuntu-latest - stack.yaml

The import of ‘liftA2’

Check warning on line 31 in dhall/tests/Dhall/Test/Util.hs

View workflow job for this annotation

GitHub Actions / windows-latest - stack.yaml

The import of `liftA2'

Check warning on line 31 in dhall/tests/Dhall/Test/Util.hs

View workflow job for this annotation

GitHub Actions / ubuntu-latest - stack.ghc-9.8.yaml

The import of ‘liftA2’
import Control.Exception (tryJust)
import Control.Monad (guard)
import Control.Monad.Trans.State.Strict (StateT)
Expand Down Expand Up @@ -77,9 +71,9 @@ import qualified Turtle
#if defined(WITH_HTTP) && defined(NETWORK_TESTS)
import qualified Data.Foldable
#else
import Control.Monad.IO.Class (MonadIO (..))
import Dhall.Core (Directory (..), File (..), URL (..))
import Lens.Micro.Mtl (zoom)
import Control.Monad.IO.Class (MonadIO (..))
import Dhall.Core (Directory (..), File (..), URL (..))
import Lens.Micro.Mtl (zoom)

import qualified Data.Foldable
import qualified Data.Text.Encoding
Expand Down

0 comments on commit 1df9954

Please sign in to comment.