Export Data.String.Conversions.cs from Imports (#3320)

* Export cs from Imports

* Remove stupid type aliases.

Author: fisx

changelog.d/4-docs/pr-3320

@@ -0,0 +1 @@
+ Export `Data.String.Conversions.cs` from `Imports`

libs/api-bot/src/Network/Wire/Bot/Report.hs

@@ -48,7 +48,7 @@ where
 import qualified Data.HashMap.Strict as HashMap
 import Data.Metrics
 import Data.Time.Clock
-import Imports
+import Imports hiding (cs)
 import Network.Wire.Bot.Metrics
 import Network.Wire.Client.API.Push (EventType (..), eventTypeText)
 

libs/bilge/src/Bilge/Request.hs

@@ -82,7 +82,7 @@ import qualified Data.ByteString.Lazy as Lazy
 import qualified Data.ByteString.Lazy.Char8 as LC
 import Data.CaseInsensitive (original)
 import Data.Id (RequestId (..))
-import Imports hiding (intercalate)
+import Imports hiding (cs, intercalate)
 import Network.HTTP.Client (Cookie, GivesPopper, Request, RequestBody (..))
 import qualified Network.HTTP.Client as Rq
 import Network.HTTP.Client.Internal (CookieJar (..), brReadSome, throwHttp)

libs/brig-types/brig-types.cabal

@@ -85,7 +85,6 @@ library
     , imports
     , QuickCheck             >=2.9
     , schema-profunctor
-    , string-conversions
     , swagger2               >=2.5
     , text                   >=0.11
     , time                   >=1.1

libs/brig-types/default.nix

@@ -15,7 +15,6 @@
 , lib
 , QuickCheck
 , schema-profunctor
-, string-conversions
 , swagger2
 , tasty
 , tasty-hunit
@@ -41,7 +40,6 @@ mkDerivation {
     imports
     QuickCheck
     schema-profunctor
-    string-conversions
     swagger2
     text
     time

libs/brig-types/src/Brig/Types/Test/Arbitrary.hs

@@ -24,7 +24,6 @@ where
 
 import Brig.Types.Common
 import Brig.Types.Team.LegalHold
-import Data.String.Conversions (cs)
 import Imports
 import Test.QuickCheck
 import Wire.Arbitrary

libs/extended/default.nix

@@ -26,7 +26,6 @@
 , servant
 , servant-server
 , servant-swagger
-, string-conversions
 , temporary
 , text
 , tinylog
@@ -56,19 +55,11 @@ mkDerivation {
     servant
     servant-server
     servant-swagger
-    string-conversions
     text
     tinylog
     wai
   ];
-  testHaskellDepends = [
-    aeson
-    base
-    hspec
-    imports
-    string-conversions
-    temporary
-  ];
+  testHaskellDepends = [ aeson base hspec imports temporary ];
   testToolDepends = [ hspec-discover ];
   description = "Extended versions of common modules";
   license = lib.licenses.agpl3Only;

libs/extended/extended.cabal

@@ -94,7 +94,6 @@ library
     , servant
     , servant-server
     , servant-swagger
-    , string-conversions
     , text
     , tinylog
     , wai
@@ -164,7 +163,6 @@ test-suite extended-tests
     , extended
     , hspec
     , imports
-    , string-conversions
     , temporary
 
   default-language:   Haskell2010

libs/extended/src/Servant/API/Extended.hs

@@ -23,7 +23,6 @@ import qualified Data.ByteString.Lazy as BL
 import Data.EitherR (fmapL)
 import Data.Kind
 import Data.Metrics.Servant
-import Data.String.Conversions (cs)
 import Data.Typeable
 import GHC.TypeLits
 import Imports

libs/extended/src/System/Logger/Extended.hs

@@ -40,7 +40,6 @@ import qualified Data.Aeson.Key as Key
 import qualified Data.ByteString.Builder as B
 import qualified Data.ByteString.Lazy.Char8 as L
 import qualified Data.Map.Lazy as Map
-import Data.String.Conversions (cs)
 import GHC.Generics
 import Imports
 import System.Logger as Log