diff --git a/Yesod/Dispatch.hs b/Yesod/Dispatch.hs index a9105261..e9b46d72 100644 --- a/Yesod/Dispatch.hs +++ b/Yesod/Dispatch.hs @@ -39,7 +39,6 @@ import Web.Routes.Quasi import Web.Routes.Quasi.Parse import Web.Routes.Quasi.TH import Language.Haskell.TH.Syntax -import Yesod.WebRoutes import qualified Network.Wai as W import Network.Wai.Middleware.CleanPath (cleanPathFunc) @@ -68,6 +67,7 @@ import qualified Data.Serialize as Ser import Network.Wai.Parse hiding (FileInfo) import qualified Network.Wai.Parse as NWP import Data.String (fromString) +import Web.Routes #if TEST import Test.Framework (testGroup, Test) diff --git a/Yesod/Helpers/Static.hs b/Yesod/Helpers/Static.hs index c739001f..20bd19db 100644 --- a/Yesod/Helpers/Static.hs +++ b/Yesod/Helpers/Static.hs @@ -45,13 +45,13 @@ import Data.Maybe (fromMaybe) import Yesod hiding (lift) import Data.List (intercalate) import Language.Haskell.TH.Syntax +import Web.Routes import qualified Data.ByteString.Lazy as L import Data.Digest.Pure.MD5 import qualified Codec.Binary.Base64Url import qualified Data.ByteString as S import qualified Data.Serialize -import Yesod.WebRoutes #if TEST import Test.Framework (testGroup, Test) diff --git a/Yesod/WebRoutes.hs b/Yesod/WebRoutes.hs deleted file mode 100644 index dcf7855e..00000000 --- a/Yesod/WebRoutes.hs +++ /dev/null @@ -1,8 +0,0 @@ --- | This module should be removed when web-routes incorporates necessary support. -module Yesod.WebRoutes - ( encodePathInfo - , Site (..) - ) where - -import Web.Routes.Base (encodePathInfo) -import Web.Routes.Site (Site (..)) diff --git a/Yesod/Yesod.hs b/Yesod/Yesod.hs index 0170ea95..4d848de1 100644 --- a/Yesod/Yesod.hs +++ b/Yesod/Yesod.hs @@ -55,13 +55,13 @@ import Control.Failure (Failure) import qualified Data.ByteString as S import qualified Network.Wai.Middleware.CleanPath import qualified Data.ByteString.Lazy as L -import Yesod.WebRoutes import Data.Monoid import Control.Monad.Trans.Writer import Control.Monad.Trans.State hiding (get) import Text.Hamlet import Text.Cassius import Text.Julius +import Web.Routes #if TEST import Test.Framework (testGroup, Test) diff --git a/yesod.cabal b/yesod.cabal index 02a0e416..ce225f07 100644 --- a/yesod.cabal +++ b/yesod.cabal @@ -65,7 +65,6 @@ library Yesod.Helpers.Crud Yesod.Helpers.Sitemap Yesod.Helpers.Static - Yesod.WebRoutes other-modules: Yesod.Form.Class Yesod.Internal Yesod.Form.Fields