Export Data.String.Conversions.cs from Imports

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

libs/extended/test/Test/System/Logger/ExtendedSpec.hs

@@ -19,7 +19,6 @@ module Test.System.Logger.ExtendedSpec where
 
 import Data.Aeson ((.=))
 import qualified Data.Aeson as Aeson
-import Data.String.Conversions (cs)
 import Imports
 import System.IO.Temp
 import System.Logger.Extended hiding ((.=))

libs/galley-types/default.nix

@@ -17,7 +17,6 @@
 , memory
 , QuickCheck
 , schema-profunctor
-, string-conversions
 , tasty
 , tasty-hunit
 , tasty-quickcheck
@@ -43,7 +42,6 @@ mkDerivation {
     memory
     QuickCheck
     schema-profunctor
-    string-conversions
     text
     types-common
     uuid

libs/galley-types/galley-types.cabal

@@ -83,7 +83,6 @@ library
     , memory
     , QuickCheck
     , schema-profunctor
-    , string-conversions
     , text                   >=0.11
     , types-common           >=0.16
     , uuid

libs/galley-types/src/Galley/Types.hs

@@ -26,7 +26,7 @@ where
 import Data.Aeson
 import Data.Id (ClientId, UserId)
 import qualified Data.Map.Strict as Map
-import Imports
+import Imports hiding (cs)
 import Wire.API.Message
 
 --------------------------------------------------------------------------------

libs/galley-types/src/Galley/Types/Teams.hs

@@ -68,7 +68,6 @@ import Data.Id (UserId)
 import qualified Data.Maybe as Maybe
 import qualified Data.Schema as Schema
 import qualified Data.Set as Set
-import Data.String.Conversions (cs)
 import Imports
 import Test.QuickCheck (Arbitrary)
 import Wire.API.Error.Galley

libs/gundeck-types/src/Gundeck/Types/Push/V2.hs

@@ -83,7 +83,7 @@ import qualified Data.List1 as List1
 import Data.Range
 import qualified Data.Range as Range
 import qualified Data.Set as Set
-import Imports
+import Imports hiding (cs)
 import Wire.API.Message (Priority (..))
 import Wire.API.Push.V2.Token
 

libs/imports/default.nix

@@ -11,6 +11,7 @@
 , gitignoreSource
 , lib
 , mtl
+, string-conversions
 , text
 , transformers
 , unliftio
@@ -28,6 +29,7 @@ mkDerivation {
     deepseq
     extra
     mtl
+    string-conversions
     text
     transformers
     unliftio

libs/imports/imports.cabal

@@ -75,6 +75,7 @@ library
     , deepseq
     , extra
     , mtl
+    , string-conversions
     , text
     , transformers
     , unliftio

libs/imports/src/Imports.hs

@@ -114,6 +114,7 @@ module Imports
     -- * Extra Helpers
     whenM,
     unlessM,
+    cs,
 
     -- * Functor
     (<$$>),
@@ -164,6 +165,7 @@ import Data.Ord
 import Data.Semigroup hiding (diff)
 import Data.Set (Set)
 import Data.String
+import Data.String.Conversions (cs)
 import Data.Text (Text)
 import qualified Data.Text.Lazy
 import Data.Traversable

libs/jwt-tools/default.nix

@@ -11,7 +11,6 @@
 , imports
 , lib
 , rusty_jwt_tools_ffi
-, string-conversions
 , transformers
 }:
 mkDerivation {
@@ -23,16 +22,10 @@ mkDerivation {
     bytestring-conversion
     http-types
     imports
-    string-conversions
     transformers
   ];
   librarySystemDepends = [ rusty_jwt_tools_ffi ];
-  testHaskellDepends = [
-    hspec
-    imports
-    string-conversions
-    transformers
-  ];
+  testHaskellDepends = [ hspec imports transformers ];
   description = "FFI to rusty-jwt-tools";
   license = lib.licenses.agpl3Only;
 }

libs/jwt-tools/jwt-tools.cabal

@@ -67,7 +67,6 @@ library
     , bytestring-conversion
     , http-types
     , imports
-    , string-conversions
     , transformers
 
   default-language:   Haskell2010
@@ -83,7 +82,6 @@ test-suite jwt-tools-tests
       hspec
     , imports
     , jwt-tools
-    , string-conversions
     , transformers
 
   hs-source-dirs:     test

libs/jwt-tools/src/Data/Jwt/Tools.hs

@@ -39,7 +39,6 @@ where
 import Control.Exception
 import Control.Monad.Trans.Except
 import Data.ByteString.Conversion
-import Data.String.Conversions (cs)
 import Foreign.C.String (CString, newCString, peekCString)
 import Foreign.Ptr (Ptr, nullPtr)
 import Imports

libs/jwt-tools/test/Spec.hs

@@ -17,7 +17,6 @@
 
 import Control.Monad.Trans.Except
 import Data.Jwt.Tools
-import Data.String.Conversions (cs)
 import Imports
 import Test.Hspec
 

libs/metrics-wai/default.nix

@@ -15,7 +15,6 @@
 , metrics-core
 , servant
 , servant-multipart
-, string-conversions
 , text
 , wai
 , wai-middleware-prometheus
@@ -35,7 +34,6 @@ mkDerivation {
     metrics-core
     servant
     servant-multipart
-    string-conversions
     text
     wai
     wai-middleware-prometheus

libs/metrics-wai/metrics-wai.cabal

@@ -78,7 +78,6 @@ library
     , metrics-core               >=0.3
     , servant
     , servant-multipart
-    , string-conversions
     , text                       >=0.11
     , wai                        >=3
     , wai-middleware-prometheus

libs/metrics-wai/src/Data/Metrics/Servant.hs

@@ -31,7 +31,6 @@ import Data.Metrics.Types
 import qualified Data.Metrics.Types as Metrics
 import Data.Metrics.WaiRoute (treeToPaths)
 import Data.Proxy
-import Data.String.Conversions
 import Data.Tree
 import GHC.TypeLits
 import Imports

libs/metrics-wai/src/Data/Metrics/Test.hs

@@ -18,7 +18,6 @@
 module Data.Metrics.Test where
 
 import Data.Metrics.Types
-import Data.String.Conversions (cs)
 import qualified Data.Text as Text
 import qualified Data.Tree as Tree
 import Imports

libs/polysemy-wire-zoo/default.nix

@@ -20,7 +20,6 @@
 , polysemy-plugin
 , QuickCheck
 , saml2-web-sso
-, string-conversions
 , time
 , tinylog
 , types-common
@@ -46,7 +45,6 @@ mkDerivation {
     polysemy-plugin
     QuickCheck
     saml2-web-sso
-    string-conversions
     time
     tinylog
     types-common

libs/polysemy-wire-zoo/polysemy-wire-zoo.cabal

@@ -82,7 +82,7 @@ library
 
   build-depends:
       aeson
-    , base                >=4.6 && <5.0
+    , base             >=4.6 && <5.0
     , bytestring
     , cassandra-util
     , HsOpenSSL
@@ -94,7 +94,6 @@ library
     , polysemy-plugin
     , QuickCheck
     , saml2-web-sso
-    , string-conversions
     , time
     , tinylog
     , types-common

libs/polysemy-wire-zoo/src/Wire/Sem/Jwk.hs

@@ -6,7 +6,6 @@ import Control.Exception
 import Crypto.JOSE.JWK
 import Data.Aeson
 import qualified Data.ByteString as BS
-import Data.String.Conversions (cs)
 import Imports
 import Polysemy
 

libs/types-common/default.nix

@@ -40,7 +40,6 @@
 , random
 , schema-profunctor
 , servant-server
-, string-conversions
 , swagger2
 , tagged
 , tasty
@@ -95,7 +94,6 @@ mkDerivation {
     random
     schema-profunctor
     servant-server
-    string-conversions
     swagger2
     tagged
     tasty
@@ -118,7 +116,6 @@ mkDerivation {
     cereal
     imports
     protobuf
-    string-conversions
     tasty
     tasty-hunit
     tasty-quickcheck

libs/types-common/src/Data/Code.hs

@@ -34,7 +34,6 @@ import Data.Json.Util
 import Data.Proxy (Proxy (Proxy))
 import Data.Range
 import Data.Schema
-import Data.String.Conversions (cs)
 import qualified Data.Swagger as S
 import Data.Swagger.ParamSchema
 import Data.Text (pack)

libs/types-common/src/Data/Domain.hs

@@ -32,7 +32,6 @@ import qualified Data.ByteString.Builder as Builder
 import qualified Data.ByteString.Char8 as BS.Char8
 import Data.ByteString.Conversion
 import Data.Schema
-import Data.String.Conversions (cs)
 import qualified Data.Swagger as S
 import qualified Data.Text as Text
 import qualified Data.Text.Encoding as Text.E

libs/types-common/src/Data/Id.hs

@@ -74,7 +74,6 @@ import Data.Hashable (Hashable)
 import Data.ProtocolBuffers.Internal
 import Data.Proxy
 import Data.Schema
-import Data.String.Conversions (cs)
 import qualified Data.Swagger as S
 import Data.Swagger.Internal.ParamSchema (ToParamSchema (..))
 import qualified Data.Text as T