Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Build with GHC 9.2.8. #4171

Closed
wants to merge 6 commits into from
Closed
Show file tree
Hide file tree
Changes from 1 commit
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
Prev Previous commit
Run stylish-haskell version 0.14.5.0.
  • Loading branch information
jonathanknowles committed Nov 28, 2023
commit 022e1c7efa2d22508a0035239cd3262043c5df0a
Original file line number Diff line number Diff line change
Expand Up @@ -155,8 +155,8 @@ import Data.Text.Class
, toTextFromBoundedEnum
)
import Data.Type.Equality
( (:~:) (..)
, testEquality
( testEquality
, (:~:) (..)
)
import Data.Word
( Word32
Expand Down
4 changes: 2 additions & 2 deletions lib/balance-tx/lib/internal/Internal/Cardano/Write/Tx.hs
Original file line number Diff line number Diff line change
Expand Up @@ -237,8 +237,8 @@ import Data.Maybe
, isJust
)
import Data.Type.Equality
( (:~:) (Refl)
, TestEquality (testEquality)
( TestEquality (testEquality)
, (:~:) (Refl)
)
import Data.Typeable
( Typeable
Expand Down
14 changes: 7 additions & 7 deletions lib/balance-tx/lib/internal/Internal/Cardano/Write/Tx/Balance.hs
Original file line number Diff line number Diff line change
Expand Up @@ -184,8 +184,8 @@ import Data.Semigroup.Cancellative
( Reductive ((</>))
)
import Data.Type.Equality
( (:~:) (..)
, testEquality
( testEquality
, (:~:) (..)
)
import Fmt
( Buildable
Expand Down Expand Up @@ -290,18 +290,18 @@ import qualified Cardano.Wallet.Primitive.Ledger.Convert as Convert
import qualified Cardano.Wallet.Primitive.Types.Address as W
( Address
)
import qualified Cardano.Wallet.Primitive.Types.Coin as W.Coin
import qualified Cardano.Wallet.Primitive.Types.Coin as W
( Coin (..)
)
import qualified Cardano.Wallet.Primitive.Types.TokenBundle as W.TokenBundle
import qualified Cardano.Wallet.Primitive.Types.Coin as W.Coin
import qualified Cardano.Wallet.Primitive.Types.TokenBundle as W
( TokenBundle (..)
)
import qualified Cardano.Wallet.Primitive.Types.TokenMap as W.TokenMap
import qualified Cardano.Wallet.Primitive.Types.TokenBundle as W.TokenBundle
import qualified Cardano.Wallet.Primitive.Types.TokenMap as W
( AssetId (..)
)
import qualified Cardano.Wallet.Primitive.Types.TokenMap as W.TokenMap
import qualified Cardano.Wallet.Primitive.Types.TokenQuantity as W
( TokenQuantity (..)
)
Expand All @@ -313,14 +313,14 @@ import qualified Cardano.Wallet.Primitive.Types.Tx.Constraints as W
import qualified Cardano.Wallet.Primitive.Types.Tx.TxIn as W
( TxIn
)
import qualified Cardano.Wallet.Primitive.Types.Tx.TxOut as W.TxOut
import qualified Cardano.Wallet.Primitive.Types.Tx.TxOut as W
( TxOut (..)
)
import qualified Cardano.Wallet.Primitive.Types.UTxO as W.UTxO
import qualified Cardano.Wallet.Primitive.Types.Tx.TxOut as W.TxOut
import qualified Cardano.Wallet.Primitive.Types.UTxO as W
( UTxO (..)
)
import qualified Cardano.Wallet.Primitive.Types.UTxO as W.UTxO
import qualified Data.Foldable as F
import qualified Data.List as L
import qualified Data.Map as Map
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -128,10 +128,10 @@ import qualified Cardano.Wallet.Primitive.Types.Address as W
import qualified Cardano.Wallet.Primitive.Types.Coin as W
( Coin
)
import qualified Cardano.Wallet.Primitive.Types.TokenBundle as W.TokenBundle
import qualified Cardano.Wallet.Primitive.Types.TokenBundle as W
( TokenBundle (..)
)
import qualified Cardano.Wallet.Primitive.Types.TokenBundle as W.TokenBundle
import qualified Cardano.Wallet.Primitive.Types.TokenMap as W
( AssetId
, TokenMap
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -68,10 +68,10 @@ import Test.QuickCheck
, (==>)
)

import qualified Cardano.Wallet.Primitive.Types.TokenBundle as W.TokenBundle
import qualified Cardano.Wallet.Primitive.Types.TokenBundle as W
( TokenBundle
)
import qualified Cardano.Wallet.Primitive.Types.TokenBundle as W.TokenBundle
import qualified Cardano.Wallet.Primitive.Types.TokenBundle.Gen as W
import qualified Cardano.Wallet.Primitive.Types.Tx.Constraints as W
( TxSize (..)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -145,14 +145,14 @@ import GHC.Generics
( Generic
)

import qualified Cardano.Wallet.Primitive.Types.TokenBundle as W.TokenBundle
import qualified Cardano.Wallet.Primitive.Types.TokenBundle as W
( TokenBundle
)
import qualified Cardano.Wallet.Primitive.Types.TokenMap as W.TokenMap
import qualified Cardano.Wallet.Primitive.Types.TokenBundle as W.TokenBundle
import qualified Cardano.Wallet.Primitive.Types.TokenMap as W
( AssetId
)
import qualified Cardano.Wallet.Primitive.Types.TokenMap as W.TokenMap
import qualified Data.Foldable as F
import qualified Data.List as L
import qualified Data.List.NonEmpty as NE
Expand Down
4 changes: 2 additions & 2 deletions lib/delta-table/src/Database/Persist/Delta.hs
Original file line number Diff line number Diff line change
Expand Up @@ -60,10 +60,10 @@ import Database.Persist.Sql
, toSqlKey
)
import Database.Schema
( (:.) (..)
, Col (..)
( Col (..)
, IsRow
, Primary (..)
, (:.) (..)
)
import Say
( say
Expand Down
4 changes: 2 additions & 2 deletions lib/delta-table/src/Demo/Database.hs
Original file line number Diff line number Diff line change
Expand Up @@ -93,10 +93,10 @@ import Database.Persist.TH
, sqlSettings
)
import Database.Schema
( (:.) (..)
, Col (..)
( Col (..)
, Primary
, Table (..)
, (:.) (..)
)
import GHC.Generics
( Generic
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -71,9 +71,9 @@ import Cardano.Wallet.Primitive.Types.TokenPolicy
( TokenPolicyId (..)
)
import Cardano.Wallet.Read.Eras
( (:*:) (..)
, EraFun (..)
( EraFun (..)
, K (..)
, (:*:) (..)
)
import Cardano.Wallet.Read.Tx.Mint
( Mint (..)
Expand Down
4 changes: 2 additions & 2 deletions lib/primitive/lib/Cardano/Wallet/Primitive/Ledger/Shelley.hs
Original file line number Diff line number Diff line change
Expand Up @@ -304,8 +304,8 @@ import Data.Quantity
, mkPercentage
)
import Data.Type.Equality
( (:~:) (..)
, testEquality
( testEquality
, (:~:) (..)
)
import Data.Word
( Word16
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -83,8 +83,8 @@ import Data.Text
( Text
)
import Data.Type.Equality
( (:~:) (..)
, testEquality
( testEquality
, (:~:) (..)
)
import Fmt
( Buildable (..)
Expand Down
4 changes: 2 additions & 2 deletions lib/read/lib/Cardano/Wallet/Read/Block/Txs.hs
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ import Cardano.Wallet.Read.Block
( Block (..)
)
import Cardano.Wallet.Read.Eras
( (:.:) (..)
, EraFun (..)
( EraFun (..)
, (:.:) (..)
)
import Cardano.Wallet.Read.Tx
( Tx (..)
Expand Down
4 changes: 2 additions & 2 deletions lib/read/lib/Cardano/Wallet/Read/Eras.hs
Original file line number Diff line number Diff line change
Expand Up @@ -74,9 +74,9 @@ import Cardano.Wallet.Read.Eras.KnownEras
, knownEraIndices
)
import Generics.SOP
( (:.:) (..)
, K (..)
( K (..)
, unK
, (:.:) (..)
)
import GHC.Generics
( (:*:) (..)
Expand Down
4 changes: 2 additions & 2 deletions lib/read/lib/Cardano/Wallet/Read/Eras/EraFun.hs
Original file line number Diff line number Diff line change
Expand Up @@ -90,11 +90,11 @@ import Control.Category
( Category (..)
)
import Generics.SOP
( (:.:) (..)
, K (..)
( K (..)
, NP
, unComp
, unK
, (:.:) (..)
)
import Generics.SOP.Classes
import Generics.SOP.NP
Expand Down
4 changes: 2 additions & 2 deletions lib/read/lib/Cardano/Wallet/Read/Eras/EraValue.hs
Original file line number Diff line number Diff line change
Expand Up @@ -76,8 +76,7 @@ import Data.Generics.Internal.VL
, prism
)
import Generics.SOP
( (:.:)
, All
( All
, Compose
, K (..)
, NP (..)
Expand All @@ -87,6 +86,7 @@ import Generics.SOP
, injections
, unComp
, unK
, (:.:)
)
import Generics.SOP.Classes
import Generics.SOP.NP
Expand Down
4 changes: 2 additions & 2 deletions lib/read/lib/Cardano/Wallet/Read/Tx/CBOR.hs
Original file line number Diff line number Diff line change
Expand Up @@ -41,13 +41,13 @@ import Cardano.Ledger.Binary.Decoding
, shelleyProtVer
)
import Cardano.Wallet.Read.Eras
( (:.:) (..)
, EraFun (..)
( EraFun (..)
, EraValue
, K (..)
, applyEraFun
, extractEraValue
, sequenceEraValue
, (:.:) (..)
)
import Cardano.Wallet.Read.Tx
( Tx (..)
Expand Down
4 changes: 2 additions & 2 deletions lib/test-utils/src/Test/QuickCheck/Extra.hs
Original file line number Diff line number Diff line change
Expand Up @@ -116,10 +116,10 @@ import Fmt
)
import Generics.SOP
import GHC.TypeNats
( type (<=)
, KnownNat
( KnownNat
, Nat
, natVal
, type (<=)
)
import Numeric.Natural
( Natural
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -98,9 +98,7 @@ import Network.Wai.Middleware.Logging
, withApiLogger
)
import Servant
( (:<|>) (..)
, (:>)
, Application
( Application
, DeleteNoContent
, Get
, JSON
Expand All @@ -114,6 +112,8 @@ import Servant
, err503
, serve
, throwError
, (:<|>) (..)
, (:>)
)
import Servant.Server
( Handler
Expand Down
4 changes: 2 additions & 2 deletions lib/wallet-e2e/src/Cardano/Wallet/Spec/Effect/Assert.hs
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ import Cardano.Wallet.Spec.Effect.Trace
, trace
)
import Effectful
( (:>)
, Eff
( Eff
, Effect
, (:>)
)
import Effectful.Dispatch.Dynamic
( interpret
Expand Down
4 changes: 2 additions & 2 deletions lib/wallet-e2e/src/Cardano/Wallet/Spec/Effect/Http.hs
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ import Control.Exception
( try
)
import Effectful
( (:>)
, Eff
( Eff
, Effect
, IOE
, (:>)
)
import Effectful.Dispatch.Dynamic
( interpret
Expand Down
4 changes: 2 additions & 2 deletions lib/wallet-e2e/src/Cardano/Wallet/Spec/Effect/Query.hs
Original file line number Diff line number Diff line change
Expand Up @@ -57,9 +57,9 @@ import Cardano.Wallet.Spec.Network.Configured
( ConfiguredNetwork (..)
)
import Effectful
( (:>)
, Eff
( Eff
, Effect
, (:>)
)
import Effectful.Dispatch.Dynamic
( interpret
Expand Down
4 changes: 2 additions & 2 deletions lib/wallet-e2e/src/Cardano/Wallet/Spec/Effect/Random.hs
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@ import Data.Tagged
( Tagged (..)
)
import Effectful
( (:>)
, Eff
( Eff
, Effect
, (:>)
)
import Effectful.Dispatch.Dynamic
( interpret
Expand Down
4 changes: 2 additions & 2 deletions lib/wallet-e2e/src/Cardano/Wallet/Spec/Effect/Timeout.hs
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@ import Data.Time.TimeSpan
, timeoutTS
)
import Effectful
( (:>)
, Eff
( Eff
, Effect
, IOE
, (:>)
)
import Effectful.Dispatch.Dynamic
( interpret
Expand Down
4 changes: 2 additions & 2 deletions lib/wallet-e2e/src/Cardano/Wallet/Spec/Stories/Language.hs
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
module Cardano.Wallet.Spec.Stories.Language (FxStory) where

import Effectful
( (:>)
, Eff
( Eff
, (:>)
)

type FxStory otherEffects knownEffects a =
Expand Down
6 changes: 3 additions & 3 deletions lib/wallet/api/http/Cardano/Wallet/Api.hs
Original file line number Diff line number Diff line change
Expand Up @@ -330,14 +330,14 @@ import GHC.Generics
( Generic
)
import Servant.API
( (:<|>)
, (:>)
, Capture
( Capture
, JSON
, OctetStream
, QueryFlag
, QueryParam
, ReqBody
, (:<|>)
, (:>)
)
import Servant.API.Verbs
( DeleteAccepted
Expand Down
4 changes: 2 additions & 2 deletions lib/wallet/api/http/Cardano/Wallet/Api/Client.hs
Original file line number Diff line number Diff line change
Expand Up @@ -137,9 +137,9 @@ import Data.Text
( Text
)
import Servant
( (:<|>) (..)
( NoContent
, (:<|>) (..)
, (:>)
, NoContent
)
import Servant.Client
( ClientM
Expand Down
4 changes: 2 additions & 2 deletions lib/wallet/api/http/Cardano/Wallet/Api/Http/Server.hs
Original file line number Diff line number Diff line change
Expand Up @@ -265,11 +265,11 @@ import Network.Ntp
( NtpClient
)
import Servant
( (:<|>) (..)
, Handler (..)
( Handler (..)
, NoContent (..)
, Server
, err400
, (:<|>) (..)
)
import Servant.Server
( ServerError (..)
Expand Down
Loading