Skip to content

Commit cf67d29

Browse files
cootcoot
committed
typed-protocols: use ImportQualifiedPost
1 parent 4a51678 commit cf67d29

File tree

46 files changed

+287
-268
lines changed

Some content is hidden

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

46 files changed

+287
-268
lines changed

‎.stylish-haskell.yaml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -191,6 +191,25 @@ steps:
191191
# Default: false
192192
space_surround: false
193193

194+
# Post qualify option moves any qualifies found in import declarations
195+
# to the end of the declaration. This also adjust padding for any
196+
# unqualified import declarations.
197+
#
198+
# - true: Qualified as <module name> is moved to the end of the
199+
# declaration.
200+
#
201+
# > import Data.Bar
202+
# > import Data.Foo qualified as F
203+
#
204+
# - false: Qualified remains in the default location and unqualified
205+
# imports are padded to align with qualified imports.
206+
#
207+
# > import Data.Bar
208+
# > import qualified Data.Foo as F
209+
#
210+
# Default: false
211+
post_qualify: true
212+
194213
# Language pragmas
195214
- language_pragmas:
196215
# We can generate different styles of language pragma lists.

‎typed-protocols-doc/src/Network/TypedProtocol/Documentation/GraphViz.hs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
{-# LANGUAGE DataKinds #-}
21
{-# LANGUAGE OverloadedStrings #-}
32

43
module Network.TypedProtocol.Documentation.GraphViz

‎typed-protocols-doc/typed-protocols-doc.cabal

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ library
5858
hs-source-dirs: src
5959
default-language: GHC2021
6060
default-extensions: DataKinds
61+
LambdaCase
6162

6263
executable typed-protocols-doc-demo
6364
import: warnings

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

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -8,21 +8,21 @@ module Network.TypedProtocol.Codec.CBOR
88
, CBOR.DeserialiseFailure (..)
99
) where
1010

11-
import Control.Monad.Class.MonadST (MonadST (..))
12-
import Control.Monad.ST hiding (stToIO)
13-
14-
import qualified Codec.CBOR.Decoding as CBOR (Decoder)
15-
import qualified Codec.CBOR.Encoding as CBOR (Encoding)
16-
import qualified Codec.CBOR.Read as CBOR
17-
import qualified Codec.CBOR.Write as CBOR
18-
import qualified Data.ByteString as BS
19-
import qualified Data.ByteString.Builder as BS
20-
import qualified Data.ByteString.Builder.Extra as BS
21-
import qualified Data.ByteString.Lazy as LBS
22-
import qualified Data.ByteString.Lazy.Internal as LBS (smallChunkSize)
23-
24-
import Network.TypedProtocol.Codec
25-
import Network.TypedProtocol.Core
11+
import Control.Monad.Class.MonadST (MonadST (..))
12+
import Control.Monad.ST hiding (stToIO)
13+
14+
import Codec.CBOR.Decoding qualified as CBOR (Decoder)
15+
import Codec.CBOR.Encoding qualified as CBOR (Encoding)
16+
import Codec.CBOR.Read qualified as CBOR
17+
import Codec.CBOR.Write qualified as CBOR
18+
import Data.ByteString qualified as BS
19+
import Data.ByteString.Builder qualified as BS
20+
import Data.ByteString.Builder.Extra qualified as BS
21+
import Data.ByteString.Lazy qualified as LBS
22+
import Data.ByteString.Lazy.Internal qualified as LBS (smallChunkSize)
23+
24+
import Network.TypedProtocol.Codec
25+
import Network.TypedProtocol.Core
2626

2727

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

‎typed-protocols/examples/Network/TypedProtocol/Channel.hs

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -19,22 +19,22 @@ module Network.TypedProtocol.Channel
1919
, loggingChannel
2020
) where
2121

22-
import Control.Concurrent.Class.MonadSTM
23-
import Control.Monad ((>=>))
24-
import Control.Monad.Class.MonadSay
25-
import Control.Monad.Class.MonadTimer.SI
26-
import qualified Data.ByteString as BS
27-
import qualified Data.ByteString.Lazy as LBS
28-
import Data.ByteString.Lazy.Internal (smallChunkSize)
29-
import Data.Proxy
30-
import Numeric.Natural
22+
import Control.Concurrent.Class.MonadSTM
23+
import Control.Monad ((>=>))
24+
import Control.Monad.Class.MonadSay
25+
import Control.Monad.Class.MonadTimer.SI
26+
import Data.ByteString qualified as BS
27+
import Data.ByteString.Lazy qualified as LBS
28+
import Data.ByteString.Lazy.Internal (smallChunkSize)
29+
import Data.Proxy
30+
import Numeric.Natural
3131

3232
#if !defined(mingw32_HOST_OS)
33-
import Network.Socket (Socket)
34-
import qualified Network.Socket.ByteString.Lazy as Socket
33+
import Network.Socket (Socket)
34+
import Network.Socket.ByteString.Lazy qualified as Socket
3535
#endif
3636

37-
import qualified System.IO as IO (Handle, hFlush, hIsEOF)
37+
import System.IO qualified as IO (Handle, hFlush, hIsEOF)
3838

3939

4040
-- | One end of a duplex channel. It is a reliable, ordered channel of some

‎typed-protocols/examples/Network/TypedProtocol/Driver/Simple.hs

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,15 @@ module Network.TypedProtocol.Driver.Simple
2424
, runDecoderWithChannel
2525
) where
2626

27-
import Network.TypedProtocol.Channel
28-
import Network.TypedProtocol.Codec
29-
import Network.TypedProtocol.Core
30-
import Network.TypedProtocol.Driver
31-
import Network.TypedProtocol.Peer
32-
33-
import Control.Monad.Class.MonadAsync
34-
import Control.Monad.Class.MonadThrow
35-
import Control.Tracer (Tracer (..), contramap, traceWith)
27+
import Network.TypedProtocol.Channel
28+
import Network.TypedProtocol.Codec
29+
import Network.TypedProtocol.Core
30+
import Network.TypedProtocol.Driver
31+
import Network.TypedProtocol.Peer
32+
33+
import Control.Monad.Class.MonadAsync
34+
import Control.Monad.Class.MonadThrow
35+
import Control.Tracer (Tracer (..), contramap, traceWith)
3636

3737

3838
-- $intro

‎typed-protocols/examples/Network/TypedProtocol/PingPong/Client.hs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ module Network.TypedProtocol.PingPong.Client
88
, pingPongClientPeerPipelined
99
) where
1010

11-
import Network.TypedProtocol.Core
12-
import Network.TypedProtocol.Peer.Client
13-
import Network.TypedProtocol.PingPong.Type
11+
import Network.TypedProtocol.Core
12+
import Network.TypedProtocol.Peer.Client
13+
import Network.TypedProtocol.PingPong.Type
1414

1515
-- | A ping-pong client, on top of some effect 'm'.
1616
--

‎typed-protocols/examples/Network/TypedProtocol/PingPong/Codec.hs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
module Network.TypedProtocol.PingPong.Codec where
22

3-
import Network.TypedProtocol.Codec
4-
import Network.TypedProtocol.Core
5-
import Network.TypedProtocol.PingPong.Type
3+
import Network.TypedProtocol.Codec
4+
import Network.TypedProtocol.Core
5+
import Network.TypedProtocol.PingPong.Type
66

77

88
codecPingPong

‎typed-protocols/examples/Network/TypedProtocol/PingPong/Codec/CBOR.hs

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
module Network.TypedProtocol.PingPong.Codec.CBOR where
22

3-
import Control.Monad.Class.MonadST
3+
import Control.Monad.Class.MonadST
44

5-
import Data.ByteString.Lazy (ByteString)
5+
import Data.ByteString.Lazy (ByteString)
66

7-
import qualified Codec.CBOR.Decoding as CBOR (Decoder, decodeWord)
8-
import qualified Codec.CBOR.Encoding as CBOR (Encoding, encodeWord)
9-
import qualified Codec.CBOR.Read as CBOR
7+
import Codec.CBOR.Decoding qualified as CBOR (Decoder, decodeWord)
8+
import Codec.CBOR.Encoding qualified as CBOR (Encoding, encodeWord)
9+
import Codec.CBOR.Read qualified as CBOR
1010

11-
import Network.TypedProtocol.Codec
12-
import Network.TypedProtocol.Codec.CBOR
13-
import Network.TypedProtocol.Core
14-
import Network.TypedProtocol.PingPong.Type
11+
import Network.TypedProtocol.Codec
12+
import Network.TypedProtocol.Codec.CBOR
13+
import Network.TypedProtocol.Core
14+
import Network.TypedProtocol.PingPong.Type
1515

1616
codecPingPong
1717
:: forall m.

‎typed-protocols/examples/Network/TypedProtocol/PingPong/Examples.hs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
module Network.TypedProtocol.PingPong.Examples where
22

3-
import Network.TypedProtocol.PingPong.Client
4-
import Network.TypedProtocol.PingPong.Server
3+
import Network.TypedProtocol.PingPong.Client
4+
import Network.TypedProtocol.PingPong.Server
55

6-
import Network.TypedProtocol.Peer.Client
6+
import Network.TypedProtocol.Peer.Client
77

88

99
-- | The standard stateless ping-pong server instance.

0 commit comments

Comments
 (0)