6492765 · typeable/req

git.iko.soy/typeable/req

Switch to GHC2021

commit64927658b6e30d49d0306c34edc6ade3a4723962 authorMark Karpov <markkarpov92@gmail.com> dateThu 13 Apr 2023, 17:28 (4 years ago) parent8509c0b

4 files changed+60−71

compare with master

unifiedsplit

Network/HTTP/Req.hs+30−40 httpbun-tests/Network/HTTP/ReqSpec.hs+10−11 pure-tests/Network/HTTP/ReqSpec.hs+17−17 req.cabal+3−3

Network/HTTP/Req.hs+30−40

@@ -1,19 +1,9 @@

1−{-# LANGUAGE BangPatterns #-}

21{-# LANGUAGE DataKinds #-}

3−{-# LANGUAGE DeriveDataTypeable #-}

4−{-# LANGUAGE DeriveGeneric #-}

5−{-# LANGUAGE DeriveLift #-}

6−{-# LANGUAGE FlexibleInstances #-}

7−{-# LANGUAGE GeneralizedNewtypeDeriving #-}

82{-# LANGUAGE LambdaCase #-}

9−{-# LANGUAGE MultiParamTypeClasses #-}

103{-# LANGUAGE OverloadedStrings #-}

114{-# LANGUAGE QuasiQuotes #-}

12−{-# LANGUAGE RankNTypes #-}

135{-# LANGUAGE RecordWildCards #-}

146{-# LANGUAGE RoleAnnotations #-}

15−{-# LANGUAGE ScopedTypeVariables #-}

16−{-# LANGUAGE StandaloneDeriving #-}

177{-# LANGUAGE TemplateHaskellQuotes #-}

188{-# LANGUAGE TypeFamilies #-}

199{-# LANGUAGE UndecidableInstances #-}

@@ -213,7 +203,7 @@ module Network.HTTP.Req

213203 )

214204where

215205

216−import qualified Blaze.ByteString.Builder as BB

206+import Blaze.ByteString.Builder qualified as BB

217207import Control.Applicative

218208import Control.Arrow (first, second)

219209import Control.Exception hiding (Handler (..), TypeError)

@@ -229,55 +219,55 @@ import Control.Monad.Trans.Control

229219import Control.Monad.Trans.Except (ExceptT)

230220import Control.Monad.Trans.Identity (IdentityT)

231221import Control.Monad.Trans.Maybe (MaybeT)

232−import qualified Control.Monad.Trans.RWS.CPS as RWS.CPS

233−import qualified Control.Monad.Trans.RWS.Lazy as RWS.Lazy

234−import qualified Control.Monad.Trans.RWS.Strict as RWS.Strict

222+import Control.Monad.Trans.RWS.CPS qualified as RWS.CPS

223+import Control.Monad.Trans.RWS.Lazy qualified as RWS.Lazy

224+import Control.Monad.Trans.RWS.Strict qualified as RWS.Strict

235225import Control.Monad.Trans.Select (SelectT)

236−import qualified Control.Monad.Trans.State.Lazy as State.Lazy

237−import qualified Control.Monad.Trans.State.Strict as State.Strict

238−import qualified Control.Monad.Trans.Writer.CPS as Writer.CPS

239−import qualified Control.Monad.Trans.Writer.Lazy as Writer.Lazy

240−import qualified Control.Monad.Trans.Writer.Strict as Writer.Strict

226+import Control.Monad.Trans.State.Lazy qualified as State.Lazy

227+import Control.Monad.Trans.State.Strict qualified as State.Strict

228+import Control.Monad.Trans.Writer.CPS qualified as Writer.CPS

229+import Control.Monad.Trans.Writer.Lazy qualified as Writer.Lazy

230+import Control.Monad.Trans.Writer.Strict qualified as Writer.Strict

241231import Control.Retry

242232import Data.Aeson (FromJSON (..), ToJSON (..))

243−import qualified Data.Aeson as A

233+import Data.Aeson qualified as A

244234import Data.ByteString (ByteString)

245−import qualified Data.ByteString as B

246−import qualified Data.ByteString.Lazy as BL

247−import qualified Data.CaseInsensitive as CI

235+import Data.ByteString qualified as B

236+import Data.ByteString.Lazy qualified as BL

237+import Data.CaseInsensitive qualified as CI

248238import Data.Data (Data)

249239import Data.Function (on)

250240import Data.IORef

251241import Data.Kind (Constraint, Type)

252242import Data.List (foldl', nubBy)

253243import Data.List.NonEmpty (NonEmpty (..))

254−import qualified Data.List.NonEmpty as NE

244+import Data.List.NonEmpty qualified as NE

255245import Data.Maybe (fromMaybe)

256246import Data.Proxy

257247import Data.Semigroup (Endo (..))

258−import qualified Data.Set as S

248+import Data.Set qualified as S

259249import Data.Text (Text)

260−import qualified Data.Text as T

261−import qualified Data.Text.Encoding as T

250+import Data.Text qualified as T

251+import Data.Text.Encoding qualified as T

262252import Data.Typeable (Typeable, cast)

263253import GHC.Generics

264254import GHC.TypeLits

265−import qualified Language.Haskell.TH as TH

266−import qualified Language.Haskell.TH.Quote as TH

267−import qualified Language.Haskell.TH.Syntax as TH

268−import qualified Network.Connection as NC

269−import qualified Network.HTTP.Client as L

270−import qualified Network.HTTP.Client.Internal as LI

271−import qualified Network.HTTP.Client.MultipartFormData as LM

272−import qualified Network.HTTP.Client.TLS as L

273−import qualified Network.HTTP.Types as Y

255+import Language.Haskell.TH qualified as TH

256+import Language.Haskell.TH.Quote qualified as TH

257+import Language.Haskell.TH.Syntax qualified as TH

258+import Network.Connection qualified as NC

259+import Network.HTTP.Client qualified as L

260+import Network.HTTP.Client.Internal qualified as LI

261+import Network.HTTP.Client.MultipartFormData qualified as LM

262+import Network.HTTP.Client.TLS qualified as L

263+import Network.HTTP.Types qualified as Y

274264import System.IO.Unsafe (unsafePerformIO)

275265import Text.URI (URI)

276−import qualified Text.URI as URI

277−import qualified Text.URI.QQ as QQ

278−import qualified Web.Authenticate.OAuth as OAuth

266+import Text.URI qualified as URI

267+import Text.URI.QQ qualified as QQ

268+import Web.Authenticate.OAuth qualified as OAuth

279269import Web.FormUrlEncoded (FromForm (..), ToForm (..))

280−import qualified Web.FormUrlEncoded as Form

270+import Web.FormUrlEncoded qualified as Form

281271import Web.HttpApiData (ToHttpApiData (..))

282272

283273----------------------------------------------------------------------------

httpbun-tests/Network/HTTP/ReqSpec.hs+10−11

@@ -1,6 +1,5 @@

11{-# LANGUAGE DataKinds #-}

22{-# LANGUAGE FlexibleInstances #-}

3−{-# LANGUAGE LambdaCase #-}

43{-# LANGUAGE OverloadedStrings #-}

54{-# LANGUAGE RankNTypes #-}

65{-# OPTIONS_GHC -fno-warn-orphans #-}

@@ -11,21 +10,21 @@ import Control.Exception

1110import Control.Monad (forM_)

1211import Control.Monad.Trans.Control

1312import Data.Aeson (ToJSON (..), Value (..), object, (.=))

14−import qualified Data.Aeson as A

15−import qualified Data.Aeson.KeyMap as Aeson.KeyMap

16−import qualified Data.ByteString as B

17−import qualified Data.ByteString.Lazy as BL

13+import Data.Aeson qualified as A

14+import Data.Aeson.KeyMap qualified as Aeson.KeyMap

15+import Data.ByteString qualified as B

16+import Data.ByteString.Lazy qualified as BL

1817import Data.Functor.Identity (runIdentity)

1918import Data.Maybe (fromJust)

2019import Data.Proxy

2120import Data.Text (Text)

22−import qualified Data.Text as T

23−import qualified Data.Text.Encoding as T

24−import qualified Data.Text.IO as TIO

25−import qualified Network.HTTP.Client as L

26−import qualified Network.HTTP.Client.MultipartFormData as LM

21+import Data.Text qualified as T

22+import Data.Text.Encoding qualified as T

23+import Data.Text.IO qualified as TIO

24+import Network.HTTP.Client qualified as L

25+import Network.HTTP.Client.MultipartFormData qualified as LM

2726import Network.HTTP.Req

28−import qualified Network.HTTP.Types as Y

27+import Network.HTTP.Types qualified as Y

2928import Test.Hspec

3029import Test.QuickCheck

3130

pure-tests/Network/HTTP/ReqSpec.hs+17−17

@@ -13,41 +13,41 @@

1313

1414module Network.HTTP.ReqSpec (spec) where

1515

16−import qualified Blaze.ByteString.Builder as BB

16+import Blaze.ByteString.Builder qualified as BB

1717import Control.Exception (throwIO)

1818import Control.Monad

1919import Control.Retry

2020import Data.Aeson (ToJSON (..))

21−import qualified Data.Aeson as A

21+import Data.Aeson qualified as A

2222import Data.ByteString (ByteString)

23−import qualified Data.ByteString as B

24−import qualified Data.ByteString.Char8 as B8

25−import qualified Data.ByteString.Lazy as BL

26−import qualified Data.CaseInsensitive as CI

23+import Data.ByteString qualified as B

24+import Data.ByteString.Char8 qualified as B8

25+import Data.ByteString.Lazy qualified as BL

26+import Data.CaseInsensitive qualified as CI

2727import Data.Either (isRight)

28−import qualified Data.List.NonEmpty as NE

28+import Data.List.NonEmpty qualified as NE

2929import Data.Maybe (fromJust, fromMaybe, isJust, isNothing)

3030import Data.Proxy

3131import Data.Text (Text)

32−import qualified Data.Text as T

33−import qualified Data.Text.Encoding as T

32+import Data.Text qualified as T

33+import Data.Text.Encoding qualified as T

3434import Data.Time

3535import Data.Typeable (Typeable, eqT)

3636import GHC.Exts (IsList (..))

3737import GHC.Generics

38−import qualified Language.Haskell.TH as TH

39−import qualified Language.Haskell.TH.Quote as TH

40−import qualified Network.HTTP.Client as L

38+import Language.Haskell.TH qualified as TH

39+import Language.Haskell.TH.Quote qualified as TH

40+import Network.HTTP.Client qualified as L

4141import Network.HTTP.Req

42−import qualified Network.HTTP.Types as Y

43−import qualified Network.HTTP.Types.Header as Y

42+import Network.HTTP.Types qualified as Y

43+import Network.HTTP.Types.Header qualified as Y

4444import Test.Hspec

4545import Test.Hspec.Core.Spec (SpecM)

4646import Test.QuickCheck

4747import Text.URI (URI)

48−import qualified Text.URI as URI

49−import qualified Text.URI.QQ as QQ

50−import qualified Web.FormUrlEncoded as F

48+import Text.URI qualified as URI

49+import Text.URI.QQ qualified as QQ

50+import Web.FormUrlEncoded qualified as F

5151

5252spec :: Spec

5353spec = do

req.cabal+3−3

@@ -31,7 +31,7 @@ flag dev

3131

3232library

3333 exposed-modules: Network.HTTP.Req

34− default-language: Haskell2010

34+ default-language: GHC2021

3535 build-depends:

3636 aeson >=0.9 && <3,

3737 authenticate-oauth >=1.5 && <1.8,

@@ -74,7 +74,7 @@ test-suite pure-tests

7474 build-tool-depends: hspec-discover:hspec-discover >=2.0 && <3.0

7575 hs-source-dirs: pure-tests

7676 other-modules: Network.HTTP.ReqSpec

77− default-language: Haskell2010

77+ default-language: GHC2021

7878 build-depends:

7979 QuickCheck >=2.7 && <3.0,

8080 aeson >=0.9 && <3,

@@ -107,7 +107,7 @@ test-suite httpbun-tests

107107 build-tool-depends: hspec-discover:hspec-discover >=2.0 && <3.0

108108 hs-source-dirs: httpbun-tests

109109 other-modules: Network.HTTP.ReqSpec

110− default-language: Haskell2010

110+ default-language: GHC2021

111111 build-depends:

112112 QuickCheck >=2.7 && <3.0,

113113 aeson >=2 && <3,