Skip to content

Standardize import qualified syntax to postpositive form #4908

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
Copilot wants to merge 3 commits into
base: develop
Choose a base branch
from
Draft

Standardize import qualified syntax to postpositive form #4908

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d67232b
Initial plan
Copilot Dec 15, 2025
fbad9b5
Convert all import qualified statements to postpositive form
Copilot Dec 15, 2025
65db703
Update cabal files to use GHC2021 as default-language
Copilot Dec 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions integration/Setup.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ import Data.Bool
import Data.Foldable
import Data.Function
import Data.List
import qualified Data.Map as Map
import Data.Map qualified as Map
import Data.Maybe
import Data.Monoid
import qualified Data.Set as Set
import Data.Set qualified as Set
import Data.String
import Distribution.Simple hiding (Language (..), Module (..))
import Distribution.Simple.BuildPaths
Expand All @@ -22,7 +22,7 @@ import Distribution.Types.Library
import Distribution.Types.PackageDescription
import Distribution.Utils.Path
import Language.Haskell.Exts (Comment (..), Decl (TypeSig), Language (..), Module (..), Name (..), ParseMode (..), SrcSpanInfo, associateHaddock, fromParseResult, parseFileWithComments)
import qualified Language.Haskell.Exts as Exts
import Language.Haskell.Exts qualified as Exts
import System.Directory
import System.FilePath
import Prelude
Expand Down
10 changes: 5 additions & 5 deletions integration/test/API/Brig.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,13 @@ module API.Brig where

import API.BrigCommon
import API.Common
import qualified Data.Aeson as Aeson
import qualified Data.ByteString.Base64 as Base64
import Data.Aeson qualified as Aeson
import Data.ByteString.Base64 qualified as Base64
import Data.Foldable
import Data.Function
import qualified Data.Text as T
import qualified Data.Text.Encoding as T
import qualified Data.Vector as V
import Data.Text qualified as T
import Data.Text.Encoding qualified as T
import Data.Vector qualified as V
import GHC.Stack
import Testlib.Prelude

Expand Down
2 changes: 1 addition & 1 deletion integration/test/API/BrigInternal.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ module API.BrigInternal where

import API.BrigCommon
import API.Common
import qualified Data.Aeson as Aeson
import Data.Aeson qualified as Aeson
import Data.Aeson.Types (Pair)
import Data.Function
import Data.Maybe
Expand Down
20 changes: 10 additions & 10 deletions integration/test/API/Cargohold.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,23 +18,23 @@
module API.Cargohold where

import API.Federator
import qualified Codec.MIME.Parse as MIME
import qualified Codec.MIME.Type as MIME
import qualified Data.Aeson as Aeson
import qualified Data.Aeson.KeyMap as Aeson
import Codec.MIME.Parse qualified as MIME
import Codec.MIME.Type qualified as MIME
import Data.Aeson qualified as Aeson
import Data.Aeson.KeyMap qualified as Aeson
import Data.ByteString.Builder
import Data.ByteString.Conversion
import qualified Data.ByteString.Lazy as LBS
import qualified Data.ByteString.Lazy as Lazy
import qualified Data.ByteString.Lazy.Char8 as LBSC
import qualified Data.ByteString.Lazy.Char8 as Lazy8
import Data.ByteString.Lazy qualified as LBS
import Data.ByteString.Lazy qualified as Lazy
import Data.ByteString.Lazy.Char8 qualified as LBSC
import Data.ByteString.Lazy.Char8 qualified as Lazy8
import Data.CaseInsensitive
import Data.String.Conversions
import qualified Data.Text as T
import Data.Text qualified as T
import Data.Text.Encoding (decodeLatin1, decodeUtf8, encodeUtf8, encodeUtf8Builder)
import GHC.Stack
import Network.HTTP.Client (Request (redirectCount, requestHeaders))
import qualified Network.HTTP.Client as HTTP
import Network.HTTP.Client qualified as HTTP
import Network.HTTP.Types.Header (HeaderName)
import Testlib.Prelude
import UnliftIO (catch)
Expand Down
6 changes: 3 additions & 3 deletions integration/test/API/Common.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@ module API.Common where
import Control.Monad
import Control.Monad.IO.Class
import Data.Array ((!))
import qualified Data.Array as Array
import qualified Data.ByteString as BS
import Data.Array qualified as Array
import Data.ByteString qualified as BS
import Data.Scientific (scientific)
import qualified Data.Vector as Vector
import Data.Vector qualified as Vector
import System.Random (randomIO, randomRIO)
import Testlib.Prelude

Expand Down
2 changes: 1 addition & 1 deletion integration/test/API/Federator.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ module API.Federator where

import Data.Function
import GHC.Stack
import qualified Network.HTTP.Client as HTTP
import Network.HTTP.Client qualified as HTTP
import Testlib.Prelude

getMetrics ::
Expand Down
16 changes: 8 additions & 8 deletions integration/test/API/Galley.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,15 +24,15 @@ import API.Common
import Control.Lens hiding ((.=))
import Control.Monad.Reader
import Control.Retry
import qualified Data.Aeson as Aeson
import qualified Data.Aeson.Types as Aeson
import qualified Data.ByteString.Base64 as B64
import qualified Data.ByteString.Base64.URL as B64U
import qualified Data.ByteString.Char8 as BS
import qualified Data.ByteString.Lazy as LBS
import qualified Data.ProtoLens as Proto
import Data.Aeson qualified as Aeson
import Data.Aeson.Types qualified as Aeson
import Data.ByteString.Base64 qualified as B64
import Data.ByteString.Base64.URL qualified as B64U
import Data.ByteString.Char8 qualified as BS
import Data.ByteString.Lazy qualified as LBS
import Data.ProtoLens qualified as Proto
import Data.ProtoLens.Labels ()
import qualified Data.UUID as UUID
import Data.UUID qualified as UUID
import Numeric.Lens
import Proto.Otr as Proto
import Testlib.Prelude
Expand Down
8 changes: 4 additions & 4 deletions integration/test/API/GalleyInternal.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@

module API.GalleyInternal where

import qualified Data.Aeson as A
import qualified Data.Aeson as Aeson
import Data.Aeson qualified as A
import Data.Aeson qualified as Aeson
import Data.String.Conversions (cs)
import qualified Data.Text as T
import qualified Data.Vector as Vector
import Data.Text qualified as T
import Data.Vector qualified as Vector
import GHC.Stack
import Testlib.Prelude

Expand Down
6 changes: 3 additions & 3 deletions integration/test/API/Gundeck.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@
module API.Gundeck where

import API.Common
import qualified Data.ByteString.Base16 as Base16
import qualified Data.Text as Text
import qualified Data.Text.Encoding as Text
import Data.ByteString.Base16 qualified as Base16
import Data.Text qualified as Text
import Data.Text.Encoding qualified as Text
import Testlib.Prelude

data GetNotifications = GetNotifications
Expand Down
8 changes: 4 additions & 4 deletions integration/test/API/Nginz.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@
module API.Nginz where

import API.Cargohold
import qualified Codec.MIME.Type as MIME
import qualified Data.Aeson as Aeson
import qualified Data.ByteString.Lazy as LBS
import qualified Network.HTTP.Client as HTTP
import Codec.MIME.Type qualified as MIME
import Data.Aeson qualified as Aeson
import Data.ByteString.Lazy qualified as LBS
import Network.HTTP.Client qualified as HTTP
import Testlib.Prelude

getSystemSettingsUnAuthorized :: (HasCallStack, MakesValue domain) => domain -> App Response
Expand Down
8 changes: 4 additions & 4 deletions integration/test/API/Spar.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,16 +18,16 @@
module API.Spar where

import API.Common (defPassword)
import qualified Data.ByteString.Base64.Lazy as EL
import Data.ByteString.Base64.Lazy qualified as EL
import Data.String.Conversions (cs)
import Data.String.Conversions.Monomorphic (fromLT)
import GHC.Stack
import Network.HTTP.Client (Request)
import Network.HTTP.Client.MultipartFormData
import qualified SAML2.WebSSO as SAML
import qualified SAML2.WebSSO.Test.MockResponse as SAML
import SAML2.WebSSO qualified as SAML
import SAML2.WebSSO.Test.MockResponse qualified as SAML
import Testlib.Prelude
import qualified Text.XML as XML
import Text.XML qualified as XML

-- | https://staging-nginz-https.zinfra.io/v6/api/swagger-ui/#/default/get_scim_auth_tokens
getScimTokens :: (HasCallStack, MakesValue caller) => caller -> App Response
Expand Down
20 changes: 10 additions & 10 deletions integration/test/MLS/Util.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,21 +29,21 @@ import Control.Monad.Codensity
import Control.Monad.Cont
import Control.Monad.Reader
import Control.Monad.Trans.Maybe
import qualified Data.Aeson as Aeson
import qualified Data.ByteString as BS
import qualified Data.ByteString.Base64 as Base64
import qualified Data.ByteString.Char8 as B8
import qualified Data.ByteString.Char8 as C8
import Data.Aeson qualified as Aeson
import Data.ByteString qualified as BS
import Data.ByteString.Base64 qualified as Base64
import Data.ByteString.Char8 qualified as B8
import Data.ByteString.Char8 qualified as C8
import Data.Default
import Data.Foldable
import Data.Function
import qualified Data.Map as Map
import Data.Map qualified as Map
import Data.Maybe
import qualified Data.Set as Set
import qualified Data.Text.Encoding as T
import Data.Set qualified as Set
import Data.Text.Encoding qualified as T
import Data.Traversable
import qualified Data.UUID as UUID
import qualified Data.UUID.V4 as UUIDV4
import Data.UUID qualified as UUID
import Data.UUID.V4 qualified as UUIDV4
import GHC.Stack
import Notifications
import System.Directory
Expand Down
26 changes: 13 additions & 13 deletions integration/test/SetupHelpers.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,35 +29,35 @@ import API.Spar
import Control.Monad.Reader
import Crypto.Random (getRandomBytes)
import Data.Aeson hiding ((.=))
import qualified Data.Aeson.Types as Aeson
import qualified Data.ByteString.Base16 as Base16
import qualified Data.ByteString.Base64.Lazy as EL
import qualified Data.ByteString.Base64.URL as B64Url
import Data.Aeson.Types qualified as Aeson
import Data.ByteString.Base16 qualified as Base16
import Data.ByteString.Base64.Lazy qualified as EL
import Data.ByteString.Base64.URL qualified as B64Url
import Data.ByteString.Char8 (unpack)
import qualified Data.CaseInsensitive as CI
import Data.CaseInsensitive qualified as CI
import Data.Default
import Data.Function
import Data.String.Conversions (cs)
import qualified Data.Text as Text
import Data.Text qualified as Text
import Data.Text.Encoding (decodeUtf8)
import qualified Data.UUID as UUID
import Data.UUID qualified as UUID
import Data.UUID.V1 (nextUUID)
import Data.UUID.V4 (nextRandom)
import Data.Vector (fromList)
import GHC.Stack
import qualified SAML2.WebSSO as SAML
import qualified SAML2.WebSSO.API.Example as SAML
import qualified SAML2.WebSSO.Test.MockResponse as SAML
import SAML2.WebSSO qualified as SAML
import SAML2.WebSSO.API.Example qualified as SAML
import SAML2.WebSSO.Test.MockResponse qualified as SAML
import SAML2.WebSSO.Test.Util (SampleIdP (..), makeSampleIdPMetadata)
import System.Random (randomRIO)
import Test.DNSMock
import Testlib.JSON
import Testlib.Prelude
import Testlib.Printing (indent)
import Text.Regex.TDFA ((=~))
import qualified Text.XML as XML
import qualified Text.XML.Cursor as XML
import qualified Text.XML.DSig as SAML
import Text.XML qualified as XML
import Text.XML.Cursor qualified as XML
import Text.XML.DSig qualified as SAML
import UnliftIO (pooledForConcurrentlyN)

randomUser :: (HasCallStack, MakesValue domain) => domain -> CreateUser -> App Value
Expand Down
4 changes: 2 additions & 2 deletions integration/test/Test/Auth.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ import API.Brig
import API.BrigInternal
import API.Common
import API.GalleyInternal
import qualified API.Nginz as Nginz
import qualified Data.ByteString.Char8 as BSChar8
import API.Nginz qualified as Nginz
import Data.ByteString.Char8 qualified as BSChar8
import SetupHelpers
import Testlib.Prelude
import Text.Read
Expand Down
10 changes: 5 additions & 5 deletions integration/test/Test/Bot.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,16 +22,16 @@ import API.Common
import API.Galley
import Control.Lens hiding ((.=))
import Control.Monad.Reader
import qualified Data.Aeson as Aeson
import qualified Data.ProtoLens as Proto
import Data.Aeson qualified as Aeson
import Data.ProtoLens qualified as Proto
import Data.Proxy (Proxy (Proxy))
import Data.String.Conversions (cs)
import Network.HTTP.Types (status200, status201)
import Network.Wai (responseLBS)
import qualified Network.Wai as Wai
import Network.Wai qualified as Wai
import Numeric.Lens (hex)
import qualified Proto.Otr as Proto
import qualified Proto.Otr_Fields as Proto
import Proto.Otr qualified as Proto
import Proto.Otr_Fields qualified as Proto
import Servant.API
import Servant.API.Extended.Endpath
import Servant.Server
Expand Down
6 changes: 3 additions & 3 deletions integration/test/Test/Brig.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,16 +21,16 @@
module Test.Brig where

import API.Brig as BrigP
import qualified API.BrigInternal as BrigI
import API.BrigInternal qualified as BrigI
import API.Common
import API.GalleyInternal (setTeamFeatureStatus)
import API.Spar
import Control.Retry
import Data.Aeson.Types hiding ((.=))
import Data.List.Split
import Data.String.Conversions
import qualified Data.UUID as UUID
import qualified Data.UUID.V4 as UUID
import Data.UUID qualified as UUID
import Data.UUID.V4 qualified as UUID
import GHC.Stack
import SetupHelpers
import System.IO.Extra
Expand Down
16 changes: 8 additions & 8 deletions integration/test/Test/Cargohold/API.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,21 +20,21 @@
module Test.Cargohold.API where

import API.Cargohold
import qualified Codec.MIME.Type as MIME
import Codec.MIME.Type qualified as MIME
import Control.Lens hiding (sets, (.=))
import qualified Data.Aeson.KeyMap as KM
import Data.Aeson.KeyMap qualified as KM
import Data.Aeson.Types (Pair)
import qualified Data.ByteString.Char8 as BC
import qualified Data.ByteString.Char8 as C8
import qualified Data.ByteString.Lazy as LBS hiding (replicate)
import qualified Data.ByteString.Lazy.Char8 as L8
import Data.ByteString.Char8 qualified as BC
import Data.ByteString.Char8 qualified as C8
import Data.ByteString.Lazy qualified as LBS hiding (replicate)
import Data.ByteString.Lazy.Char8 qualified as L8
import Data.CaseInsensitive (mk)
import Data.String.Conversions
import Data.Time (UTCTime, defaultTimeLocale, parseTimeOrError, rfc822DateFormat)
import Data.Time.Format.ISO8601 (formatParseM, iso8601Format)
import Network.HTTP.Client (parseUrlThrow)
import qualified Network.HTTP.Client as HTTP
import qualified Network.HTTP.Types as HTTP
import Network.HTTP.Client qualified as HTTP
import Network.HTTP.Types qualified as HTTP
import SetupHelpers (createTeam, randomId, randomUser)
import Testlib.Prelude
import UnliftIO.Concurrent
Expand Down
2 changes: 1 addition & 1 deletion integration/test/Test/Cargohold/API/Federation.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
module Test.Cargohold.API.Federation where

import API.Cargohold
import qualified Codec.MIME.Type as MIME
import Codec.MIME.Type qualified as MIME
import Control.Lens hiding ((.=))
import Crypto.Random (getRandomBytes)
import Data.ByteString.Builder
Expand Down
8 changes: 4 additions & 4 deletions integration/test/Test/Cargohold/API/V3.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,11 @@ module Test.Cargohold.API.V3 where
import API.Cargohold
import Codec.MIME.Type (showMIMEType)
import Crypto.Random
import qualified Data.Aeson.KeyMap as KM
import qualified Data.ByteString as BS
import Data.Aeson.KeyMap qualified as KM
import Data.ByteString qualified as BS
import Data.ByteString.Builder
import qualified Data.ByteString.Char8 as C8
import qualified Data.ByteString.Lazy as LBS
import Data.ByteString.Char8 qualified as C8
import Data.ByteString.Lazy qualified as LBS
import Data.CaseInsensitive
import Data.String.Conversions
import Data.Text
Expand Down
Loading