Skip to content

Commit 0f4e712

Browse files
authored
Merge pull request #5040 from IntersectMBO/lehins/update-to-fourmolu-0.17
Update to `fourmolu-0.17.0.0`
2 parents 2d1e94c + 4b79a7a commit 0f4e712

File tree

601 files changed

+1549
-1607
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

601 files changed

+1549
-1607
lines changed

.github/workflows/haskell.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -378,7 +378,7 @@ jobs:
378378

379379
- name: Install fourmolu
380380
run: |
381-
FOURMOLU_VERSION="0.16.2.0"
381+
FOURMOLU_VERSION="0.17.0.0"
382382
mkdir -p "$HOME/.local/bin"
383383
curl -sL "https://github.com/fourmolu/fourmolu/releases/download/v${FOURMOLU_VERSION}/fourmolu-${FOURMOLU_VERSION}-linux-x86_64" -o "$HOME/.local/bin/fourmolu"
384384
chmod a+x "$HOME/.local/bin/fourmolu"

eras/allegra/impl/src/Cardano/Ledger/Allegra.hs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,7 @@
88
module Cardano.Ledger.Allegra (
99
Allegra,
1010
AllegraEra,
11-
)
12-
where
11+
) where
1312

1413
import Cardano.Ledger.Allegra.Era (AllegraEra)
1514
import Cardano.Ledger.Allegra.PParams ()

eras/allegra/impl/src/Cardano/Ledger/Allegra/Core.hs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@ module Cardano.Ledger.Allegra.Core (
33
ValidityInterval (..),
44
AllegraEraTxAuxData (..),
55
module Cardano.Ledger.Shelley.Core,
6-
)
7-
where
6+
) where
87

98
import Cardano.Ledger.Allegra.Scripts (ValidityInterval (..))
109
import Cardano.Ledger.Allegra.Tx ()

eras/allegra/impl/src/Cardano/Ledger/Allegra/Rules.hs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,7 @@
55
module Cardano.Ledger.Allegra.Rules (
66
module Cardano.Ledger.Allegra.Rules.Utxo,
77
module Cardano.Ledger.Allegra.Rules.Utxow,
8-
)
9-
where
8+
) where
109

1110
import Cardano.Ledger.Allegra.Core (EraRuleEvent)
1211
import Cardano.Ledger.Allegra.Era (AllegraEra)

eras/allegra/impl/src/Cardano/Ledger/Allegra/Rules/Utxo.hs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,7 @@ module Cardano.Ledger.Allegra.Rules.Utxo (
2020
AllegraUtxoPredFailure (..),
2121
validateOutsideValidityIntervalUTxO,
2222
shelleyToAllegraUtxoPredFailure,
23-
)
24-
where
23+
) where
2524

2625
import Cardano.Ledger.Address (Addr, RewardAccount)
2726
import Cardano.Ledger.Allegra.Core

eras/allegra/impl/src/Cardano/Ledger/Allegra/Scripts.hs

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,7 @@ module Cardano.Ledger.Allegra.Scripts (
4646
decodeVI,
4747
-- translate,
4848
translateTimelock,
49-
)
50-
where
49+
) where
5150

5251
import Cardano.Ledger.Allegra.Era (AllegraEra)
5352
import Cardano.Ledger.BaseTypes (StrictMaybe (SJust, SNothing))
@@ -209,7 +208,9 @@ newtype Timelock era = MkTimelock (MemoBytes (TimelockRaw era))
209208

210209
pattern TimelockConstr :: MemoBytes (TimelockRaw era) -> Timelock era
211210
pattern TimelockConstr timelockRaw = MkTimelock timelockRaw
211+
212212
{-# COMPLETE TimelockConstr #-}
213+
213214
{-# DEPRECATED TimelockConstr "In favor of more consistently name `MkTimelock`" #-}
214215

215216
instance Era era => MemPack (Timelock era) where
@@ -218,6 +219,7 @@ instance Era era => MemPack (Timelock era) where
218219
unpackM = MkTimelock <$> unpackMemoBytesM (eraProtVerLow @era)
219220

220221
instance Era era => NoThunks (Timelock era)
222+
221223
instance Era era => EncCBOR (Timelock era)
222224

223225
instance Era era => DecCBOR (Timelock era) where
@@ -292,36 +294,42 @@ pattern RequireTimeStart mslot <- (getTimeStart -> Just mslot)
292294

293295
mkRequireSignatureTimelock :: forall era. Era era => KeyHash 'Witness -> Timelock era
294296
mkRequireSignatureTimelock = mkMemoizedEra @era . TimelockSignature
297+
295298
getRequireSignatureTimelock :: Timelock era -> Maybe (KeyHash 'Witness)
296299
getRequireSignatureTimelock (MkTimelock (Memo (TimelockSignature kh) _)) = Just kh
297300
getRequireSignatureTimelock _ = Nothing
298301

299302
mkRequireAllOfTimelock :: forall era. Era era => StrictSeq (Timelock era) -> Timelock era
300303
mkRequireAllOfTimelock = mkMemoizedEra @era . TimelockAllOf
304+
301305
getRequireAllOfTimelock :: Timelock era -> Maybe (StrictSeq (Timelock era))
302306
getRequireAllOfTimelock (MkTimelock (Memo (TimelockAllOf ms) _)) = Just ms
303307
getRequireAllOfTimelock _ = Nothing
304308

305309
mkRequireAnyOfTimelock :: forall era. Era era => StrictSeq (Timelock era) -> Timelock era
306310
mkRequireAnyOfTimelock = mkMemoizedEra @era . TimelockAnyOf
311+
307312
getRequireAnyOfTimelock :: Timelock era -> Maybe (StrictSeq (Timelock era))
308313
getRequireAnyOfTimelock (MkTimelock (Memo (TimelockAnyOf ms) _)) = Just ms
309314
getRequireAnyOfTimelock _ = Nothing
310315

311316
mkRequireMOfTimelock :: forall era. Era era => Int -> StrictSeq (Timelock era) -> Timelock era
312317
mkRequireMOfTimelock n = mkMemoizedEra @era . TimelockMOf n
318+
313319
getRequireMOfTimelock :: Timelock era -> Maybe (Int, StrictSeq (Timelock era))
314320
getRequireMOfTimelock (MkTimelock (Memo (TimelockMOf n ms) _)) = Just (n, ms)
315321
getRequireMOfTimelock _ = Nothing
316322

317323
mkTimeStartTimelock :: forall era. Era era => SlotNo -> Timelock era
318324
mkTimeStartTimelock = mkMemoizedEra @era . TimelockTimeStart
325+
319326
getTimeStartTimelock :: Timelock era -> Maybe SlotNo
320327
getTimeStartTimelock (MkTimelock (Memo (TimelockTimeStart mslot) _)) = Just mslot
321328
getTimeStartTimelock _ = Nothing
322329

323330
mkTimeExpireTimelock :: forall era. Era era => SlotNo -> Timelock era
324331
mkTimeExpireTimelock = mkMemoizedEra @era . TimelockTimeExpire
332+
325333
getTimeExpireTimelock :: Timelock era -> Maybe SlotNo
326334
getTimeExpireTimelock (MkTimelock (Memo (TimelockTimeExpire mslot) _)) = Just mslot
327335
getTimeExpireTimelock _ = Nothing

eras/allegra/impl/src/Cardano/Ledger/Allegra/State.hs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ module Cardano.Ledger.Allegra.State (
22
module Cardano.Ledger.Shelley.State,
33
) where
44

5-
import Cardano.Ledger.Shelley.State
6-
75
import Cardano.Ledger.Allegra.State.CertState ()
86
import Cardano.Ledger.Allegra.State.Stake ()
7+
import Cardano.Ledger.Shelley.State

eras/allegra/impl/src/Cardano/Ledger/Allegra/Tx.hs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,7 @@
88

99
module Cardano.Ledger.Allegra.Tx (
1010
validateTimelock,
11-
)
12-
where
11+
) where
1312

1413
import Cardano.Ledger.Allegra.Era (AllegraEra)
1514
import Cardano.Ledger.Allegra.PParams ()

eras/allegra/impl/src/Cardano/Ledger/Allegra/TxAuxData.hs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,7 @@ module Cardano.Ledger.Allegra.TxAuxData (
2424
metadataAllegraTxAuxDataL,
2525
AllegraEraTxAuxData (..),
2626
timelockScriptsAllegraTxAuxDataL,
27-
)
28-
where
27+
) where
2928

3029
import Cardano.Ledger.Allegra.Era (AllegraEra)
3130
import Cardano.Ledger.Allegra.Scripts (Timelock)

eras/allegra/impl/src/Cardano/Ledger/Allegra/TxBody.hs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,7 @@ module Cardano.Ledger.Allegra.TxBody (
3636
AllegraTxBodyRaw (..),
3737
StrictMaybe (..),
3838
ValidityInterval (..),
39-
)
40-
where
39+
) where
4140

4241
import Cardano.Ledger.Allegra.Era (AllegraEra)
4342
import Cardano.Ledger.Allegra.Scripts (ValidityInterval (..))

0 commit comments

Comments
 (0)