Skip to content

Commit 51ebd51

Browse files
cootcoot
committed
Use ImportQualifiedPost which is part of GHC2024
1 parent 67a9bf4 commit 51ebd51

File tree

36 files changed

+233
-214
lines changed

36 files changed

+233
-214
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-cborg/src/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/src/Network/TypedProtocol/Channel.hs

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,15 @@ 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)
3333
import Network.Socket (Socket)

‎typed-protocols-examples/src/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/src/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/src/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/src/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/src/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.

‎typed-protocols-examples/src/Network/TypedProtocol/PingPong/Server.hs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
module Network.TypedProtocol.PingPong.Server where
44

5-
import Network.TypedProtocol.Core
6-
import Network.TypedProtocol.Peer.Server
7-
import Network.TypedProtocol.PingPong.Type
5+
import Network.TypedProtocol.Core
6+
import Network.TypedProtocol.Peer.Server
7+
import Network.TypedProtocol.PingPong.Type
88

99

1010
data PingPongServer m a = PingPongServer {

‎typed-protocols-examples/src/Network/TypedProtocol/PingPong/Type.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
module Network.TypedProtocol.PingPong.Type where
44

5-
import Network.TypedProtocol.Core
5+
import Network.TypedProtocol.Core
66

77

88
-- | The ping\/pong protocol and the states in its protocol state machine.

‎typed-protocols-examples/src/Network/TypedProtocol/ReqResp/Client.hs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@ module Network.TypedProtocol.ReqResp.Client
1111
, requestOnce
1212
) where
1313

14-
import Network.TypedProtocol.Core
15-
import Network.TypedProtocol.Peer.Client
16-
import Network.TypedProtocol.Peer.Server (Server)
17-
import Network.TypedProtocol.Proofs (connect)
18-
import Network.TypedProtocol.ReqResp.Type
14+
import Network.TypedProtocol.Core
15+
import Network.TypedProtocol.Peer.Client
16+
import Network.TypedProtocol.Peer.Server (Server)
17+
import Network.TypedProtocol.Proofs (connect)
18+
import Network.TypedProtocol.ReqResp.Type
1919

2020
data ReqRespClient req resp m a where
2121
SendMsgReq :: req

‎typed-protocols-examples/src/Network/TypedProtocol/ReqResp/Codec.hs

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

3-
import Network.TypedProtocol.Codec
4-
import Network.TypedProtocol.Core
5-
import Network.TypedProtocol.PingPong.Codec (decodeTerminatedFrame)
6-
import Network.TypedProtocol.ReqResp.Type
7-
import Text.Read (readMaybe)
3+
import Network.TypedProtocol.Codec
4+
import Network.TypedProtocol.Core
5+
import Network.TypedProtocol.PingPong.Codec (decodeTerminatedFrame)
6+
import Network.TypedProtocol.ReqResp.Type
7+
import Text.Read (readMaybe)
88

99

1010
codecReqResp ::

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

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

3-
import Control.Monad.Class.MonadST
4-
5-
import Data.ByteString.Lazy (ByteString)
6-
7-
import qualified Codec.CBOR.Decoding as CBOR (Decoder, decodeListLen,
8-
decodeWord)
9-
import qualified Codec.CBOR.Encoding as CBOR (Encoding, encodeListLen,
10-
encodeWord)
11-
import qualified Codec.CBOR.Read as CBOR
12-
import Codec.Serialise.Class (Serialise)
13-
import qualified Codec.Serialise.Class as CBOR
14-
15-
import Network.TypedProtocol.Codec
16-
import Network.TypedProtocol.Codec.CBOR
17-
import Network.TypedProtocol.Core
18-
import Network.TypedProtocol.ReqResp.Type
3+
import Control.Monad.Class.MonadST
4+
5+
import Data.ByteString.Lazy (ByteString)
6+
7+
import Codec.CBOR.Decoding qualified as CBOR (Decoder, decodeListLen,
8+
decodeWord)
9+
import Codec.CBOR.Encoding qualified as CBOR (Encoding, encodeListLen,
10+
encodeWord)
11+
import Codec.CBOR.Read qualified as CBOR
12+
import Codec.Serialise.Class (Serialise)
13+
import Codec.Serialise.Class qualified as CBOR
14+
15+
import Network.TypedProtocol.Codec
16+
import Network.TypedProtocol.Codec.CBOR
17+
import Network.TypedProtocol.Core
18+
import Network.TypedProtocol.ReqResp.Type
1919

2020
codecReqResp
2121
:: forall req resp m.

‎typed-protocols-examples/src/Network/TypedProtocol/ReqResp/Examples.hs

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

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

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

88
-- | An example request\/response client which ignores received responses.
99
--

‎typed-protocols-examples/src/Network/TypedProtocol/ReqResp/Server.hs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44

55
module Network.TypedProtocol.ReqResp.Server where
66

7-
import Network.TypedProtocol.Core
8-
import Network.TypedProtocol.Peer.Server
9-
import Network.TypedProtocol.ReqResp.Type
7+
import Network.TypedProtocol.Core
8+
import Network.TypedProtocol.Peer.Server
9+
import Network.TypedProtocol.ReqResp.Type
1010

1111

1212
data ReqRespServer req resp m a = ReqRespServer {

‎typed-protocols-examples/src/Network/TypedProtocol/ReqResp/Type.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
module Network.TypedProtocol.ReqResp.Type where
44

5-
import Network.TypedProtocol.Core
5+
import Network.TypedProtocol.Core
66

77

88
data ReqResp req resp where

‎typed-protocols-examples/src/Network/TypedProtocol/ReqResp2/Client.hs

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

3-
import Network.TypedProtocol.ReqResp2.Type
3+
import Network.TypedProtocol.ReqResp2.Type
44

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

88

99
reqResp2Client :: forall req resp m.

‎typed-protocols-examples/src/Network/TypedProtocol/ReqResp2/Type.hs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
{-# LANGUAGE TypeFamilies #-}
1+
{-# LANGUAGE TypeFamilies #-}
22

33
module Network.TypedProtocol.ReqResp2.Type where
44

5-
import Network.TypedProtocol.Core
5+
import Network.TypedProtocol.Core
66

77

88
data ReqResp2 req resp where

‎typed-protocols-examples/src/Network/TypedProtocol/Stateful/ReqResp/Client.hs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ module Network.TypedProtocol.Stateful.ReqResp.Client
33
, reqRespClientPeer
44
) where
55

6-
import Data.Typeable
7-
import Network.TypedProtocol.Stateful.Peer.Client
8-
import Network.TypedProtocol.Stateful.ReqResp.Type
6+
import Data.Typeable
7+
import Network.TypedProtocol.Stateful.Peer.Client
8+
import Network.TypedProtocol.Stateful.ReqResp.Type
99

1010
data ReqRespClient req m a where
1111
SendMsgReq :: Typeable resp

‎typed-protocols-examples/src/Network/TypedProtocol/Stateful/ReqResp/Codec.hs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
module Network.TypedProtocol.Stateful.ReqResp.Codec where
22

3-
import Data.Kind (Type)
4-
import Data.Singletons.Decide
5-
import Data.Typeable
6-
import Network.TypedProtocol.Core
7-
import Network.TypedProtocol.PingPong.Codec (decodeTerminatedFrame)
8-
import Network.TypedProtocol.Stateful.Codec
9-
import Network.TypedProtocol.Stateful.ReqResp.Type
3+
import Data.Kind (Type)
4+
import Data.Singletons.Decide
5+
import Data.Typeable
6+
import Network.TypedProtocol.Core
7+
import Network.TypedProtocol.PingPong.Codec (decodeTerminatedFrame)
8+
import Network.TypedProtocol.Stateful.Codec
9+
import Network.TypedProtocol.Stateful.ReqResp.Type
1010

1111
data Some (f :: k -> Type) where
1212
Some :: Typeable a => f a -> Some f

‎typed-protocols-examples/src/Network/TypedProtocol/Stateful/ReqResp/Examples.hs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
module Network.TypedProtocol.Stateful.ReqResp.Examples where
22

3-
import Network.TypedProtocol.Stateful.ReqResp.Server
4-
import Network.TypedProtocol.Stateful.ReqResp.Type
3+
import Network.TypedProtocol.Stateful.ReqResp.Server
4+
import Network.TypedProtocol.Stateful.ReqResp.Type
55

66

77
fileRPCServer :: Monad m

‎typed-protocols-examples/src/Network/TypedProtocol/Stateful/ReqResp/Server.hs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ module Network.TypedProtocol.Stateful.ReqResp.Server
33
, reqRespServerPeer
44
) where
55

6-
import Data.Typeable
7-
import Network.TypedProtocol.Stateful.Peer.Server
8-
import Network.TypedProtocol.Stateful.ReqResp.Type
6+
import Data.Typeable
7+
import Network.TypedProtocol.Stateful.Peer.Server
8+
import Network.TypedProtocol.Stateful.ReqResp.Type
99

1010

1111
data ReqRespServer req m a = ReqRespServer {

‎typed-protocols-examples/src/Network/TypedProtocol/Stateful/ReqResp/Type.hs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
--
88
module Network.TypedProtocol.Stateful.ReqResp.Type where
99

10-
import Data.Kind (Type)
11-
import Data.Typeable
12-
import Network.TypedProtocol.Core
10+
import Data.Kind (Type)
11+
import Data.Typeable
12+
import Network.TypedProtocol.Core
1313

1414

1515
type ReqResp :: (Type -> Type) -> Type

0 commit comments

Comments
 (0)