From af00035b990ed7fe18c13ac97333edc07d53da71 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B6nke=20Hahn?= Date: Fri, 7 Nov 2014 16:55:17 +0800 Subject: [PATCH] module renaming: S.API.QQ -> S.Utils.ApiQuasiQuoting --- servant.cabal | 2 +- src/Servant/API.hs | 4 ++-- src/Servant/{API/QQ.hs => Utils/ApiQuasiQuoting.hs} | 2 +- test/Servant/API/ElemSpec.hs | 2 +- test/Servant/{API/QQSpec.hs => Utils/ApiQuasiQuotingSpec.hs} | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) rename src/Servant/{API/QQ.hs => Utils/ApiQuasiQuoting.hs} (98%) rename test/Servant/{API/QQSpec.hs => Utils/ApiQuasiQuotingSpec.hs} (99%) diff --git a/servant.cabal b/servant.cabal index 8fa1df4e..e0a66be3 100644 --- a/servant.cabal +++ b/servant.cabal @@ -22,7 +22,6 @@ library Servant.API.Get Servant.API.Post Servant.API.Put - Servant.API.QQ Servant.API.QueryParam Servant.API.Raw Servant.API.ReqBody @@ -30,6 +29,7 @@ library Servant.Client Servant.Docs Servant.Server + Servant.Utils.ApiQuasiQuoting Servant.Utils.BaseUrl Servant.Utils.Req Servant.Utils.Text diff --git a/src/Servant/API.hs b/src/Servant/API.hs index 035033d6..005181b5 100644 --- a/src/Servant/API.hs +++ b/src/Servant/API.hs @@ -26,7 +26,7 @@ module Servant.API ( -- * Utilities -- | QuasiQuotes for endpoints - module Servant.API.QQ, + module Servant.Utils.ApiQuasiQuoting, -- | Type-safe internal URLs module Servant.API.Elem, ) where @@ -38,7 +38,7 @@ import Servant.API.Get import Servant.API.Post import Servant.API.Put import Servant.API.QueryParam -import Servant.API.QQ (sitemap) +import Servant.Utils.ApiQuasiQuoting (sitemap) import Servant.API.ReqBody import Servant.API.Sub import Servant.API.Alternative diff --git a/src/Servant/API/QQ.hs b/src/Servant/Utils/ApiQuasiQuoting.hs similarity index 98% rename from src/Servant/API/QQ.hs rename to src/Servant/Utils/ApiQuasiQuoting.hs index b6034088..e9ab554f 100644 --- a/src/Servant/API/QQ.hs +++ b/src/Servant/Utils/ApiQuasiQuoting.hs @@ -4,7 +4,7 @@ {-# LANGUAGE FlexibleInstances #-} {-# LANGUAGE ScopedTypeVariables #-} {-# LANGUAGE TemplateHaskell #-} -module Servant.API.QQ where +module Servant.Utils.ApiQuasiQuoting where import Control.Applicative import Data.List.Split (splitOn) diff --git a/test/Servant/API/ElemSpec.hs b/test/Servant/API/ElemSpec.hs index 385d8ae3..8b88ed81 100644 --- a/test/Servant/API/ElemSpec.hs +++ b/test/Servant/API/ElemSpec.hs @@ -7,7 +7,7 @@ import Test.Hspec import Servant.API import Servant.API.Elem (IsElem, IsLink) -import Servant.API.QQSpec ( (~>) ) +import Servant.Utils.ApiQuasiQuotingSpec ( (~>) ) type TestApi = "hello" :> Capture "name" String :> QueryParam "capital" Bool :> Get Bool diff --git a/test/Servant/API/QQSpec.hs b/test/Servant/Utils/ApiQuasiQuotingSpec.hs similarity index 99% rename from test/Servant/API/QQSpec.hs rename to test/Servant/Utils/ApiQuasiQuotingSpec.hs index addf0559..39876bfc 100644 --- a/test/Servant/API/QQSpec.hs +++ b/test/Servant/Utils/ApiQuasiQuotingSpec.hs @@ -7,7 +7,7 @@ {-# LANGUAGE TypeFamilies #-} {-# LANGUAGE TypeOperators #-} {-# LANGUAGE UndecidableInstances #-} -module Servant.API.QQSpec where +module Servant.Utils.ApiQuasiQuotingSpec where import Test.Hspec