Skip to content

Commit c84f6ed

Browse files
cootcoot
committed
stylish-haskell changes
1 parent 3045703 commit c84f6ed

File tree

6 files changed

+52
-56
lines changed

6 files changed

+52
-56
lines changed

‎scripts/check-stylish.sh

+1-3
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,4 @@ export LC_ALL=C.UTF-8
55

66
[[ -x '/usr/bin/fd' ]] && FD="fd" || FD="fdfind"
77

8-
$FD . './typed-protocols' -e hs -E Setup.hs -E Core.hs -X stylish-haskell -c .stylish-haskell.yaml -i
9-
$FD . './typed-protocols-cborg' -e hs -E Setup.hs -X stylish-haskell -c .stylish-haskell.yaml -i
10-
$FD . './typed-protocols-examples' -e hs -E Setup.hs -E Channel.hs -X stylish-haskell -c .stylish-haskell.yaml -i
8+
$FD . './typed-protocols' -e hs -E Setup.hs -E Core.hs -E Channel.hs -X stylish-haskell -c .stylish-haskell.yaml -i

‎typed-protocols/stateful-cborg/Network/TypedProtocol/Stateful/Codec/CBOR.hs

+16-16
Original file line numberDiff line numberDiff line change
@@ -12,22 +12,22 @@ module Network.TypedProtocol.Stateful.Codec.CBOR
1212
, mkCodecCborStrictBS
1313
) where
1414

15-
import Control.Monad.Class.MonadST (MonadST (..))
16-
17-
import Codec.CBOR.Decoding qualified as CBOR (Decoder)
18-
import Codec.CBOR.Encoding qualified as CBOR (Encoding)
19-
import Codec.CBOR.Read qualified as CBOR
20-
import Codec.CBOR.Write qualified as CBOR
21-
import Data.ByteString qualified as BS
22-
import Data.ByteString.Builder qualified as BS
23-
import Data.ByteString.Builder.Extra qualified as BS
24-
import Data.ByteString.Lazy qualified as LBS
25-
import Data.ByteString.Lazy.Internal qualified as LBS (smallChunkSize)
26-
27-
import Network.TypedProtocol.Stateful.Codec
28-
import Network.TypedProtocol.Codec.CBOR (DeserialiseFailure,
29-
convertCborDecoderBS, convertCborDecoderLBS)
30-
import Network.TypedProtocol.Core
15+
import Control.Monad.Class.MonadST (MonadST (..))
16+
17+
import qualified Codec.CBOR.Decoding as CBOR (Decoder)
18+
import qualified Codec.CBOR.Encoding as CBOR (Encoding)
19+
import qualified Codec.CBOR.Read as CBOR
20+
import qualified Codec.CBOR.Write as CBOR
21+
import qualified Data.ByteString as BS
22+
import qualified Data.ByteString.Builder as BS
23+
import qualified Data.ByteString.Builder.Extra as BS
24+
import qualified Data.ByteString.Lazy as LBS
25+
import qualified Data.ByteString.Lazy.Internal as LBS (smallChunkSize)
26+
27+
import Network.TypedProtocol.Codec.CBOR (DeserialiseFailure,
28+
convertCborDecoderBS, convertCborDecoderLBS)
29+
import Network.TypedProtocol.Core
30+
import Network.TypedProtocol.Stateful.Codec
3131

3232

3333
-- | Construct a 'Codec' for a CBOR based serialisation format, using strict

‎typed-protocols/stateful/Network/TypedProtocol/Stateful/Codec.hs

+18-18
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
1-
{-# LANGUAGE DataKinds #-}
2-
{-# LANGUAGE FlexibleContexts #-}
3-
{-# LANGUAGE FlexibleInstances #-}
4-
{-# LANGUAGE GADTs #-}
5-
{-# LANGUAGE NamedFieldPuns #-}
6-
{-# LANGUAGE PatternSynonyms #-}
7-
{-# LANGUAGE PolyKinds #-}
8-
{-# LANGUAGE QuantifiedConstraints #-}
9-
{-# LANGUAGE RankNTypes #-}
10-
{-# LANGUAGE ScopedTypeVariables #-}
11-
{-# LANGUAGE TypeFamilies #-}
12-
{-# LANGUAGE ViewPatterns #-}
1+
{-# LANGUAGE DataKinds #-}
2+
{-# LANGUAGE FlexibleContexts #-}
3+
{-# LANGUAGE FlexibleInstances #-}
4+
{-# LANGUAGE GADTs #-}
5+
{-# LANGUAGE NamedFieldPuns #-}
6+
{-# LANGUAGE PatternSynonyms #-}
7+
{-# LANGUAGE PolyKinds #-}
8+
{-# LANGUAGE QuantifiedConstraints #-}
9+
{-# LANGUAGE RankNTypes #-}
10+
{-# LANGUAGE ScopedTypeVariables #-}
11+
{-# LANGUAGE TypeFamilies #-}
12+
{-# LANGUAGE ViewPatterns #-}
1313
-- @UndecidableInstances@ extension is required for defining @Show@ instance of
1414
-- @'AnyMessage'@ and @'AnyMessage'@.
15-
{-# LANGUAGE UndecidableInstances #-}
15+
{-# LANGUAGE UndecidableInstances #-}
1616
{-# OPTIONS_GHC -Wno-dodgy-imports #-}
1717

1818
-- | Stateful codec. This module is intended to be imported qualified.
@@ -31,7 +31,7 @@ module Network.TypedProtocol.Stateful.Codec
3131
-- ** Related types
3232
-- *** SomeMessage
3333
, SomeMessage (..)
34-
-- *** StateToken
34+
-- *** StateToken
3535
, StateToken
3636
, StateTokenI (..)
3737
-- *** ActiveState
@@ -54,12 +54,12 @@ module Network.TypedProtocol.Stateful.Codec
5454
import Data.Kind (Type)
5555
import Data.Monoid (All (..))
5656

57-
import Network.TypedProtocol.Core
5857
import Network.TypedProtocol.Codec (CodecFailure (..),
59-
DecodeStep (..), SomeMessage (..), hoistDecodeStep,
60-
isoDecodeStep, mapFailureDecodeStep, runDecoder,
61-
runDecoderPure)
58+
DecodeStep (..), SomeMessage (..), hoistDecodeStep,
59+
isoDecodeStep, mapFailureDecodeStep, runDecoder,
60+
runDecoderPure)
6261
import qualified Network.TypedProtocol.Codec as TP hiding (AnyMessageAndAgency)
62+
import Network.TypedProtocol.Core
6363

6464

6565
-- | A stateful codec.

‎typed-protocols/stateful/Network/TypedProtocol/Stateful/Driver.hs

+5-5
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,13 @@ module Network.TypedProtocol.Stateful.Driver
2222
, DecodeStep (..)
2323
) where
2424

25-
import Control.Monad.Class.MonadSTM
25+
import Control.Monad.Class.MonadSTM
2626

27-
import Data.Kind (Type)
27+
import Data.Kind (Type)
2828

29-
import Network.TypedProtocol.Codec (DecodeStep (..), SomeMessage (..))
30-
import Network.TypedProtocol.Core
31-
import Network.TypedProtocol.Stateful.Peer
29+
import Network.TypedProtocol.Codec (DecodeStep (..), SomeMessage (..))
30+
import Network.TypedProtocol.Core
31+
import Network.TypedProtocol.Stateful.Peer
3232

3333
data Driver ps (pr :: PeerRole) bytes failure dstate f m =
3434
Driver {

‎typed-protocols/stateful/Network/TypedProtocol/Stateful/Peer.hs

+4-6
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
{-# LANGUAGE FlexibleContexts #-}
44
{-# LANGUAGE FlexibleInstances #-}
55
{-# LANGUAGE GADTs #-}
6+
{-# LANGUAGE MultiParamTypeClasses #-}
67
{-# LANGUAGE PolyKinds #-}
78
{-# LANGUAGE RankNTypes #-}
8-
{-# LANGUAGE MultiParamTypeClasses #-}
99
{-# LANGUAGE StandaloneDeriving #-}
1010
{-# LANGUAGE StandaloneKindSignatures #-}
1111
{-# LANGUAGE TypeOperators #-}
@@ -17,13 +17,11 @@
1717
-- __Note__: 'Network.TypedProtocol.Peer.Client.Client' and
1818
-- 'Network.TypedProtocol.Peer.Server.Server' patterns are easier to use.
1919
--
20-
module Network.TypedProtocol.Stateful.Peer
21-
( Peer (..)
22-
) where
20+
module Network.TypedProtocol.Stateful.Peer (Peer (..)) where
2321

24-
import Data.Kind (Type)
22+
import Data.Kind (Type)
2523

26-
import Network.TypedProtocol.Core as Core
24+
import Network.TypedProtocol.Core as Core
2725

2826

2927
-- | A description of a peer that engages in a protocol.

‎typed-protocols/stateful/Network/TypedProtocol/Stateful/Proofs.hs

+8-8
Original file line numberDiff line numberDiff line change
@@ -22,16 +22,16 @@ module Network.TypedProtocol.Stateful.Proofs
2222
, removeState
2323
) where
2424

25-
import Control.Monad.Class.MonadSTM
25+
import Control.Monad.Class.MonadSTM
2626

27-
import Data.Kind (Type)
28-
import Data.Singletons
27+
import Data.Kind (Type)
28+
import Data.Singletons
2929

30-
import Network.TypedProtocol.Core
31-
import Network.TypedProtocol.Stateful.Peer qualified as ST
32-
import Network.TypedProtocol.Peer
33-
import Network.TypedProtocol.Proofs (TerminalStates (..))
34-
import Network.TypedProtocol.Proofs qualified as TP
30+
import Network.TypedProtocol.Core
31+
import Network.TypedProtocol.Peer
32+
import Network.TypedProtocol.Proofs (TerminalStates (..))
33+
import qualified Network.TypedProtocol.Proofs as TP
34+
import qualified Network.TypedProtocol.Stateful.Peer as ST
3535

3636

3737

0 commit comments

Comments
 (0)