Skip to content

Commit 7b54ab3

Browse files
carbolymercarbolymer
authored
Merge pull request #756 from IntersectMBO/mgalazyn/chore/remove-stylish-haskell
Remove stylish haskell. Use only fourmolu for formatting.
2 parents 5858356 + 2ea79c0 commit 7b54ab3

File tree

154 files changed

+3362
-3094
lines changed

Some content is hidden

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

154 files changed

+3362
-3094
lines changed

‎.git-blame-ignore-revs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,4 @@ e28fadbebc18b87991f84af72d8611393ae8875a
22
b76f949e815990545371530a466b16f691a3aa98
33
73fd9122f78282b1db7f6884b3bc23fb29f3e67f
44
7634a9e8235050a55e5e3022a22a550aa3ade06e
5+
1bb9b9baf0aa9bf610df7fb8fcad193563469eb3

‎.github/workflows/check-formatting.yml‎

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,7 @@ jobs:
4141
4242
for x in $(git ls-tree --full-tree --name-only -r HEAD); do
4343
if [ "${x##*.}" == "hs" ]; then
44-
if grep -qE '^#' "$x"; then
45-
echo "$x contains CPP. Skipping."
46-
else
47-
"$(git rev-parse --show-toplevel)/scripts/devshell/prettify" "$x"
48-
fi
44+
"$(git rev-parse --show-toplevel)/scripts/devshell/prettify" "$x"
4945
fi
5046
done
5147
@@ -58,11 +54,7 @@ jobs:
5854
git fetch origin ${{ github.base_ref }} --unshallow
5955
for x in $(git diff --name-only --diff-filter=ACMR origin/${{ github.base_ref }}..HEAD); do
6056
if [ "${x##*.}" == "hs" ]; then
61-
if grep -qE '^#' "$x"; then
62-
echo "$x contains CPP. Skipping."
63-
else
64-
"$(git rev-parse --show-toplevel)/scripts/devshell/prettify" "$x"
65-
fi
57+
"$(git rev-parse --show-toplevel)/scripts/devshell/prettify" "$x"
6658
fi
6759
done
6860

‎.stylish-haskell.yaml‎

Lines changed: 0 additions & 114 deletions
This file was deleted.

‎cardano-api-gen/src/Test/Gen/Cardano/Api/Empty.hs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
module Test.Gen.Cardano.Api.Empty where
22

3-
import Test.Gen.Cardano.Api ()
3+
import Test.Gen.Cardano.Api ()
44

55
-- | This module is empty, but it is needed to prevent unused-packages warning

‎cardano-api/cardano-api.cabal‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,10 @@ extra-doc-files:
2222

2323
common project-config
2424
default-language: Haskell2010
25-
default-extensions: OverloadedStrings
25+
default-extensions:
26+
ImportQualifiedPost
27+
OverloadedStrings
28+
2629
build-depends: base >=4.14 && <4.21
2730
ghc-options:
2831
-Wall

‎cardano-api/gen/Test/Gen/Cardano/Api.hs‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -9,24 +9,24 @@ module Test.Gen.Cardano.Api
99
)
1010
where
1111

12-
import qualified Cardano.Ledger.Alonzo.Core as Ledger
13-
import qualified Cardano.Ledger.Alonzo.Genesis as Alonzo
14-
import qualified Cardano.Ledger.Alonzo.Scripts as Alonzo
15-
import qualified Cardano.Ledger.BaseTypes as Ledger
16-
import qualified Cardano.Ledger.Coin as Ledger
17-
import qualified Cardano.Ledger.Plutus.CostModels as Plutus
18-
import qualified Cardano.Ledger.Plutus.Language as Alonzo
19-
import Cardano.Ledger.Shelley.TxAuxData (Metadatum (..), ShelleyTxAuxData (..))
20-
21-
import qualified Data.Map.Strict as Map
22-
import Data.Word (Word64)
23-
import GHC.Exts (IsList (..))
24-
25-
import Test.Gen.Cardano.Api.Typed (genCostModel, genRational)
26-
27-
import Hedgehog (Gen, Range)
28-
import qualified Hedgehog.Gen as Gen
29-
import qualified Hedgehog.Internal.Range as Range
12+
import Cardano.Ledger.Alonzo.Core qualified as Ledger
13+
import Cardano.Ledger.Alonzo.Genesis qualified as Alonzo
14+
import Cardano.Ledger.Alonzo.Scripts qualified as Alonzo
15+
import Cardano.Ledger.BaseTypes qualified as Ledger
16+
import Cardano.Ledger.Coin qualified as Ledger
17+
import Cardano.Ledger.Plutus.CostModels qualified as Plutus
18+
import Cardano.Ledger.Plutus.Language qualified as Alonzo
19+
import Cardano.Ledger.Shelley.TxAuxData (Metadatum (..), ShelleyTxAuxData (..))
20+
21+
import Data.Map.Strict qualified as Map
22+
import Data.Word (Word64)
23+
import GHC.Exts (IsList (..))
24+
25+
import Test.Gen.Cardano.Api.Typed (genCostModel, genRational)
26+
27+
import Hedgehog (Gen, Range)
28+
import Hedgehog.Gen qualified as Gen
29+
import Hedgehog.Internal.Range qualified as Range
3030

3131
genMetadata :: Ledger.Era era => Gen (ShelleyTxAuxData era)
3232
genMetadata = do

‎cardano-api/gen/Test/Gen/Cardano/Api/Byron.hs‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,17 @@ module Test.Gen.Cardano.Api.Byron
77
)
88
where
99

10-
import Cardano.Api hiding (txIns)
11-
import Cardano.Api.Byron
10+
import Cardano.Api hiding (txIns)
11+
import Cardano.Api.Byron
1212

13-
import Data.Proxy
13+
import Data.Proxy
1414

15-
import Test.Gen.Cardano.Api.Typed
15+
import Test.Gen.Cardano.Api.Typed
1616

17-
import Hedgehog
18-
import Test.Hedgehog.Roundtrip.CBOR
19-
import Test.Tasty
20-
import Test.Tasty.Hedgehog
17+
import Hedgehog
18+
import Test.Hedgehog.Roundtrip.CBOR
19+
import Test.Tasty
20+
import Test.Tasty.Hedgehog
2121

2222
prop_byron_roundtrip_txbody_CBOR :: Property
2323
prop_byron_roundtrip_txbody_CBOR = property $ do

‎cardano-api/gen/Test/Gen/Cardano/Api/Era.hs‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,18 +10,18 @@ module Test.Gen.Cardano.Api.Era
1010
)
1111
where
1212

13-
import Cardano.Api hiding (txIns)
14-
import Cardano.Api.Shelley
13+
import Cardano.Api hiding (txIns)
14+
import Cardano.Api.Shelley
1515

16-
import qualified Cardano.Ledger.BaseTypes as Ledger
17-
import qualified Cardano.Ledger.Core as Ledger
16+
import Cardano.Ledger.BaseTypes qualified as Ledger
17+
import Cardano.Ledger.Core qualified as Ledger
1818

19-
import qualified Data.Functor.Identity as Ledger
19+
import Data.Functor.Identity qualified as Ledger
2020

21-
import Test.Cardano.Ledger.Conway.Arbitrary ()
22-
import Test.Cardano.Ledger.Core.Arbitrary ()
21+
import Test.Cardano.Ledger.Conway.Arbitrary ()
22+
import Test.Cardano.Ledger.Core.Arbitrary ()
2323

24-
import Test.QuickCheck (Arbitrary (..))
24+
import Test.QuickCheck (Arbitrary (..))
2525

2626
shelleyBasedEraTestConstraints
2727
:: ()

‎cardano-api/gen/Test/Gen/Cardano/Api/Hardcoded.hs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@ module Test.Gen.Cardano.Api.Hardcoded
1010
)
1111
where
1212

13-
import qualified Cardano.Binary as CBOR
13+
import Cardano.Binary qualified as CBOR
1414

15-
import Data.ByteString (ByteString)
16-
import qualified Data.ByteString as BS
17-
import qualified Data.ByteString.Lazy as LBS
15+
import Data.ByteString (ByteString)
16+
import Data.ByteString qualified as BS
17+
import Data.ByteString.Lazy qualified as LBS
1818

1919
exampleDoubleEncodedBytes :: LBS.ByteString
2020
exampleDoubleEncodedBytes = LBS.fromStrict $ CBOR.toStrictByteString exampleDoubleEncodedBytesEncoding

‎cardano-api/gen/Test/Gen/Cardano/Api/Metadata.hs‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -7,24 +7,24 @@ module Test.Gen.Cardano.Api.Metadata
77
)
88
where
99

10-
import Cardano.Api
11-
12-
import Data.Aeson (ToJSON (..))
13-
import qualified Data.Aeson as Aeson
14-
import qualified Data.Aeson.Key as Aeson
15-
import Data.ByteString (ByteString)
16-
import qualified Data.ByteString as BS
17-
import qualified Data.ByteString.Base16 as Base16
18-
import Data.Text (Text)
19-
import qualified Data.Text as Text
20-
import qualified Data.Text.Encoding as Text
21-
import Data.Word (Word64)
22-
import GHC.Exts (IsList (..))
23-
24-
import Hedgehog (Gen)
25-
import qualified Hedgehog.Gen as Gen
26-
import qualified Hedgehog.Internal.Gen as Gen
27-
import qualified Hedgehog.Range as Range
10+
import Cardano.Api
11+
12+
import Data.Aeson (ToJSON (..))
13+
import Data.Aeson qualified as Aeson
14+
import Data.Aeson.Key qualified as Aeson
15+
import Data.ByteString (ByteString)
16+
import Data.ByteString qualified as BS
17+
import Data.ByteString.Base16 qualified as Base16
18+
import Data.Text (Text)
19+
import Data.Text qualified as Text
20+
import Data.Text.Encoding qualified as Text
21+
import Data.Word (Word64)
22+
import GHC.Exts (IsList (..))
23+
24+
import Hedgehog (Gen)
25+
import Hedgehog.Gen qualified as Gen
26+
import Hedgehog.Internal.Gen qualified as Gen
27+
import Hedgehog.Range qualified as Range
2828

2929
-- ----------------------------------------------------------------------------
3030
-- Generators

0 commit comments

Comments
 (0)