From 90c007608a2d6b11508a0ae75c2044967c1742fa Mon Sep 17 00:00:00 2001 From: Tom McLaughlin Date: Thu, 25 Mar 2021 01:31:02 -0700 Subject: [PATCH] Switch from interpolate to string-interpolate for perf --- aeson-typescript.cabal | 6 +++--- package.yaml | 2 +- src/Data/Aeson/TypeScript/Formatting.hs | 4 ++-- src/Data/Aeson/TypeScript/Instances.hs | 2 +- src/Data/Aeson/TypeScript/Lookup.hs | 2 +- src/Data/Aeson/TypeScript/TH.hs | 2 +- src/Data/Aeson/TypeScript/Util.hs | 2 +- test/Basic.hs | 2 +- test/Formatting.hs | 2 +- test/HigherKind.hs | 2 +- test/Live.hs | 2 +- test/TestBoilerplate.hs | 2 +- test/TypeFamilies.hs | 2 +- test/Util.hs | 2 +- 14 files changed, 17 insertions(+), 17 deletions(-) diff --git a/aeson-typescript.cabal b/aeson-typescript.cabal index 29213f0..7dbb9cb 100644 --- a/aeson-typescript.cabal +++ b/aeson-typescript.cabal @@ -4,7 +4,7 @@ cabal-version: 1.12 -- -- see: https://github.com/sol/hpack -- --- hash: 16f81138b5a26b66ca80560ddcb787ab65a090a9f77906fef1236ac6309141be +-- hash: 385395a69edf1409fddc1301dd9be0cf0c7e05e3e477585d26f8b5363316931f name: aeson-typescript version: 0.2.0.1 @@ -50,8 +50,8 @@ library aeson , base >=4.7 && <5 , containers - , interpolate , mtl + , string-interpolate , template-haskell , text , th-abstraction <0.5 @@ -103,9 +103,9 @@ test-suite aeson-typescript-test , directory , filepath , hspec - , interpolate , mtl , process + , string-interpolate , template-haskell , temporary , text diff --git a/package.yaml b/package.yaml index 3a22c19..0370d4b 100644 --- a/package.yaml +++ b/package.yaml @@ -29,7 +29,7 @@ dependencies: - aeson - base >= 4.7 && < 5 - containers -- interpolate +- string-interpolate - mtl - template-haskell - text diff --git a/src/Data/Aeson/TypeScript/Formatting.hs b/src/Data/Aeson/TypeScript/Formatting.hs index d70cc7e..d9e892f 100644 --- a/src/Data/Aeson/TypeScript/Formatting.hs +++ b/src/Data/Aeson/TypeScript/Formatting.hs @@ -3,7 +3,7 @@ module Data.Aeson.TypeScript.Formatting where import Data.Aeson.TypeScript.Types -import Data.String.Interpolate.IsString +import Data.String.Interpolate import qualified Data.Text as T #if !MIN_VERSION_base(4,11,0) @@ -26,7 +26,7 @@ formatTSDeclaration (FormattingOptions {..}) (TSTypeAlternatives name genericVar alternatives = T.intercalate " | " (fmap T.pack names) alternativesEnum = T.intercalate ", " $ [toEnumName entry | entry <- T.pack <$> names] alternativesEnumWithType = T.intercalate ", " $ [toEnumName entry <> "=" <> entry | entry <- T.pack <$> names] - enumType = [i|\n\ntype #{name} = keyof typeof #{typeNameModifier name};|] + enumType = [i|\n\ntype #{name} = keyof typeof #{typeNameModifier name};|] :: T.Text toEnumName = T.replace "\"" "" formatTSDeclaration (FormattingOptions {..}) (TSInterfaceDeclaration interfaceName genericVariables members) = diff --git a/src/Data/Aeson/TypeScript/Instances.hs b/src/Data/Aeson/TypeScript/Instances.hs index 38d71fc..73cfc96 100644 --- a/src/Data/Aeson/TypeScript/Instances.hs +++ b/src/Data/Aeson/TypeScript/Instances.hs @@ -12,7 +12,7 @@ import Data.Data import Data.HashMap.Strict import qualified Data.List as L import Data.Set -import Data.String.Interpolate.IsString +import Data.String.Interpolate import qualified Data.Text as T import qualified Data.Text.Lazy as TL import Data.Void diff --git a/src/Data/Aeson/TypeScript/Lookup.hs b/src/Data/Aeson/TypeScript/Lookup.hs index ff24e4b..151a4ca 100644 --- a/src/Data/Aeson/TypeScript/Lookup.hs +++ b/src/Data/Aeson/TypeScript/Lookup.hs @@ -19,7 +19,7 @@ import Control.Monad import Data.Aeson.TypeScript.Instances () import Data.Aeson.TypeScript.Types import Data.Proxy -import Data.String.Interpolate.IsString +import Data.String.Interpolate import Language.Haskell.TH hiding (stringE) import qualified Language.Haskell.TH.Lib as TH diff --git a/src/Data/Aeson/TypeScript/TH.hs b/src/Data/Aeson/TypeScript/TH.hs index 2bbdf42..9aa2966 100644 --- a/src/Data/Aeson/TypeScript/TH.hs +++ b/src/Data/Aeson/TypeScript/TH.hs @@ -157,7 +157,7 @@ import qualified Data.List as L import qualified Data.Map as M import Data.Maybe import Data.Proxy -import Data.String.Interpolate.IsString +import Data.String.Interpolate import Data.Typeable import Language.Haskell.TH hiding (stringE) import Language.Haskell.TH.Datatype diff --git a/src/Data/Aeson/TypeScript/Util.hs b/src/Data/Aeson/TypeScript/Util.hs index f8a1a26..2ae3598 100644 --- a/src/Data/Aeson/TypeScript/Util.hs +++ b/src/Data/Aeson/TypeScript/Util.hs @@ -8,7 +8,7 @@ import Data.Aeson.TypeScript.Instances () import Data.Aeson.TypeScript.Types import qualified Data.List as L import Data.Proxy -import Data.String.Interpolate.IsString +import Data.String.Interpolate import qualified Data.Text as T import Language.Haskell.TH hiding (stringE) import Language.Haskell.TH.Datatype diff --git a/test/Basic.hs b/test/Basic.hs index 3603210..d018fb0 100644 --- a/test/Basic.hs +++ b/test/Basic.hs @@ -19,7 +19,7 @@ import Data.Aeson as A import Data.Aeson.TypeScript.TH import Data.Aeson.TypeScript.Types import Data.Proxy -import Data.String.Interpolate.IsString +import Data.String.Interpolate import Prelude hiding (Double) import Test.Hspec diff --git a/test/Formatting.hs b/test/Formatting.hs index 4c21654..136751d 100644 --- a/test/Formatting.hs +++ b/test/Formatting.hs @@ -9,7 +9,7 @@ import Data.Aeson (defaultOptions) import Data.Aeson.TypeScript.TH import Data.Aeson.TypeScript.Types import Data.Proxy -import Data.String.Interpolate.IsString +import Data.String.Interpolate import Test.Hspec data D = S | F deriving (Eq, Show) diff --git a/test/HigherKind.hs b/test/HigherKind.hs index a2f82d5..63fe4e8 100644 --- a/test/HigherKind.hs +++ b/test/HigherKind.hs @@ -21,7 +21,7 @@ import Data.Aeson.TypeScript.TH import Data.Aeson.TypeScript.Types import Data.Monoid import Data.Proxy -import Data.String.Interpolate.IsString +import Data.String.Interpolate import Prelude hiding (Double) import Test.Hspec import Util diff --git a/test/Live.hs b/test/Live.hs index 978a1a1..592cdec 100644 --- a/test/Live.hs +++ b/test/Live.hs @@ -23,7 +23,7 @@ import Data.Function import Data.Functor.Identity import Data.Kind import Data.Proxy -import Data.String.Interpolate.IsString +import Data.String.Interpolate import qualified Data.Text as T import Prelude hiding (Double) diff --git a/test/TestBoilerplate.hs b/test/TestBoilerplate.hs index d5d3c90..fc99e87 100644 --- a/test/TestBoilerplate.hs +++ b/test/TestBoilerplate.hs @@ -21,7 +21,7 @@ import Data.Aeson.TypeScript.TH import Data.Functor.Identity import Data.Kind import Data.Proxy -import Data.String.Interpolate.IsString +import Data.String.Interpolate import Language.Haskell.TH hiding (Type) import Test.Hspec import Util diff --git a/test/TypeFamilies.hs b/test/TypeFamilies.hs index 8847334..c9c483c 100644 --- a/test/TypeFamilies.hs +++ b/test/TypeFamilies.hs @@ -22,7 +22,7 @@ import Data.Aeson.TypeScript.TH import Data.Aeson.TypeScript.Types import Data.Functor.Identity import Data.Proxy -import Data.String.Interpolate.IsString +import Data.String.Interpolate import qualified Data.Text as T import Prelude hiding (Double) import Test.Hspec diff --git a/test/Util.hs b/test/Util.hs index 17f171c..ea6dfe4 100644 --- a/test/Util.hs +++ b/test/Util.hs @@ -7,7 +7,7 @@ import Data.Aeson as A import Data.Aeson.TypeScript.TH import qualified Data.ByteString.Lazy as B import Data.Proxy -import Data.String.Interpolate.IsString +import Data.String.Interpolate import qualified Data.Text as T import System.Directory import System.Environment